diff options
| author | Stanislav Malyshev <stas@php.net> | 2020-09-28 21:39:34 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2020-09-28 21:39:34 -0700 |
| commit | a9e4321846dcba0eade116c1d9abc388df8100fc (patch) | |
| tree | 51d9c415a0ce90f6284c2d238c9edd3ba048ceef /main/php_variables.c | |
| parent | 311922ddbe091afbbf63a344ec7b96e224ecf238 (diff) | |
| parent | 7bc112a142720fdbd553e5bcdbbe98c10d10928a (diff) | |
| download | php-git-a9e4321846dcba0eade116c1d9abc388df8100fc.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index d804a3860f..ca015352d2 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -501,7 +501,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) size_t new_val_len; *val++ = '\0'; - php_url_decode(var, strlen(var)); + if (arg != PARSE_COOKIE) { + php_url_decode(var, strlen(var)); + } val_len = php_url_decode(val, strlen(val)); val = estrndup(val, val_len); if (sapi_module.input_filter(arg, var, &val, val_len, &new_val_len)) { @@ -512,7 +514,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) size_t val_len; size_t new_val_len; - php_url_decode(var, strlen(var)); + if (arg != PARSE_COOKIE) { + php_url_decode(var, strlen(var)); + } val_len = 0; val = estrndup("", val_len); if (sapi_module.input_filter(arg, var, &val, val_len, &new_val_len)) { |