cvs: php-src /ext/standard head.c
| From: | Rasmus Lerdorf | Date: | Mon, 09 Jun 2008 14:05:49 +0000 |
| Subject: | cvs: php-src /ext/standard head.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50338@lists.php.net to get a copy of this message | ||
rasmus Mon Jun 9 14:05:49 2008 UTC
Modified files:
/php-src/ext/standard head.c
Log:
Merge from PHP_5 - don't echo raw cookie values here
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.99 php-src/ext/standard/head.c:1.100
--- php-src/ext/standard/head.c:1.99 Thu Feb 28 14:16:14 2008
+++ php-src/ext/standard/head.c Mon Jun 9 14:05:49 2008
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.99 2008/02/28 14:16:14 felipe Exp $ */
+/* $Id: head.c,v 1.100 2008/06/09 14:05:49 rasmus Exp $ */
#include <stdio.h>
#include "php.h"
@@ -70,12 +70,12 @@
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;
}