iliaa Sun Feb 12 16:40:34 2006 UTC
Modified files:
/php-src/ext/standard url.c
/php-src/ext/standard/tests/strings url_t.phpt
Log:
MFB51: Fixed bug #36351 (parse_url() does not parse numeric paths properly).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/url.c?r1=1.90&r2=1.91&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.90 php-src/ext/standard/url.c:1.91
--- php-src/ext/standard/url.c:1.90 Wed Jan 18 14:05:28 2006
+++ php-src/ext/standard/url.c Sun Feb 12 16:40:34 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.90 2006/01/18 14:05:28 iliaa Exp $ */
+/* $Id: url.c,v 1.91 2006/02/12 16:40:34 iliaa Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -138,7 +138,7 @@
p++;
}
- if ((*p) == '\0' || *p == '/') {
+ if ((*p == '\0' || *p == '/') && (p - e) < 7) {
goto parse_port;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.11
php-src/ext/standard/tests/strings/url_t.phpt:1.12
--- php-src/ext/standard/tests/strings/url_t.phpt:1.11 Sun Dec 4 17:58:53 2005
+++ php-src/ext/standard/tests/strings/url_t.phpt Sun Feb 12 16:40:34 2006
@@ -70,6 +70,7 @@
'http://foo.com#bar',
'scheme:',
'foo+bar://[EMAIL PROTECTED]/bla',
+'gg:9130731',
);
foreach ($sample_urls as $url) {
@@ -678,6 +679,12 @@
["path"]=>
string(4) "/bla"
}
+array(2) {
+ ["scheme"]=>
+ string(2) "gg"
+ ["path"]=>
+ string(7) "9130731"
+}
string(4) "http"
string(11) "www.php.net"
int(80)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
