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/aolserver/aolserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sapi/aolserver') diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index ff4b97bfe1..aabfe5a9e1 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -368,7 +368,7 @@ php_ns_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) /* this structure is static (as in "it does not change") */ -static sapi_module_struct sapi_module = { +static sapi_module_struct aolserver_sapi_module = { "aolserver", "AOLserver", @@ -606,15 +606,15 @@ int Ns_ModuleInit(char *server, char *module) php_ns_context *ctx; tsrm_startup(1, 1, 0, NULL); - sapi_startup(&sapi_module); - sapi_module.startup(&sapi_module); + sapi_startup(&aolserver_sapi_module); + sapi_module.startup(&aolserver_sapi_module); /* TSRM is used to allocate a per-thread structure */ ns_globals_id = ts_allocate_id(sizeof(ns_globals_struct), NULL, NULL); /* the context contains data valid for all threads */ ctx = malloc(sizeof *ctx); - ctx->sapi_module = &sapi_module; + ctx->sapi_module = &aolserver_sapi_module; ctx->ns_server = strdup(server); ctx->ns_module = strdup(module); -- cgit v1.2.1