tony2001 Tue Apr 14 14:18:35 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/filter filter.c
Log:
MFH: revert wrong fix for bug #47930
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.14&r2=1.52.2.39.2.15&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.39.2.14
php-src/ext/filter/filter.c:1.52.2.39.2.15
--- php-src/ext/filter/filter.c:1.52.2.39.2.14 Mon Apr 13 19:21:28 2009
+++ php-src/ext/filter/filter.c Tue Apr 14 14:18:35 2009
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.39.2.14 2009/04/13 19:21:28 stas Exp $ */
+/* $Id: filter.c,v 1.52.2.39.2.15 2009/04/14 14:18:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -138,7 +138,7 @@
filter_functions,
PHP_MINIT(filter),
PHP_MSHUTDOWN(filter),
- PHP_RINIT(filter),
+ NULL,
PHP_RSHUTDOWN(filter),
PHP_MINFO(filter),
"0.11.0",
@@ -286,20 +286,6 @@
}
/* }}} */
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(filter)
-{
- IF_G(get_array) = NULL;
- IF_G(post_array) = NULL;
- IF_G(cookie_array) = NULL;
- IF_G(server_array) = NULL;
- IF_G(env_array) = NULL;
- IF_G(session_array) = NULL;
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ PHP_RSHUTDOWN_FUNCTION
*/
#define VAR_ARRAY_COPY_DTOR(a) \
@@ -326,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.14 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.15 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
