From: Felipe Pena <felipe@php.net>
Date: Sun, 28 Jun 2009 02:36:19 +0000 (+0000)
Subject: - Fixed bug #48658 (Change in behaviour of parse_str on php 6.0)
X-Git-Tag: php-5.4.0alpha1~191^2~3228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eeb997d888042bddbe0d576116a8e6d7d282402d;p=php

- 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 c3c0fae499..2fd273aee2 100644
--- 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 ea393b0668..b772171f33 100644
--- 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 a82f2eacda..803787f4aa 100644
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 3aa33acf83..0f8adc77bc 100644
--- 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  ] )