diff options
| author | Nikita Popov <nikic@php.net> | 2016-10-08 01:04:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-10-08 01:04:22 +0200 |
| commit | b061fa909de77085d3822a89ab901b934d0362c4 (patch) | |
| tree | c0715b964e220144086a49daa388a1d80ae46e5d /ext/standard/url.c | |
| parent | bc3a0b82b82e54dabe688dcc37f8ada92771da0f (diff) | |
| download | php-git-b061fa909de77085d3822a89ab901b934d0362c4.tar.gz | |
Fix bug #73192
Diffstat (limited to 'ext/standard/url.c')
| -rw-r--r-- | ext/standard/url.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index dd861a570d..962718459a 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -217,28 +217,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length) goto nohost; } - e = ue; - - if (!(p = memchr(s, '/', (ue - s)))) { - char *query, *fragment; - - query = memchr(s, '?', (ue - s)); - fragment = memchr(s, '#', (ue - s)); - - if (query && fragment) { - if (query > fragment) { - e = fragment; - } else { - e = query; - } - } else if (query) { - e = query; - } else if (fragment) { - e = fragment; - } - } else { - e = p; - } + e = s + strcspn(s, "/?#"); /* check for login and password */ if ((p = zend_memrchr(s, '@', (e-s)))) { |