cvs: php4 /sapi/apache mod_php4.c

kara Sun Jul 9 05:51:01 2000 EDT Modified files: /php4/sapi/apache mod_php4.c Log: Fixed module / global shutdown for apache. GSHUTDOWN functions are now executed and MSHUTDOWN functions are executed on child process exit Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.56 php4/sapi/apache/mod_php4.c:1.57 --- php4/sapi/apache/mod_php4.c:1.56 Thu Jul 6 10:40:18 2000 +++ php4/sapi/apache/mod_php4.c Sun Jul 9 05:51:01 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.56 2000/07/06 17:40:18 stas Exp $ */ +/* $Id: mod_php4.c,v 1.57 2000/07/09 12:51:01 kara Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -77,6 +77,10 @@ int php_xbithack_handler(request_rec * r); void php_init_handler(server_rec *s, pool *p); +#if MODULE_MAGIC_NUMBER >= 19970728 +void php_child_exit_handler(server_rec *s, pool *p); +#endif + #if MODULE_MAGIC_NUMBER > 19961007 #define CONST_PREFIX const #else @@ -678,11 +682,30 @@ { apache_php_initialized = 0; sapi_module.shutdown(&sapi_module); + +#if MODULE_MAGIC_NUMBER >= 19970728 + /* This function is only called on server exit if the apache API + * child_exit handler exists, so shutdown globally + */ + sapi_shutdown(); +#endif + #ifdef ZTS tsrm_shutdown(); #endif } +#if MODULE_MAGIC_NUMBER >= 19970728 +static void php_child_exit_handler(server_rec *s, pool *p) +{ +/* apache_php_initialized = 0; */ + sapi_module.shutdown(&sapi_module); + +#ifdef ZTS + tsrm_shutdown(); +#endif +} +#endif void php_init_handler(server_rec *s, pool *p) { @@ -791,7 +814,7 @@ ,NULL /* child_init */ #endif #if MODULE_MAGIC_NUMBER >= 19970728 - ,NULL /* child_exit */ + ,php_child_exit_handler /* child_exit */ #endif #if MODULE_MAGIC_NUMBER >= 19970902 ,NULL /* post read-request */