scottmac Sat Dec 6 17:25:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/filter filter.c
Log:
MFB: Back out bugfix for #42718 as this broke magic_quotes_gpc
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.11&r2=1.52.2.39.2.12&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.39.2.11
php-src/ext/filter/filter.c:1.52.2.39.2.12
--- php-src/ext/filter/filter.c:1.52.2.39.2.11 Mon Nov 17 11:27:54 2008
+++ php-src/ext/filter/filter.c Sat Dec 6 17:25:35 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.39.2.11 2008/11/17 11:27:54 felipe Exp $ */
+/* $Id: filter.c,v 1.52.2.39.2.12 2008/12/06 17:25:35 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -312,7 +312,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.11 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.12 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -440,7 +440,7 @@
Z_STRLEN(new_var) = val_len;
Z_TYPE(new_var) = IS_STRING;
- if (IF_G(default_filter) != FILTER_UNSAFE_RAW ||
IF_G(default_filter_flags) != 0) {
+ if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
zval *tmp_new_var = &new_var;
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
