diff options
| author | Pierrick Charron <pierrick@php.net> | 2011-03-13 17:14:18 +0000 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2011-03-13 17:14:18 +0000 |
| commit | e68e2893c07e712ad6469ffda0658cc1d04f66e7 (patch) | |
| tree | 7669f8e76e73e6582617c293007afaf18608c152 | |
| parent | ee832705d1e3e86ceecc056ec3533a60d035d9c5 (diff) | |
| download | php-git-e68e2893c07e712ad6469ffda0658cc1d04f66e7.tar.gz | |
# Revert bug fix (will commit it again on 5.3 branch when 5.3.6 will be released)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/standard/tests/url/bug54180.phpt | 32 | ||||
| -rw-r--r-- | ext/standard/url.c | 4 |
3 files changed, 0 insertions, 40 deletions
@@ -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; } |