From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 27 Jan 2005 16:38:05 +0000 (+0000)
Subject: MFH: Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar).
X-Git-Tag: php-5.0.4RC1~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdd787626da3b50f129ad2de6a0e13f7df5829d5;p=php

MFH: Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar).
---

diff --git a/NEWS b/NEWS
index c91b64497f..cb91c84d61 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ PHP                                                                        NEWS
   is passed. (Tony)
 - Fixed bug #31710 (Wrong return values for mysqli_autocommit/commit/rollback).
   (Georg)
+- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
 - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
   (elod at itfais dot com)
 - Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia)
diff --git a/ext/standard/tests/strings/url_t.phpt b/ext/standard/tests/strings/url_t.phpt
index 88e6e4800d..dd323ffc23 100644
--- a/ext/standard/tests/strings/url_t.phpt
+++ b/ext/standard/tests/strings/url_t.phpt
@@ -66,7 +66,8 @@ $sample_urls = array (
 'file:///path/to/file',
 'file://path/to/file',
 'file:/path/to/file',
-'http://1.2.3.4:/abc.asp?a=1&b=2'
+'http://1.2.3.4:/abc.asp?a=1&b=2',
+'http://foo.com#bar'
 );
 
     foreach ($sample_urls as $url) {
@@ -648,3 +649,11 @@ array(4) {
   ["query"]=>
   string(7) "a=1&b=2"
 }
+array(3) {
+  ["scheme"]=>
+  string(4) "http"
+  ["host"]=>
+  string(7) "foo.com"
+  ["fragment"]=>
+  string(3) "bar"
+}
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 558c105dbd..1c2091f9fe 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -182,6 +182,8 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
 	if (!(p = memchr(s, '/', (ue - s)))) {
 		if ((p = memchr(s, '?', (ue - s)))) {
 			e = p;
+		} else if ((p = memchr(s, '#', (ue - s)))) {
+			e = p;
 		}
 	} else {
 		e = p;