PHP 4.0 Bug #5869: php4 apache module build failure + fix

From: japj@darius.demon.nl Operating system: Windows 2000 PHP version: 4.0 Latest CVS (31/07/2000) PHP Bug Type: Compile Failure Bug description: php4 apache module build failure + fix trying to build the php4 apache module, fails with an unresolved external sapi_module.. after investigation it became clear that there's been a variable rename that wasn't done at 2 places... see the attached patch for the fix. diff -u -r php4-200007302345/sapi/apache/mod_php4.c php4-200007302345.new/sapi/apache/mod_php4.c --- php4-200007302345/sapi/apache/mod_php4.c Wed Jul 26 20:45:24 2000 +++ php4-200007302345.new/sapi/apache/mod_php4.c Mon Jul 31 11:18:56 2000 @@ -661,7 +661,7 @@ static void apache_php_module_shutdown_wrapper(void) { apache_php_initialized = 0; - sapi_module.shutdown(&sapi_module_conf); + sapi_module_conf.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_conf); + sapi_module_conf.shutdown(&sapi_module_conf); #ifdef ZTS tsrm_shutdown();