mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Make Apache SAPI module compile in ZTS mode
This commit is contained in:
parent
91549cfa4f
commit
1687075373
@ -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,9 +524,12 @@ void php_init_handler(server_rec *s, pool *p)
|
||||
apache_php_initialized = 1;
|
||||
}
|
||||
#if MODULE_MAGIC_NUMBER >= 19980527
|
||||
{
|
||||
PLS_FETCH();
|
||||
if (PG(expose_php)) {
|
||||
ap_add_version_component("PHP/" PHP_VERSION);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user