iliaa Sun Feb 12 16:39:44 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard url.c
/php-src/ext/standard/tests/strings url_t.phpt
/php-src NEWS
Log:
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.86.2.4&r2=1.86.2.5&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.4 php-src/ext/standard/url.c:1.86.2.5
--- php-src/ext/standard/url.c:1.86.2.4 Wed Jan 18 14:05:14 2006
+++ php-src/ext/standard/url.c Sun Feb 12 16:39:44 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.86.2.4 2006/01/18 14:05:14 iliaa Exp $ */
+/* $Id: url.c,v 1.86.2.5 2006/02/12 16:39:44 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.9.2.2&r2=1.9.2.3&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.9.2.2
php-src/ext/standard/tests/strings/url_t.phpt:1.9.2.3
--- php-src/ext/standard/tests/strings/url_t.phpt:1.9.2.2 Sun Dec 4
17:58:15 2005
+++ php-src/ext/standard/tests/strings/url_t.phpt Sun Feb 12 16:39:44 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)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.410&r2=1.2027.2.411&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.410 php-src/NEWS:1.2027.2.411
--- php-src/NEWS:1.2027.2.410 Sat Feb 11 11:23:57 2006
+++ php-src/NEWS Sun Feb 12 16:39:44 2006
@@ -23,6 +23,7 @@
- Added imap_savebody() that allows message body to be written to a file.
(Mike)
- Fixed bug #36359 (splFileObject::fwrite() doesn't write when no data length
specified). (Tony)
+- Fixed bug #36351 (parse_url() does not parse numeric paths properly). (Ilia)
- Fixed bug #36334 (Added missing documentation about realpath cache INI
settings). (Ilia)
- Fixed bug #36308 (ReflectionProperty::getDocComment() does not reflect
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
