tony2001 Thu Dec 7 11:00:09 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
/php-src NEWS
Log:
MFH: fix #39763 (magic quotes are applied twice by ext/filter)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.32&r2=1.52.2.33&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.32
php-src/ext/filter/filter.c:1.52.2.33
--- php-src/ext/filter/filter.c:1.52.2.32 Tue Dec 5 01:24:18 2006
+++ php-src/ext/filter/filter.c Thu Dec 7 11:00:08 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.32 2006/12/05 01:24:18 pajoye Exp $ */
+/* $Id: filter.c,v 1.52.2.33 2006/12/07 11:00:08 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.52.2.32 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.33 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -397,8 +397,6 @@
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 (PG(magic_quotes_gpc)) {
- Z_STRVAL(new_var) = php_addslashes(*val,
Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC);
} else {
Z_STRVAL(new_var) = estrndup(*val, val_len);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.409&r2=1.2027.2.547.2.410&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.409 php-src/NEWS:1.2027.2.547.2.410
--- php-src/NEWS:1.2027.2.547.2.409 Thu Dec 7 01:41:18 2006
+++ php-src/NEWS Thu Dec 7 11:00:08 2006
@@ -49,6 +49,7 @@
- Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry)
- Fixed wrong signature initialization in imagepng (Takeshi Abe)
- Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39763 (magic quotes are applied twice by ext/filter). (Tony)
- Fixed bug #39754 (Some POSIX extension functions not thread safe).
(Ilia, wharmby at uk dot ibm dot com)
- Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
