diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2008-06-09 14:05:49 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2008-06-09 14:05:49 +0000 |
| commit | 3dc903400b2cfebc0bb727cbc6971650d6dfe101 (patch) | |
| tree | eaa7cab21ffbb79cda152de0bc0489d79dd91ca8 | |
| parent | e9063af77c4bc3608842b50c7765529a8e5cde5b (diff) | |
| download | php-git-3dc903400b2cfebc0bb727cbc6971650d6dfe101.tar.gz | |
Merge from PHP_5 - don't echo raw cookie values here
| -rw-r--r-- | ext/standard/head.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/head.c b/ext/standard/head.c index 4d2fe4fd78..545f072e47 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -70,12 +70,12 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t int result; if (name && strpbrk(name, "=,; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */ - zend_error( E_WARNING, "Cookie names can not contain any of the folllowing '=,; \\t\\r\\n\\013\\014' (%s)", name ); + zend_error( E_WARNING, "Cookie names can not contain any of the folllowing '=,; \\t\\r\\n\\013\\014'" ); return FAILURE; } if (!url_encode && value && strpbrk(value, ",; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */ - zend_error( E_WARNING, "Cookie values can not contain any of the folllowing ',; \\t\\r\\n\\013\\014' (%s)", value ); + zend_error( E_WARNING, "Cookie values can not contain any of the folllowing ',; \\t\\r\\n\\013\\014'" ); return FAILURE; } |