- method setAcceptedCompression was failing to disable reception of compressed respon...

- remove a php warning that could be generated when using debug=2 in a client connecting to an https server

git-svn-id: https://svn.code.sf.net/p/phpxmlrpc/code/trunk/xmlrpc@73 013ecfd8-0664-425d-a759-9c98391dc3f9

diff --git a/ChangeLog b/ChangeLog
index 96cc549..c277284 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-04-12 - G. Giunta (giunta.gaetano@gmail.com)\r
+\r
+       * testsuite.php, parse_args.php: testsuite allows interrogating https servers ignoring their certs\r
+       * xmlrpc.inc: method setAcceptedCompression was failing to disable reception\r
+       of compressed responses if the client supported them (triggering a bug with\r
+       https and php < 5.3 on windows due); remove a php warning that could be\r
+       generated when using debug=2 in a client connecting to an https\r
+       server\r
+\r
+2010-04-11 - G. Giunta (giunta.gaetano@gmail.com) thanks amoe\r
+\r
+       * fixed: bad variables in "make install" make target\r
+\r
+2009-11-11 - G. Giunta (giunta.gaetano@gmail.com) thanks Ikiro Watanabe\r
+\r
+       * added INSTALL file\r
+\r
 2009-09-05 - G. Giunta (giunta.gaetano@gmail.com)\r
 \r
        * xmlrpcs.inc, xmlrpcs.inc: remove code that was left for compatibility\r

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 5269633..ad41414 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -707,6 +707,7 @@
                                        $GLOBALS['_xh']['value'] = $curr_val['values'];\r
                                        $GLOBALS['_xh']['vt']=strtolower($name);\r
                                        if (isset($curr_val['php_class']))\r
+\r
                                        {\r
                                                $GLOBALS['_xh']['php_class'] = $curr_val['php_class'];\r
                                        }\r
@@ -988,6 +989,7 @@
                function setCaCertificate($cacert, $is_dir=false)\r
                {\r
                        if ($is_dir)\r
+\r
                        {\r
                                $this->cacertdir = $cacert;\r
                        }\r
@@ -1062,7 +1064,10 @@
                        if ($compmethod == 'any')\r
                                $this->accepted_compression = array('gzip', 'deflate');\r
                        else\r
-                               $this->accepted_compression = array($compmethod);\r
+                           if ($compmethod == false )\r
+                               $this->accepted_compression = array();\r
+                   else\r
+                               $this->accepted_compression = array($compmethod);\r
                }\r
 \r
                /**\r
@@ -1159,6 +1164,7 @@
                        $msg->debug=$this->debug;\r
 \r
                        if($method == 'https')\r
+\r
                        {\r
                                $r =& $this->sendPayloadHTTPS(\r
                                        $msg,\r
@@ -1667,7 +1673,14 @@
                        {\r
                                print "<PRE>\n---CURL INFO---\n";\r
                                foreach(curl_getinfo($curl) as $name => $val)\r
-                                        print $name . ': ' . htmlentities($val). "\n";\r
+                               {\r
+                                       if (is_array($val))\r
+                                       {\r
+                                               $val = implode("\n", $val);\r
+                                       }\r
+                                       print $name . ': ' . htmlentities($val) . "\n";\r
+                               }\r
+\r
                                print "---END---\n</PRE>";\r
                        }\r
 \r
@@ -1847,6 +1860,7 @@
                                                case 1:\r
                                                        if(!isset($val[0]))\r
                                                        {\r
+\r
                                                                return false;           // Bad value\r
                                                        }\r
                                                        // Normal return value\r
@@ -3499,6 +3513,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                                        $xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);\r
                                }\r
                                else\r
+\r
                                {\r
                                        $xmlrpc_val = new xmlrpcval();\r
                                }\r
@@ -3700,6 +3715,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                }\r
                elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))\r
                {\r
+\r
                        return 'UTF-8';\r
                }\r
 \r