[PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h user_filters.c

[Moriyoshi Koizumi]

moriyoshi               Thu Aug  7 15:53:32 2003 EDT

  Modified files:              
    /php-src/ext/standard       user_filters.c basic_functions.c 
                                basic_functions.h 
  Log:
  Move shutdown code to better place
  
  
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.19 
php-src/ext/standard/user_filters.c:1.20
--- php-src/ext/standard/user_filters.c:1.19    Thu Jun 19 12:10:54 2003
+++ php-src/ext/standard/user_filters.c Thu Aug  7 15:53:31 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: user_filters.c,v 1.19 2003/06/19 16:10:54 iliaa Exp $ */
+/* $Id: user_filters.c,v 1.20 2003/08/07 19:53:31 moriyoshi Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -97,6 +97,17 @@
        REGISTER_LONG_CONSTANT("PSFS_FLAG_FLUSH_INC",   PSFS_FLAG_FLUSH_INC,    
CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PSFS_FLAG_FLUSH_CLOSE", PSFS_FLAG_FLUSH_CLOSE,  
CONST_CS | CONST_PERSISTENT);
        
+       return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(user_filters)
+{
+       if (BG(user_filter_map)) {
+               zend_hash_destroy(BG(user_filter_map));
+               efree(BG(user_filter_map));
+               BG(user_filter_map) = NULL;
+       }
+
        return SUCCESS;
 }
 
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.620 
php-src/ext/standard/basic_functions.c:1.621
--- php-src/ext/standard/basic_functions.c:1.620        Tue Aug  5 06:29:03 2003
+++ php-src/ext/standard/basic_functions.c      Thu Aug  7 15:53:31 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.620 2003/08/05 10:29:03 zeev Exp $ */
+/* $Id: basic_functions.c,v 1.621 2003/08/07 19:53:31 moriyoshi Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1248,12 +1248,8 @@
                BG(user_tick_functions) = NULL;
        }
 
-       if (BG(user_filter_map)) {
-               zend_hash_destroy(BG(user_filter_map));
-               efree(BG(user_filter_map));
-               BG(user_filter_map) = NULL;
-       }
-
+       PHP_RSHUTDOWN(user_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+       
        return SUCCESS;
 }
 
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.122 
php-src/ext/standard/basic_functions.h:1.123
--- php-src/ext/standard/basic_functions.h:1.122        Tue Aug  5 06:29:03 2003
+++ php-src/ext/standard/basic_functions.h      Thu Aug  7 15:53:31 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: basic_functions.h,v 1.122 2003/08/05 10:29:03 zeev Exp $ */
+/* $Id: basic_functions.h,v 1.123 2003/08/07 19:53:31 moriyoshi Exp $ */
 
 #ifndef BASIC_FUNCTIONS_H
 #define BASIC_FUNCTIONS_H
@@ -114,6 +114,7 @@
 PHP_FUNCTION(stream_bucket_append);
 PHP_FUNCTION(stream_bucket_new);
 PHP_MINIT_FUNCTION(user_filters);
+PHP_RSHUTDOWN_FUNCTION(user_filters);
 
 #ifdef PHP_WIN32
 typedef unsigned int php_stat_len;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php