[PHP4BETA] CVS update: php4/ext/apache

Date: Friday April 23, 1999 @ 20:11 Author: zeev Update of /repository/php4/ext/apache In directory php:/tmp/cvs-serv8598/ext/apache Modified Files: apache.c Log Message: A lot of cleanups... Removed old thread-safe code and other redundant code and files Index: php4/ext/apache/apache.c diff -u php4/ext/apache/apache.c:1.3 php4/ext/apache/apache.c:1.4 --- php4/ext/apache/apache.c:1.3 Fri Apr 23 16:05:53 1999 +++ php4/ext/apache/apache.c Fri Apr 23 20:11:50 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache.c,v 1.3 1999/04/23 20:05:53 zeev Exp $ */ +/* $Id: apache.c,v 1.4 1999/04/24 00:11:50 zeev Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "php_globals.h" @@ -130,7 +130,6 @@ pval *arg_name,*arg_val; char *note_val; int arg_count = ARG_COUNT(ht); -TLS_VARS; if (arg_count<1 || arg_count>2 || getParameters(ht,arg_count,&arg_name,&arg_val) == FAILURE ) { @@ -138,11 +137,11 @@ } convert_to_string(arg_name); - note_val = (char *) table_get(GLOBAL(php3_rqst)->notes,arg_name->value.str.val); + note_val = (char *) table_get(php3_rqst->notes,arg_name->value.str.val); if (arg_count == 2) { convert_to_string(arg_val); - table_set(GLOBAL(php3_rqst)->notes,arg_name->value.str.val,arg_val->value.str.val); + table_set(php3_rqst->notes,arg_name->value.str.val,arg_val->value.str.val); } if (note_val) { @@ -159,7 +158,7 @@ char name[64]; char *p; #endif - server_rec *serv = GLOBAL(php3_rqst)->server; + server_rec *serv = php3_rqst->server; extern char server_root[MAX_STRING_LEN]; extern uid_t user_id; extern char *user_name; @@ -215,14 +214,13 @@ { pval *filename; request_rec *rr = NULL; -TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht,1,&filename) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string(filename); - if (!(rr = sub_req_lookup_uri (filename->value.str.val, GLOBAL(php3_rqst)))) { + if (!(rr = sub_req_lookup_uri (filename->value.str.val, php3_rqst))) { php3_error(E_WARNING, "Unable to include '%s' - URI lookup failed", filename->value.str.val); if (rr) destroy_sub_req (rr); RETURN_FALSE; @@ -292,7 +290,7 @@ } convert_to_string(filename); - if(!(rr = sub_req_lookup_uri(filename->value.str.val, GLOBAL(php3_rqst)))) { + if(!(rr = sub_req_lookup_uri(filename->value.str.val, php3_rqst))) { php3_error(E_WARNING, "URI lookup failed", filename->value.str.val); RETURN_FALSE; } @@ -364,7 +362,7 @@ } convert_to_string(filename); - if(!(rr = ap_sub_req_lookup_uri(filename->value.str.val, GLOBAL(php3_rqst)))) { + if(!(rr = ap_sub_req_lookup_uri(filename->value.str.val, php3_rqst))) { php3_error(E_WARNING, "URI lookup failed", filename->value.str.val); RETURN_FALSE; } -- PHP 4 Beta