tony2001                Tue Apr 14 14:18:50 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/ext/filter filter.c 
  Log:
  MFH: revert wrong fix for bug #47930
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1468&r2=1.2027.2.547.2.1469&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1468 php-src/NEWS:1.2027.2.547.2.1469
--- php-src/NEWS:1.2027.2.547.2.1468    Mon Apr 13 19:38:52 2009
+++ php-src/NEWS        Tue Apr 14 14:18:49 2009
@@ -11,8 +11,6 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 
 - Fixed bug #47946 (ImageConvolution overwrites background). (Ilia)
-- Fixed bug #47930 (ext/filter crashes if extension bails out in activate). 
-  (Stas)
 - Fixed bug #47903 ("@" operator does not work with string offsets). (Felipe)
 - Fixed bug #47893 (CLI aborts on non blocking stdout). (Arnaud)
 - Fixed bug #47849 (Non-deep import loses the namespace). (Rob)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.46&r2=1.52.2.47&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.46 
php-src/ext/filter/filter.c:1.52.2.47
--- php-src/ext/filter/filter.c:1.52.2.46       Mon Apr 13 19:37:35 2009
+++ php-src/ext/filter/filter.c Tue Apr 14 14:18:49 2009
@@ -19,7 +19,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: filter.c,v 1.52.2.46 2009/04/13 19:37:35 stas Exp $ */
+/* $Id: filter.c,v 1.52.2.47 2009/04/14 14:18:49 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -101,7 +101,7 @@
        filter_functions,
        PHP_MINIT(filter),
        PHP_MSHUTDOWN(filter),
-       PHP_RINIT(filter),
+       NULL,
        PHP_RSHUTDOWN(filter),
        PHP_MINFO(filter),
        "0.11.0",
@@ -249,20 +249,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)   \
@@ -289,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.46 $");
+       php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.47 $");
        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

Reply via email to