From bd0ac7fe14b6f2eb82a2e13a38c3eca5d4fe2e4f Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 2 Jan 2001 22:49:31 +0000 Subject: Many patches. I hope I remember them all: - Make sapi_module available to external modules (PHPAPI) - Make the php.ini path reported in phpinfo() always point to real full path of the php.ini file - Optimized the ISAPI module not to read unnecessary server variables and read necessary variables at most once. --- sapi/pi3web/pi3web_sapi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sapi/pi3web/pi3web_sapi.c') diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index c9ad0b8481..e079fac5e2 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -280,7 +280,7 @@ static char *sapi_pi3web_read_cookies(SLS_D) } -static sapi_module_struct sapi_module = { +static sapi_module_struct pi3web_sapi_module = { "pi3web", /* name */ "PI3WEB", /* pretty name */ @@ -428,17 +428,17 @@ DWORD fnWrapperProc(LPCONTROL_BLOCK lpCB) BOOL PHP4_startup() { tsrm_startup(1, 1, 0, NULL); - sapi_startup(&sapi_module); - if (sapi_module.startup) { - sapi_module.startup(&sapi_module); + sapi_startup(&pi3web_sapi_module); + if (pi3web_sapi_module.startup) { + pi3web_sapi_module.startup(&pi3web_sapi_module); }; IWasLoaded = 1; return IWasLoaded; }; BOOL PHP4_shutdown() { - if (sapi_module.shutdown) { - sapi_module.shutdown(&sapi_module); + if (pi3web_sapi_module.shutdown) { + pi3web_sapi_module.shutdown(&pi3web_sapi_module); }; sapi_shutdown(); tsrm_shutdown(); -- cgit v1.2.1