iliaa Thu Jan 27 11:38:31 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard url.c
/php-src/ext/standard/tests/strings url_t.phpt
Log:
MFH: Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.822&r2=1.1247.2.823&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.822 php-src/NEWS:1.1247.2.823
--- php-src/NEWS:1.1247.2.822 Wed Jan 26 11:56:14 2005
+++ php-src/NEWS Thu Jan 27 11:38:29 2005
@@ -6,6 +6,7 @@
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- 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)
http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.58.2.18&r2=1.58.2.19&ty=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.18
php-src/ext/standard/url.c:1.58.2.19
--- php-src/ext/standard/url.c:1.58.2.18 Mon Dec 20 14:29:38 2004
+++ php-src/ext/standard/url.c Thu Jan 27 11:38:30 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.58.2.18 2004/12/20 19:29:38 iliaa Exp $ */
+/* $Id: url.c,v 1.58.2.19 2005/01/27 16:38:30 iliaa Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -176,6 +176,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.3.2.5&r2=1.3.2.6&ty=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.5
php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.6
--- php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.5 Mon Oct 13
00:28:32 2003
+++ php-src/ext/standard/tests/strings/url_t.phpt Thu Jan 27 11:38:30 2005
@@ -68,7 +68,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) {
@@ -650,3 +651,11 @@
["query"]=>
string(7) "a=1&b=2"
}
+array(3) {
+ ["scheme"]=>
+ string(4) "http"
+ ["host"]=>
+ string(7) "foo.com"
+ ["fragment"]=>
+ string(3) "bar"
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
