summaryrefslogtreecommitdiff
path: root/sapi/apache/mod_php4.c
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-17 14:24:39 +0000
committerSascha Schumann <sas@php.net>1999-12-17 14:24:39 +0000
commit16870753733bf811bd0ba7461a279d0a3d90d29c (patch)
tree359cbde5bb3ec30a8dbc1d501f5acaf8f2b7f4d5 /sapi/apache/mod_php4.c
parent91549cfa4fe0e8aac9e56d0a603de6d9d22c8396 (diff)
downloadphp-git-16870753733bf811bd0ba7461a279d0a3d90d29c.tar.gz
Make Apache SAPI module compile in ZTS mode
Diffstat (limited to 'sapi/apache/mod_php4.c')
-rw-r--r--sapi/apache/mod_php4.c9
1 files changed, 7 insertions, 2 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
}