cvs: php-src /ext/standard url.c /ext/standard/tests/strings url_t.phpt
| From: | Ilia Alshanetsky | Date: | Thu, 27 Jan 2005 16:37:34 +0000 |
| Subject: | cvs: php-src /ext/standard url.c /ext/standard/tests/strings url_t.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30180@lists.php.net to get a copy of this message | ||
iliaa Thu Jan 27 11:37:34 2005 EDT
Modified files:
/php-src/ext/standard url.c
/php-src/ext/standard/tests/strings url_t.phpt
Log:
Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar)
http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.82&r2=1.83&ty=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.82 php-src/ext/standard/url.c:1.83
--- php-src/ext/standard/url.c:1.82 Mon Sep 20 01:13:35 2004
+++ php-src/ext/standard/url.c Thu Jan 27 11:37:32 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.82 2004/09/20 05:13:35 iliaa Exp $ */
+/* $Id: url.c,v 1.83 2005/01/27 16:37:32 iliaa Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -182,6 +182,8 @@
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;
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.7
php-src/ext/standard/tests/strings/url_t.phpt:1.8
--- php-src/ext/standard/tests/strings/url_t.phpt:1.7 Wed May 19 04:45:23 2004
+++ php-src/ext/standard/tests/strings/url_t.phpt Thu Jan 27 11:37:34 2005
@@ -66,7 +66,8 @@
'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 @@
["query"]=>
string(7) "a=1&b=2"
}
+array(3) {
+ ["scheme"]=>
+ string(4) "http"
+ ["host"]=>
+ string(7) "foo.com"
+ ["fragment"]=>
+ string(3) "bar"
+}