cvs: php4 /sapi/caudium caudium.c /sapi/fastcgi fastcgi.c

sebastian Sun Aug 5 08:36:13 2001 EDT Modified files: /php4/sapi/caudium caudium.c /php4/sapi/fastcgi fastcgi.c Log: More tsrm-related cleanup. Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.18 php4/sapi/caudium/caudium.c:1.19 --- php4/sapi/caudium/caudium.c:1.18 Sun Aug 5 01:35:05 2001 +++ php4/sapi/caudium/caudium.c Sun Aug 5 08:36:13 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.18 2001/08/05 05:35:05 sebastian Exp $ */ +/* $Id: caudium.c,v 1.19 2001/08/05 12:36:13 sebastian Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -442,7 +442,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.18 2001/08/05 05:35:05 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.19 2001/08/05 12:36:13 sebastian Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -520,9 +520,9 @@ } -static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC) +static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC) { - THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC TSRMLS_CC TSRMLS_CC), "register_variables"); + THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC), "register_variables"); } /* this structure is static (as in "it does not change") */ Index: php4/sapi/fastcgi/fastcgi.c diff -u php4/sapi/fastcgi/fastcgi.c:1.13 php4/sapi/fastcgi/fastcgi.c:1.14 --- php4/sapi/fastcgi/fastcgi.c:1.13 Sun Aug 5 01:35:05 2001 +++ php4/sapi/fastcgi/fastcgi.c Sun Aug 5 08:36:13 2001 @@ -140,7 +140,7 @@ } -static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC) +static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC) { char *self = getenv("REQUEST_URI"); char *ptr = strchr( self, '?' ); @@ -192,10 +192,9 @@ STANDARD_SAPI_MODULE_PROPERTIES }; -static void fastcgi_module_main(TSRMLS_D TSRMLS_DC) +static void fastcgi_module_main(TSRMLS_D) { zend_file_handle file_handle; - TSRMLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated;