- Fixed bug #48658 (Change in behaviour of parse_str on php 6.0)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index c3c0fae499d25167b83de732374e02b929326531..2fd273aee2b7db9e07b0992c6dc006a7259ebfac 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -6199,7 +6199,7 @@ PHP_FUNCTION(parse_str)
        int enc_string_len;
        zval *result = NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a", &enc_string, &enc_string_len, &result) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &enc_string, &enc_string_len, &result) == FAILURE) {
                return;
        }
        

diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt
index ea393b0668853dfb74886e3a6fc8cd840eea782b..b772171f33940f595950b349750b1824c802ecf6 100644 (file)
--- a/ext/standard/tests/strings/parse_str_basic1.phpt
+++ b/ext/standard/tests/strings/parse_str_basic1.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test parse_str() function : basic functionality 
---XFAIL--
-Bug 48658: Test currently fails as parse_str() api insists that the optional reult array 
-is pre-defined. 
 --FILE--
 <?php
                

diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt
index a82f2eacda45a3af90f66cc1c738d1ffac9bdb13..803787f4aa47c25ee5e2836aa2f230c61e947479 100644 (file)
Binary files a/ext/standard/tests/strings/parse_str_basic3.phpt and b/ext/standard/tests/strings/parse_str_basic3.phpt differ

diff --git a/ext/standard/tests/strings/parse_str_basic4.phpt b/ext/standard/tests/strings/parse_str_basic4.phpt
index 3aa33acf837e57c75e5a445e2d05f2e212a397e8..0f8adc77bc727de700d17f79260bb2e235d7f609 100644 (file)
--- a/ext/standard/tests/strings/parse_str_basic4.phpt
+++ b/ext/standard/tests/strings/parse_str_basic4.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test parse_str() function : test with badly formed strings
---XFAIL--
-Bug 48658: Test currently fails as parse_str() api insists that the optional reult array 
-is pre-defined. php.net bugzilla 
 --FILE--
 <?php
 /* Prototype  : void parse_str  ( string $str  [, array &$arr  ] )