summaryrefslogtreecommitdiff
path: root/mod_php3.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-26 17:26:37 +0000
committerZeev Suraski <zeev@php.net>1999-04-26 17:26:37 +0000
commit3cd0af11eea32f802228004af8fe424c62c8fbfb (patch)
tree1d273a469ad6e9e2c7e97449fa12665e46156dbf /mod_php3.c
parent0f195a79cd25447d03eb2ad9451829b36dcaa49b (diff)
downloadphp-git-3cd0af11eea32f802228004af8fe424c62c8fbfb.tar.gz
* Get the Apache module to compile again
* Get rid of php3_rqst, use SG(server_context) instead (there's still Apache-specific code, but it nuked a global)
Diffstat (limited to 'mod_php3.c')
-rw-r--r--mod_php3.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod_php3.c b/mod_php3.c
index ba0d6b6db5..07641c7d37 100644
--- a/mod_php3.c
+++ b/mod_php3.c
@@ -44,6 +44,7 @@
#include "http_protocol.h"
#include "http_request.h"
#include "http_log.h"
+#include "SAPI.h"
/* These are taken out of php_ini.h
@@ -101,8 +102,10 @@ void php3_save_umask()
static int zend_apache_ub_write(const char *str, uint str_length)
{
- if (php3_rqst) {
- return rwrite(str, str_length, php3_rqst);
+ SLS_FETCH();
+
+ if (SG(server_context)) {
+ return rwrite(str, str_length, (request_rec *) SG(server_context));
} else {
return fwrite(str, 1, str_length, stdout);
}