diff options
| author | Stanislav Malyshev <stas@php.net> | 2020-09-28 21:42:19 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2020-09-28 22:54:57 -0700 |
| commit | c4dc080245006e011a484ca609b9d4eaa6cc4963 (patch) | |
| tree | 5268ce0564a1f1f4d8252450b0c8822ccc9174be /main/php_variables.c | |
| parent | 626705fb9de6211ee912b737e7a00bfe63fdea63 (diff) | |
| parent | a9e4321846dcba0eade116c1d9abc388df8100fc (diff) | |
| download | php-git-c4dc080245006e011a484ca609b9d4eaa6cc4963.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update UPGRADING
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 1a40c2a19f..cbdc7cf171 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -514,7 +514,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } val = estrndup(val, val_len); - php_url_decode(var, strlen(var)); + if (arg != PARSE_COOKIE) { + php_url_decode(var, strlen(var)); + } if (sapi_module.input_filter(arg, var, &val, val_len, &new_val_len)) { php_register_variable_safe(var, val, new_val_len, &array); } |