From eeb997d888042bddbe0d576116a8e6d7d282402d Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Sun, 28 Jun 2009 02:36:19 +0000
Subject: [PATCH] - Fixed bug #48658 (Change in behaviour of parse_str on php
 6.0)

---
 ext/standard/string.c                         |   2 +-
 .../tests/strings/parse_str_basic1.phpt       |   3 ---
 .../tests/strings/parse_str_basic3.phpt       | Bin 5422 -> 5284 bytes
 .../tests/strings/parse_str_basic4.phpt       |   3 ---
 4 files changed, 1 insertion(+), 7 deletions(-)

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 a82f2eacda45a3af90f66cc1c738d1ffac9bdb13..803787f4aa47c25ee5e2836aa2f230c61e947479 100644
GIT binary patch
delta 163
zcmZ3dwM27*^~Qr&csWXy(lU#ROOz)6<CSA9-MowM8Y8cTrh<~cdQfU+PEMuLWJ6)$
z$#2<2B)R-TeSEk|^D>k3Q&Kg|fNBg4VvKA}Au2uzC`uXt#T*riONuh{(iO@xOEMIc
z3QO}#Qd1`D2^un*OimD#;bLH5P{=FI$tebDQ{B8yke!Je=!X2#BBfYcJFdwWMWi?1
I5)NSm0MBwVH~;_u

delta 269
zcmXX=%}T>S7$hJf(Z((9(Zgp@FiJu#wvCk@>Ol|$FCIKB$ZEF9!m^3G-y-qiD+v1l
zUOWquNAMlghw)(iVPF{M2j)3?*?l~ExICGkp2e|$Y;!nB$D?!#7u+D+SgpB2S;K+}
zX@D81m^S>%px%jqRRV-E!k_^x7`DWrtWcDSNzmL%1g15s!58gP^El%Rp?H=+RaA-M
z2-h~h7fVtycuhY#js)AyIC%G#4<iWAsq2#2>ZFzX14@Upkz?z9C&}j4u=VE9z7Q&h
xJAnnz@Ya^dGaCNe=C}Mt`rgESl8rSw_yH&@<zMu)(sP0DH%a%)Yxa7z_YEx9R{#J2

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  ] )
-- 
2.40.0