[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2handler sapi_apache2.c

[Antony Dovgal]

tony2001                Thu Jun 28 17:23:07 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.14&r2=1.57.2.10.2.15&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.14 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.14   Fri Jun  1 
10:04:06 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Jun 28 17:23:07 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.14 2007/06/01 10:04:06 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.15 2007/06/28 17:23:07 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -349,8 +349,7 @@
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 
-static apr_status_t
-php_apache_server_shutdown(void *tmp)
+static apr_status_t php_apache_server_shutdown(void *tmp)
 {
        apache2_sapi_module.shutdown(&apache2_sapi_module);
        sapi_shutdown();
@@ -360,6 +359,15 @@
        return APR_SUCCESS;
 }
 
+static apr_status_t php_apache_child_shutdown(void *tmp)
+{
+       apache2_sapi_module.shutdown(&apache2_sapi_module);
+#if defined(ZTS) && !defined(PHP_WIN32)
+       tsrm_shutdown();
+#endif
+       return APR_SUCCESS;
+}
+
 static void php_apache_add_version(apr_pool_t *p)
 {
        TSRMLS_FETCH();
@@ -653,7 +661,7 @@
 
 static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
 {
-       apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, 
apr_pool_cleanup_null);
+       apr_pool_cleanup_register(pchild, NULL, php_apache_child_shutdown, 
apr_pool_cleanup_null);
 }
 
 void php_ap2_register_hook(apr_pool_t *p)

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