Revert fix for bug #53493 to be compliant with the XML specification

diff --git a/NEWS b/NEWS
index d911872eabb77f079b0958a43f1ac36c0d5699fc..868a00b35c5515f7ae0c11956091eeeaf540da1b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -51,9 +51,6 @@
 - Streams:
   . Implemented FR #26158 (open arbitrary file descriptor with fopen). (Gustavo)
 
-- XMLRPC-EPI:
-  . Fixed bug #53493 (xmlrpc_decode should not be sensitive to leading 
-    whitespace). (Kalle)
 
 09 Dec 2010, PHP 5.3.4
 - Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)

diff --git a/ext/xmlrpc/tests/bug53493.phpt b/ext/xmlrpc/tests/bug53493.phpt
deleted file mode 100644 (file)
index 2930924..0000000
--- a/ext/xmlrpc/tests/bug53493.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--\r
-Bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace)\r
---FILE--\r
-<?php\r
-$req =                 PHP_EOL . \r
-               '<?xml version="1.0"?><methodResponse><params><param>' . \r
-               '<value><string>Hello World</string></value></param>' . \r
-               '</params></methodResponse>';\r
-\r
-var_dump(xmlrpc_decode($req));\r
-echo "Done\n";\r
-?>\r
---EXPECT--\r
-string(11) "Hello World"\r
-Done\r

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 8c0ec6c86fbd35b8bdb433c1ae9f8b9848300c7e..f24036b522c9172033deffe46db129a18dd05356 100644 (file)
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -845,10 +845,7 @@ PHP_FUNCTION(xmlrpc_decode)
        }
 
        if (return_value_used) {
-               zval* retval;
-               char *trimmed = php_trim(arg1, arg1_len, NULL, 0, NULL, 1 TSRMLS_CC);
-
-               retval = decode_request_worker(trimmed, strlen(trimmed), arg2_len ? arg2 : NULL, NULL);
+               zval* retval = decode_request_worker(arg1, arg1_len, arg2_len ? arg2 : NULL, NULL);
                if (retval) {
                        *return_value = *retval;
                        FREE_ZVAL(retval);