diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-17 14:24:39 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-17 14:24:39 +0000 |
| commit | 16870753733bf811bd0ba7461a279d0a3d90d29c (patch) | |
| tree | 359cbde5bb3ec30a8dbc1d501f5acaf8f2b7f4d5 | |
| parent | 91549cfa4fe0e8aac9e56d0a603de6d9d22c8396 (diff) | |
| download | php-git-16870753733bf811bd0ba7461a279d0a3d90d29c.tar.gz | |
Make Apache SAPI module compile in ZTS mode
| -rw-r--r-- | sapi/apache/mod_php4.c | 9 | ||||
| -rw-r--r-- | sapi/apache/sapi_apache.c | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 7eadee8d6d..39ec001428 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -128,6 +128,7 @@ static int zend_apache_ub_write(const char *str, uint str_length) { int ret; SLS_FETCH(); + PLS_FETCH(); if (SG(server_context)) { ret = rwrite(str, str_length, (request_rec *) SG(server_context)); @@ -285,6 +286,7 @@ int send_php(request_rec *r, int display_source_mode, char *filename) int fd, retval; HashTable *per_dir_conf; SLS_FETCH(); + ELS_FETCH(); if (setjmp(EG(bailout))!=0) { return OK; @@ -522,8 +524,11 @@ void php_init_handler(server_rec *s, pool *p) apache_php_initialized = 1; } #if MODULE_MAGIC_NUMBER >= 19980527 - if (PG(expose_php)) { - ap_add_version_component("PHP/" PHP_VERSION); + { + PLS_FETCH(); + if (PG(expose_php)) { + ap_add_version_component("PHP/" PHP_VERSION); + } } #endif } diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 724e87238c..4efe1e189b 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -63,7 +63,6 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod zend_executor_globals *executor_globals=⪚ php_core_globals *core_globals=&pcg; #endif - SLS_FETCH(); if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { return FAILURE; @@ -84,7 +83,7 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod return NOT_FOUND; } } else { - (void) php_execute_script(&file_handle CLS_CC ELS_CC); + (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); } php3_header(); /* Make sure headers have been sent */ |