cvs: php4 /sapi/apache mod_php4.c sapi_apache.c

zeev Wed Aug 1 18:53:26 2001 EDT Modified files: /php4/sapi/apache mod_php4.c sapi_apache.c Log: Fix Apache/ZTS build Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.113 php4/sapi/apache/mod_php4.c:1.114 --- php4/sapi/apache/mod_php4.c:1.113 Tue Jul 31 00:53:53 2001 +++ php4/sapi/apache/mod_php4.c Wed Aug 1 18:53:26 2001 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.113 2001/07/31 04:53:53 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.114 2001/08/01 22:53:26 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -326,7 +326,6 @@ static int php_apache_sapi_activate(TSRMLS_D) { request_rec *r = (request_rec *) SG(server_context); - TSRMLS_FETCH(); /* * For the Apache module version, this bit of code registers a cleanup Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.31 php4/sapi/apache/sapi_apache.c:1.32 --- php4/sapi/apache/sapi_apache.c:1.31 Mon Jul 30 00:58:07 2001 +++ php4/sapi/apache/sapi_apache.c Wed Aug 1 18:53:26 2001 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.31 2001/07/30 04:58:07 zeev Exp $ */ +/* $Id: sapi_apache.c,v 1.32 2001/08/01 22:53:26 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -60,10 +60,9 @@ /* {{{ apache_php_module_main */ -int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC TSRMLS_DC) +int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) { zend_file_handle file_handle; - TSRMLS_FETCH(); if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE;