[PHP4BETA] CVS update: php4/ext/hyperwave

Date: Monday April 26, 1999 @ 13:26 Author: zeev Update of /repository/php4/ext/hyperwave In directory php:/tmp/cvs-serv18494/ext/hyperwave Modified Files: hg_comm.c hw.c Log Message: * 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) Index: php4/ext/hyperwave/hg_comm.c diff -u php4/ext/hyperwave/hg_comm.c:1.2 php4/ext/hyperwave/hg_comm.c:1.3 --- php4/ext/hyperwave/hg_comm.c:1.2 Fri Apr 23 20:11:52 1999 +++ php4/ext/hyperwave/hg_comm.c Mon Apr 26 13:26:34 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.2 1999/04/24 00:11:52 zeev Exp $ */ +/* $Id: hg_comm.c,v 1.3 1999/04/26 17:26:34 zeev Exp $ */ /* #define HW_DEBUG */ @@ -461,7 +461,9 @@ #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++) { Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.3 php4/ext/hyperwave/hw.c:1.4 --- php4/ext/hyperwave/hw.c:1.3 Fri Apr 23 20:11:52 1999 +++ php4/ext/hyperwave/hw.c Mon Apr 26 13:26:34 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.3 1999/04/24 00:11:52 zeev Exp $ */ +/* $Id: hw.c,v 1.4 1999/04/26 17:26:34 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -1681,7 +1681,10 @@ 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 @@ 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 @@ 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) { -- PHP 4 Beta