Merge from PHP_5 - don't echo raw cookie values here

diff --git a/ext/standard/head.c b/ext/standard/head.c
index 4d2fe4fd7818dd4872efca1c691a5c6b1d585091..545f072e47a0d445dc3a4aed0643980b4043a2e1 100644 (file)
--- 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;
        }