Re: cvs: php-src(PHP_5_2) /ext/filter filter.c
| From: | Arnaud Le Blanc | Date: | Sat, 06 Dec 2008 17:48:44 +0000 |
| Subject: | Re: cvs: php-src(PHP_5_2) /ext/filter filter.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-54733@lists.php.net to get a copy of this message | ||
Arg :(
It seems default_filter_flags actually had a non-zero default value, which is
not shown by ini_get().
On Saturday 06 December 2008 18:16:36 Scott MacVicar wrote:
> scottmac Sat Dec 6 17:16:36 2008 UTC
>
> Modified files: (Branch: PHP_5_2)
> /php-src/ext/filter filter.c
> Log:
> 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.43&r2=1.52.2.44&diff_format=u
> Index: php-src/ext/filter/filter.c
> diff -u php-src/ext/filter/filter.c:1.52.2.43 php-
src/ext/filter/filter.c:1.52.2.44
> --- php-src/ext/filter/filter.c:1.52.2.43 Sun Nov 2 22:04:40 2008
> +++ php-src/ext/filter/filter.c Sat Dec 6 17:16:36 2008
> @@ -19,7 +19,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: filter.c,v 1.52.2.43 2008/11/02 22:04:40 lbarnaud Exp $ */
> +/* $Id: filter.c,v 1.52.2.44 2008/12/06 17:16:36 scottmac 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.43 $");
> + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.44 $");
> php_info_print_table_end();
>
> DISPLAY_INI_ENTRIES();
> @@ -403,7 +403,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
>
>