diff options
| author | Stanislav Malyshev <stas@php.net> | 2021-01-04 01:47:09 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2021-01-04 01:47:09 -0800 |
| commit | ced4c0bfe650e9a836ea404a6d91074184184c62 (patch) | |
| tree | e2f07916bf0768e0d6c0401d109bccb895b40353 | |
| parent | 8768621149fbedc0e5aaf847b71108fd459a548a (diff) | |
| parent | e65932060ab2caf9c2e2f12547e3661bf478feb7 (diff) | |
| download | php-git-ced4c0bfe650e9a836ea404a6d91074184184c62.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
[ci skip] Update NEWS
[ci skip] Fix order
[ci skip] Unpdate NEWS
Fix #77423: parse_url() will deliver a wrong host to user
| -rw-r--r-- | ext/standard/url.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index 113e010024..8866744506 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -249,11 +249,11 @@ parse_host: ret->pass = zend_string_init(pp, (p-pp), 0); php_replace_controlchars_ex(ZSTR_VAL(ret->pass), ZSTR_LEN(ret->pass)); } else { - if (!is_userinfo_valid(s, p-s)) { - goto check_port; - } + if (!is_userinfo_valid(s, p-s)) { + goto check_port; + } ret->user = zend_string_init(s, (p-s), 0); - php_replace_controlchars_ex(ZSTR_VAL(ret->user), ZSTR_LEN(ret->user)); + php_replace_controlchars_ex(ZSTR_VAL(ret->user), ZSTR_LEN(ret->user)); } s = p + 1; |