mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #25800 (parse_url() could not parse urls with empty port).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2003-10-13 04:27:23 +00:00
parent 3158ff714e
commit a9b20a6abf
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ext/standard/tests/strings/url_t.phpt
View File

@ -64,7 +64,11 @@ $sample_urls = array (
'mailto:me@mydomain.com',
'/foo.php?a=b&c=d',
'foo.php?a=b&c=d',
'http://user:passwd@www.example.com:8080?bar=1&boom=0'
'http://user:passwd@www.example.com:8080?bar=1&boom=0',
'file:///path/to/file',
'file://path/to/file',
'file:/path/to/file',
'http://1.2.3.4:/abc.asp?a=1&b=2'
);
foreach ($sample_urls as $url) {
@ -616,3 +620,33 @@ array(6) {
["query"]=>
string(12) "bar=1&boom=0"
}
array(2) {
["scheme"]=>
string(4) "file"
["path"]=>
string(13) "/path/to/file"
}
array(3) {
["scheme"]=>
string(4) "file"
["host"]=>
string(4) "path"
["path"]=>
string(8) "/to/file"
}
array(2) {
["scheme"]=>
string(4) "file"
["path"]=>
string(13) "/path/to/file"
}
array(4) {
["scheme"]=>
string(4) "http"
["host"]=>
string(7) "1.2.3.4"
["path"]=>
string(8) "/abc.asp"
["query"]=>
string(7) "a=1&b=2"
}

10
ext/standard/url.c
View File

@ -197,17 +197,17 @@ PHPAPI php_url *php_url_parse(char *str)
if ((p = memchr(s, ':', (e-s)))) {
if (!ret->port) {
p++;
if ( e-p > 5 || e-p < 1 ) { /* port cannot be longer then 5 characters */
if (e-p > 5) { /* port cannot be longer then 5 characters */
STR_FREE(ret->scheme);
STR_FREE(ret->user);
STR_FREE(ret->pass);
efree(ret);
return NULL;
} else if (e - p > 0) {
memcpy(port_buf, p, (e-p));
port_buf[e-p] = '\0';
ret->port = atoi(port_buf);
}
memcpy(port_buf, p, (e-p));
port_buf[e-p] = '\0';
ret->port = atoi(port_buf);
p--;
}
} else {