tony2001 Fri Dec 8 17:03:27 2006 UTC
Modified files:
/php-src/ext/filter filter.c
Log:
revert the fix for #39763
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.81&r2=1.82&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.81 php-src/ext/filter/filter.c:1.82
--- php-src/ext/filter/filter.c:1.81 Thu Dec 7 10:59:35 2006
+++ php-src/ext/filter/filter.c Fri Dec 8 17:03:26 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.81 2006/12/07 10:59:35 tony2001 Exp $ */
+/* $Id: filter.c,v 1.82 2006/12/08 17:03:26 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -275,7 +275,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.81 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.82 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -397,7 +397,13 @@
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);
php_zval_filter(&tmp_new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/, 0 TSRMLS_CC);
- } else {
+ }
+#if PHP_VERSION_ID<60000
+ else if (PG(magic_quotes_gpc)) {
+ Z_STRVAL(new_var) = php_addslashes(*val,
Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC);
+ }
+#endif
+ else {
Z_STRVAL(new_var) = estrndup(*val, val_len);
}
} else { /* empty string */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
