archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make Apache SAPI module compile in ZTS mode

Browse source
This commit is contained in:
Sascha Schumann 1999-12-17 14:24:39 +00:00
parent 91549cfa4f
commit 1687075373
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sapi/apache/mod_php4.c
View file

@ -128,6 +128,7 @@ static int zend_apache_ub_write(const char *str, uint str_length)
{ {
int ret; int ret;
SLS_FETCH(); SLS_FETCH();
PLS_FETCH();
if (SG(server_context)) { if (SG(server_context)) {
ret = rwrite(str, str_length, (request_rec *) 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; int fd, retval;
HashTable *per_dir_conf; HashTable *per_dir_conf;
SLS_FETCH(); SLS_FETCH();
ELS_FETCH();
if (setjmp(EG(bailout))!=0) { if (setjmp(EG(bailout))!=0) {
return OK; return OK;
@ -522,8 +524,11 @@ void php_init_handler(server_rec *s, pool *p)
apache_php_initialized = 1; apache_php_initialized = 1;
} }
#if MODULE_MAGIC_NUMBER >= 19980527 #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 #endif
} }

3
sapi/apache/sapi_apache.c
View file

@ -63,7 +63,6 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod
zend_executor_globals *executor_globals=⪚ zend_executor_globals *executor_globals=⪚
php_core_globals *core_globals=&pcg; php_core_globals *core_globals=&pcg;
#endif #endif
SLS_FETCH();
if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
return 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; return NOT_FOUND;
} }
} else { } 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 */ php3_header(); /* Make sure headers have been sent */