summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/standard/head.c2
-rw-r--r--ext/standard/tests/network/setcookie.phpt2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 8add6a239c..657510de5b 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -123,7 +123,7 @@ PHPAPI int php_setcookie(zend_string *name, zend_string *value, time_t expires,
smart_str_append(&buf, name);
smart_str_appendc(&buf, '=');
if (url_encode) {
- zend_string *encoded_value = php_url_encode(ZSTR_VAL(value), ZSTR_LEN(value));
+ zend_string *encoded_value = php_raw_url_encode(ZSTR_VAL(value), ZSTR_LEN(value));
smart_str_append(&buf, encoded_value);
zend_string_release_ex(encoded_value, 0);
} else {
diff --git a/ext/standard/tests/network/setcookie.phpt b/ext/standard/tests/network/setcookie.phpt
index d41bed01f4..1033b7bbbe 100644
--- a/ext/standard/tests/network/setcookie.phpt
+++ b/ext/standard/tests/network/setcookie.phpt
@@ -24,7 +24,7 @@ $expected = array(
'Set-Cookie: name=deleted; expires='.date('D, d-M-Y H:i:s', 1).' GMT; Max-Age=0',
'Set-Cookie: name=deleted; expires='.date('D, d-M-Y H:i:s', 1).' GMT; Max-Age=0',
'Set-Cookie: name=value',
- 'Set-Cookie: name=space+value',
+ 'Set-Cookie: name=space%20value',
'Set-Cookie: name=value',
'Set-Cookie: name=value; expires='.date('D, d-M-Y H:i:s', $tsp).' GMT; Max-Age=5',
'Set-Cookie: name=value; expires='.date('D, d-M-Y H:i:s', $tsn).' GMT; Max-Age=0',