felipe          Sun Jun 28 02:36:19 2009 UTC

  Modified files:              
    /php-src/ext/standard       string.c 
    /php-src/ext/standard/tests/strings parse_str_basic1.phpt 
                                        parse_str_basic3.phpt 
                                        parse_str_basic4.phpt 
  Log:
  - Fixed bug #48658 (Change in behaviour of parse_str on php 6.0)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.701&r2=1.702&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.701 php-src/ext/standard/string.c:1.702
--- php-src/ext/standard/string.c:1.701 Mon May 25 14:32:15 2009
+++ php-src/ext/standard/string.c       Sun Jun 28 02:36:19 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.701 2009/05/25 14:32:15 felipe Exp $ */
+/* $Id: string.c,v 1.702 2009/06/28 02:36:19 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -6199,7 +6199,7 @@
        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;
        }
        
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/parse_str_basic1.phpt
diff -u php-src/ext/standard/tests/strings/parse_str_basic1.phpt:1.1 
php-src/ext/standard/tests/strings/parse_str_basic1.phpt:1.2
--- php-src/ext/standard/tests/strings/parse_str_basic1.phpt:1.1        Tue Jun 
23 22:39:42 2009
+++ php-src/ext/standard/tests/strings/parse_str_basic1.phpt    Sun Jun 28 
02:36:19 2009
@@ -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
                
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic3.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/parse_str_basic3.phpt
diff -u php-src/ext/standard/tests/strings/parse_str_basic3.phpt:1.1 
php-src/ext/standard/tests/strings/parse_str_basic3.phpt:1.2
--- php-src/ext/standard/tests/strings/parse_str_basic3.phpt:1.1        Tue Jun 
23 22:39:42 2009
+++ php-src/ext/standard/tests/strings/parse_str_basic3.phpt    Sun Jun 28 
02:36:19 2009
@@ -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. php.net bugzilla 
 --FILE--
 <?php
 /* Prototype  : void parse_str  ( string $str  [, array &$arr  ] )
@@ -163,9 +160,9 @@
 array(1) {
   [u"arr"]=>
   array(2) {
-    ["first"]=>
+    [u"first"]=>
     unicode(3) "sid"
-    ["forth"]=>
+    [u"forth"]=>
     unicode(4) "bill"
   }
 }
@@ -191,19 +188,19 @@
 Test string with single quotes characters
 NULL
 unicode(4) "Bill"
-unicode(9) "O\'Reilly"
+unicode(8) "O'Reilly"
 
 Test string with backslash characters
 NULL
-unicode(7) "10\\2=5"
+unicode(6) "10\2=5"
 
 Test string with double quotes data
 NULL
-unicode(32) "A string with \"quoted\" strings"
+unicode(30) "A string with "quoted" strings"
 
 Test string with nulls
 NULL
-unicode(37) "A string with containing \0\0\0 nulls"
+unicode(34) "A string with containing  
 Test string with 2-dim array with numeric keys
 NULL
@@ -245,7 +242,7 @@
   array(2) {
     [u"one"]=>
     array(1) {
-      ["four"]=>
+      [u"four"]=>
       unicode(3) "sid"
     }
     [u"three"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic4.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/parse_str_basic4.phpt
diff -u php-src/ext/standard/tests/strings/parse_str_basic4.phpt:1.1 
php-src/ext/standard/tests/strings/parse_str_basic4.phpt:1.2
--- php-src/ext/standard/tests/strings/parse_str_basic4.phpt:1.1        Tue Jun 
23 22:39:42 2009
+++ php-src/ext/standard/tests/strings/parse_str_basic4.phpt    Sun Jun 28 
02:36:19 2009
@@ -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  ] )



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to