cvs: php4 /sapi/apache mod_php4.c

rasmus Wed Jul 26 13:39:59 2000 EDT Modified files: /php4/sapi/apache mod_php4.c Log: Fix symbol clash which caused a DSO problem on OpenBSD @ Fix symbol clash which caused a DSO problem on OpenBSD (Rob Black and @ anil@recoil.org) Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.59 php4/sapi/apache/mod_php4.c:1.60 --- php4/sapi/apache/mod_php4.c:1.59 Mon Jul 10 02:20:35 2000 +++ php4/sapi/apache/mod_php4.c Wed Jul 26 13:39:59 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.59 2000/07/10 09:20:35 sas Exp $ */ +/* $Id: mod_php4.c,v 1.60 2000/07/26 20:39:59 rasmus Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -321,7 +321,7 @@ } -static sapi_module_struct sapi_module = { +static sapi_module_struct sapi_module_conf = { "apache", /* name */ "Apache", /* pretty name */ @@ -576,8 +576,8 @@ #ifdef ZTS tsrm_startup(1, 1, 0); #endif - sapi_startup(&sapi_module); - php_apache_startup(&sapi_module); + sapi_startup(&sapi_module_conf); + php_apache_startup(&sapi_module_conf); } per_dir_entry.type = mode; @@ -661,7 +661,7 @@ static void apache_php_module_shutdown_wrapper(void) { apache_php_initialized = 0; - sapi_module.shutdown(&sapi_module); + sapi_module.shutdown(&sapi_module_conf); #if MODULE_MAGIC_NUMBER >= 19970728 /* This function is only called on server exit if the apache API @@ -679,7 +679,7 @@ static void php_child_exit_handler(server_rec *s, pool *p) { /* apache_php_initialized = 0; */ - sapi_module.shutdown(&sapi_module); + sapi_module.shutdown(&sapi_module_conf); #ifdef ZTS tsrm_shutdown(); @@ -695,8 +695,8 @@ #ifdef ZTS tsrm_startup(1, 1, 0); #endif - sapi_startup(&sapi_module); - php_apache_startup(&sapi_module); + sapi_startup(&sapi_module_conf); + php_apache_startup(&sapi_module_conf); } #if MODULE_MAGIC_NUMBER >= 19980527 {