From: Pierrick Charron <pierrick@php.net>
Date: Sun, 13 Mar 2011 17:14:18 +0000 (+0000)
Subject: # Revert bug fix (will commit it again on 5.3 branch when 5.3.6 will be released)
X-Git-Tag: php-5.3.6~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e68e2893c07e712ad6469ffda0658cc1d04f66e7;p=php

# Revert bug fix (will commit it again on 5.3 branch when 5.3.6 will be released)
---

diff --git a/NEWS b/NEWS
index f5b275f9f8..935e2334dd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 10 Mar 2011, PHP 5.3.6RC3
-- Core:
-  . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
-    (tomas dot brastavicius at quantum dot lt, Pierrick)
-
 - Shmop extension:
   . Fixed bug #54193 (Integer overflow in shmop_read()). (Felipe)
     Reported by Jose Carlos Norte <jose at eyeos dot org> (CVE-2011-1092)
diff --git a/ext/standard/tests/url/bug54180.phpt b/ext/standard/tests/url/bug54180.phpt
deleted file mode 100644
index 2e64e27d07..0000000000
--- a/ext/standard/tests/url/bug54180.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Bug #54180 (parse_url() incorrectly parses path when ? in fragment)
---FILE--
-<?php
-
-var_dump(parse_url("http://example.com/path/script.html?t=1#fragment?data"));
-var_dump(parse_url("http://example.com/path/script.html#fragment?data"));
-
-?>
---EXPECTF--
-array(5) {
-  ["scheme"]=>
-  string(4) "http"
-  ["host"]=>
-  string(11) "example.com"
-  ["path"]=>
-  string(17) "/path/script.html"
-  ["query"]=>
-  string(3) "t=1"
-  ["fragment"]=>
-  string(13) "fragment?data"
-}
-array(4) {
-  ["scheme"]=>
-  string(4) "http"
-  ["host"]=>
-  string(11) "example.com"
-  ["path"]=>
-  string(17) "/path/script.html"
-  ["fragment"]=>
-  string(13) "fragment?data"
-}
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 0f4b836e62..e4f71b1460 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -316,10 +316,6 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
 		pp = strchr(s, '#');
 
 		if (pp && pp < p) {
-			if (pp - s) {
-				ret->path = estrndup(s, (pp-s));
-				php_replace_controlchars_ex(ret->path, (pp - s));
-			}
 			p = pp;
 			goto label_parse;
 		}