diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-26 17:26:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-26 17:26:37 +0000 |
| commit | 3cd0af11eea32f802228004af8fe424c62c8fbfb (patch) | |
| tree | 1d273a469ad6e9e2c7e97449fa12665e46156dbf /ext/hyperwave | |
| parent | 0f195a79cd25447d03eb2ad9451829b36dcaa49b (diff) | |
| download | php-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 'ext/hyperwave')
| -rw-r--r-- | ext/hyperwave/hg_comm.c | 4 | ||||
| -rw-r--r-- | ext/hyperwave/hw.c | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c index 3e22b7f393..eb10f00f19 100644 --- a/ext/hyperwave/hg_comm.c +++ b/ext/hyperwave/hg_comm.c @@ -461,7 +461,9 @@ char *fnInsAnchorsIntoText(char *text, DLIST *pAnchorList, char **bodytag) { #if APACHE { int j; - array_header *arr = table_elts(php3_rqst->subprocess_env); + SLS_FETCH(); + + array_header *arr = table_elts(((request_rec *) SG(server_context))->subprocess_env); table_entry *elts = (table_entry *)arr->elts; for (j=0; j < arr->nelts; j++) { diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index 2ae3c26b74..8ac6dbd070 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -1681,7 +1681,10 @@ void php3_hw_pipedocument(INTERNAL_FUNCTION_PARAMETERS) { hw_connection *ptr; hw_document *doc; #if APACHE - server_rec *serv = php3_rqst->server; + server_rec *serv; + SLS_FETCH(); + + serv = ((request_rec *) SG(server_context))->server; #endif argc = ARG_COUNT(ht); @@ -1748,7 +1751,10 @@ void php3_hw_pipecgi(INTERNAL_FUNCTION_PARAMETERS) { hw_document *doc; char cgi_env_str[1000]; #if APACHE - server_rec *serv = php3_rqst->server; + server_rec *serv; + SLS_FETCH(); + + serv = ((request_rec *) SG(server_context))->server; #endif if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { @@ -1809,7 +1815,10 @@ void php3_hw_insertdocument(INTERNAL_FUNCTION_PARAMETERS) { hw_connection *ptr; hw_document *docptr; #if APACHE - server_rec *serv = php3_rqst->server; + server_rec *serv; + SLS_FETCH(); + + serv = ((request_rec *) SG(server_context))->server; #endif if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { |