Remove from test matrix php 5.2

[plcapi.git] / lib / xmlrpcs.inc

diff --git a/lib/xmlrpcs.inc b/lib/xmlrpcs.inc
index 180595c..24cba8c 100644 (file)
--- a/lib/xmlrpcs.inc
+++ b/lib/xmlrpcs.inc
@@ -497,7 +497,7 @@
                * @param array $dispmap the dispatch map with definition of exposed services\r
                * @param boolean $servicenow set to false to prevent the server from running upon construction\r
                */\r
-               function xmlrpc_server($dispMap=null, $serviceNow=true)\r
+               function __construct($dispMap=null, $serviceNow=true)\r
                {\r
                        // if ZLIB is enabled, let the server by default accept compressed requests,\r
                        // and compress responses sent to clients that support them\r
@@ -529,6 +529,14 @@
                        }\r
                }\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpc_client($dispMap=null, $serviceNow=true)\r
+               {\r
+                       self::__construct($dispMap, $serviceNow);\r
+               }\r
+\r
                /**\r
                * Set debug level of server.\r
                * @param integer $in debug lvl: determines info added to xmlrpc responses (as xml comments)\r
@@ -587,7 +595,7 @@
                        if ($data === null)\r
                        {\r
                                // workaround for a known bug in php ver. 5.2.2 that broke $HTTP_RAW_POST_DATA\r
-                $data = file_get_contents('php://input');\r
+                               $data = file_get_contents('php://input');\r
                        }\r
                        $raw_data = $data;\r
 \r
@@ -928,26 +936,28 @@
                        $GLOBALS['_xh']['rt']='';\r
 \r
                        // decompose incoming XML into request structure\r
+\r
                        if ($req_encoding != '')\r
                        {\r
-                               if (!in_array($req_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))\r
-                               // the following code might be better for mb_string enabled installs, but\r
+                               // Since parsing will fail if charset is not specified in the xml prologue,\r
+                               // the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...\r
+                               // The following code might be better for mb_string enabled installs, but\r
                                // makes the lib about 200% slower...\r
-                               //if (!is_valid_charset($req_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))\r
-                               {\r
-                                       error_log('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$req_encoding);\r
-                                       $req_encoding = $GLOBALS['xmlrpc_defencoding'];\r
+                               //if (!is_valid_charset($req_encoding, array('UTF-8')))\r
+                               if (!in_array($req_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($data)) {\r
+                                       if ($req_encoding == 'ISO-8859-1') {\r
+                                               $data = utf8_encode($data);\r
+                                       } else {\r
+                                               if (extension_loaded('mbstring')) {\r
+                                                       $data = mb_convert_encoding($data, 'UTF-8', $req_encoding);\r
+                                               } else {\r
+                                                       error_log('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $req_encoding);\r
+                                               }\r
+                                       }\r
                                }\r
-                               /// @BUG this will fail on PHP 5 if charset is not specified in the xml prologue,\r
-                               // the encoding is not UTF8 and there are non-ascii chars in the text...\r
-                               /// @todo use an empty string for php 5 ???\r
-                               $parser = xml_parser_create($req_encoding);\r
-                       }\r
-                       else\r
-                       {\r
-                               $parser = xml_parser_create();\r
                        }\r
 \r
+                       $parser = xml_parser_create();\r
                        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);\r
                        // G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell\r
                        // the xml parser to give us back data in the expected charset\r