diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/tests/strings/url_t.phpt | 7 | ||||
| -rw-r--r-- | ext/standard/url.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ext/standard/tests/strings/url_t.phpt b/ext/standard/tests/strings/url_t.phpt index dd323ffc23..1e4dd3566d 100644 --- a/ext/standard/tests/strings/url_t.phpt +++ b/ext/standard/tests/strings/url_t.phpt @@ -67,7 +67,8 @@ $sample_urls = array ( 'file://path/to/file', 'file:/path/to/file', 'http://1.2.3.4:/abc.asp?a=1&b=2', -'http://foo.com#bar' +'http://foo.com#bar', +'scheme:' ); foreach ($sample_urls as $url) { @@ -657,3 +658,7 @@ array(3) { ["fragment"]=> string(3) "bar" } +array(1) { + ["scheme"]=> + string(6) "scheme" +} diff --git a/ext/standard/url.c b/ext/standard/url.c index 1c2091f9fe..63c5f60dd5 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -104,6 +104,12 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length) /* parse scheme */ if ((e = memchr(s, ':', length)) && (e - s)) { + if (*(e + 1) == '\0') { /* only scheme is available */ + ret->scheme = estrndup(s, (e - s)); + php_replace_controlchars_ex(ret->scheme, (e - s)); + goto end; + } + /* * certain schemas like mailto: and zlib: may not have any / after them * this check ensures we support those. @@ -303,7 +309,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length) ret->path = estrndup(s, (ue-s)); php_replace_controlchars_ex(ret->path, (ue - s)); } - +end: return ret; } /* }}} */ |