iliaa Tue Aug 16 10:20:42 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/standard url.c /php-src/ext/standard/tests/strings url_t.phpt Log: MFH: Fixed bug #34148 (+,- and . not supported as parts of scheme). http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.86&r2=1.86.2.1&ty=u Index: php-src/ext/standard/url.c diff -u php-src/ext/standard/url.c:1.86 php-src/ext/standard/url.c:1.86.2.1 --- php-src/ext/standard/url.c:1.86 Wed Aug 3 10:08:14 2005 +++ php-src/ext/standard/url.c Tue Aug 16 10:20:41 2005 @@ -15,7 +15,7 @@ | Author: Jim Winstead <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.86 2005/08/03 14:08:14 sniper Exp $ */ +/* $Id: url.c,v 1.86.2.1 2005/08/16 14:20:41 iliaa Exp $ */ #include <stdlib.h> #include <string.h> @@ -107,7 +107,8 @@ /* validate scheme */ p = s; while (p < e) { - if (!isalnum(*p)) { + /* scheme = 1*[ lowalpha | digit | "+" | "-" | "." ] */ + if (!isalpha(*p) && !isdigit(*p) && *p != '+' && *p != '.' && *p != '-') { if (e + 1 < ue) { goto parse_port; } else { http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.9&r2=1.9.2.1&ty=u Index: php-src/ext/standard/tests/strings/url_t.phpt diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.9 php-src/ext/standard/tests/strings/url_t.phpt:1.9.2.1 --- php-src/ext/standard/tests/strings/url_t.phpt:1.9 Mon Apr 25 19:47:37 2005 +++ php-src/ext/standard/tests/strings/url_t.phpt Tue Aug 16 10:20:41 2005 @@ -68,7 +68,8 @@ 'file:/path/to/file', 'http://1.2.3.4:/abc.asp?a=1&b=2', 'http://foo.com#bar', -'scheme:' +'scheme:', +'foo+bar://[EMAIL PROTECTED]/bla', ); foreach ($sample_urls as $url) { @@ -662,3 +663,13 @@ ["scheme"]=> string(6) "scheme" } +array(4) { + ["scheme"]=> + string(7) "foo+bar" + ["host"]=> + string(4) "bang" + ["user"]=> + string(3) "baz" + ["path"]=> + string(4) "/bla" +}
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php