diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-02 22:49:31 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-02 22:49:31 +0000 |
| commit | bd0ac7fe14b6f2eb82a2e13a38c3eca5d4fe2e4f (patch) | |
| tree | ff521b5242f3800f3495220bfdf51f9cf35bbe20 /sapi/roxen | |
| parent | 348f6c609c148c2c1f17669dad521fe04cd50a2a (diff) | |
| download | php-git-bd0ac7fe14b6f2eb82a2e13a38c3eca5d4fe2e4f.tar.gz | |
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.
Diffstat (limited to 'sapi/roxen')
| -rw-r--r-- | sapi/roxen/roxen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index 8d4e1d66b0..c751635200 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -489,7 +489,7 @@ static int php_roxen_startup(sapi_module_struct *sapi_module) /* this structure is static (as in "it does not change") */ -static sapi_module_struct sapi_module = { +static sapi_module_struct roxen_sapi_module = { "roxen", "Roxen", php_module_startup, /* startup */ @@ -708,8 +708,8 @@ void pike_module_init( void ) roxen_globals_id = ts_allocate_id(sizeof(php_roxen_request), NULL, NULL); #endif #endif - sapi_startup(&sapi_module); - php_roxen_startup(&sapi_module); + sapi_startup(&roxen_sapi_module); + php_roxen_startup(&roxen_sapi_module); roxen_php_initialized = 1; PHP_INIT_LOCK(); } @@ -729,7 +729,7 @@ void pike_module_init( void ) void pike_module_exit(void) { roxen_php_initialized = 0; - sapi_module.shutdown(&sapi_module); + roxen_sapi_module.shutdown(&roxen_sapi_module); if(php_program) free_program(php_program); #ifdef ZTS tsrm_shutdown(); |