From 5a6288297d860e3ed9fd783e4712627f0d591323 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Mon, 13 Dec 2010 14:29:42 +0000 Subject: [PATCH] Revert fix for bug #53493 to be compliant with the XML specification --- NEWS | 3 --- ext/xmlrpc/tests/bug53493.phpt | 15 --------------- ext/xmlrpc/xmlrpc-epi-php.c | 5 +---- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 ext/xmlrpc/tests/bug53493.phpt diff --git a/NEWS b/NEWS index d911872eab..868a00b35c 100644 --- 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 index 29309241f8..0000000000 --- a/ext/xmlrpc/tests/bug53493.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace) ---FILE-- -' . - 'Hello World' . - ''; - -var_dump(xmlrpc_decode($req)); -echo "Done\n"; -?> ---EXPECT-- -string(11) "Hello World" -Done diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 8c0ec6c86f..f24036b522 100644 --- 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); -- 2.40.0