cvs: php4 /sapi/aolserver aolserver.c /sapi/apache2filter sapi_apache2.c /sapi/caudium caudium.c /sapi/fastcgi fastcgi.c /sapi/roxen roxen.c
/sapi/tux php_tux.c

sas Sun Aug 5 10:27:39 2001 EDT Modified files: /php4/sapi/aolserver aolserver.c /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/caudium caudium.c /php4/sapi/fastcgi fastcgi.c /php4/sapi/roxen roxen.c /php4/sapi/tux php_tux.c Log: further tsrm cleanup Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.59 php4/sapi/aolserver/aolserver.c:1.60 --- php4/sapi/aolserver/aolserver.c:1.59 Sat Aug 4 21:42:44 2001 +++ php4/sapi/aolserver/aolserver.c Sun Aug 5 10:27:38 2001 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.59 2001/08/05 01:42:44 zeev Exp $ */ +/* $Id: aolserver.c,v 1.60 2001/08/05 14:27:38 sas Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -213,7 +213,7 @@ TSRMLS_FETCH(); php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.59 2001/08/05 01:42:44 zeev Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.60 2001/08/05 14:27:38 sas 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()); @@ -311,7 +311,6 @@ int i; char buf[NS_BUF_SIZE + 1]; char *tmp; - TSRMLS_FETCH(); for(i = 0; i < Ns_SetSize(NSG(conn->headers)); i++) { char *key = Ns_SetKey(NSG(conn->headers), i); @@ -412,8 +411,6 @@ php_ns_module_main(TSRMLS_D) { zend_file_handle file_handle; - TSRMLS_FETCH(); - TSRMLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.37 php4/sapi/apache2filter/sapi_apache2.c:1.38 --- php4/sapi/apache2filter/sapi_apache2.c:1.37 Fri Aug 3 01:05:47 2001 +++ php4/sapi/apache2filter/sapi_apache2.c Sun Aug 5 10:27:38 2001 @@ -265,7 +265,6 @@ { char *content_type; const char *auth; - TSRMLS_FETCH(); PG(during_request_startup) = 0; SG(sapi_headers).http_response_code = 200; @@ -337,7 +336,6 @@ if (ctx->state == 1 && APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(ctx->bb))) { zend_file_handle zfd; apr_bucket *eos; - TSRMLS_FETCH(); /* We want to execute only one script per request. * A bug in Apache or other filters could cause us Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.20 php4/sapi/caudium/caudium.c:1.21 --- php4/sapi/caudium/caudium.c:1.20 Sun Aug 5 09:26:54 2001 +++ php4/sapi/caudium/caudium.c Sun Aug 5 10:27:38 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.20 2001/08/05 13:26:54 sebastian Exp $ */ +/* $Id: caudium.c,v 1.21 2001/08/05 14:27:38 sas Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -356,7 +356,6 @@ INLINE static int php_caudium_low_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) { - TSRMLS_FETCH(); struct pike_string *ind; struct svalue *s_headermap; GET_THIS(); @@ -442,7 +441,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.20 2001/08/05 13:26:54 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.21 2001/08/05 14:27:38 sas 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()); Index: php4/sapi/fastcgi/fastcgi.c diff -u php4/sapi/fastcgi/fastcgi.c:1.14 php4/sapi/fastcgi/fastcgi.c:1.15 --- php4/sapi/fastcgi/fastcgi.c:1.14 Sun Aug 5 08:36:13 2001 +++ php4/sapi/fastcgi/fastcgi.c Sun Aug 5 10:27:38 2001 @@ -122,7 +122,6 @@ size_t read_bytes = 0, tmp; int c; char *pos = buffer; - TSRMLS_FETCH(); while( count_bytes ) { c = FCGX_GetStr( pos, count_bytes, in ); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.45 php4/sapi/roxen/roxen.c:1.46 --- php4/sapi/roxen/roxen.c:1.45 Sun Aug 5 01:35:06 2001 +++ php4/sapi/roxen/roxen.c Sun Aug 5 10:27:39 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.45 2001/08/05 05:35:06 sebastian Exp $ */ +/* $Id: roxen.c,v 1.46 2001/08/05 14:27:39 sas Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -214,12 +214,11 @@ php_roxen_low_ub_write(const char *str, uint str_length) { int sent_bytes = 0; struct pike_string *to_write = NULL; -#ifdef ZTS - TSRMLS_FETCH(); -#endif #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + TSRMLS_FETCH(); + if(!MY_FD_OBJ->prog) { PG(connection_status) = PHP_CONNECTION_ABORTED; zend_bailout(); @@ -246,12 +245,11 @@ static int php_roxen_sapi_ub_write(const char *str, uint str_length) { -#ifdef ZTS - TSRMLS_FETCH(); -#endif #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + TSRMLS_FETCH(); + int sent_bytes = 0, fd = MY_FD; if(fd) { @@ -352,14 +350,12 @@ static int php_roxen_low_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) { -#ifdef ZTS - TSRMLS_FETCH(); -#endif struct pike_string *ind; struct svalue *s_headermap; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + if(!MY_FD_OBJ->prog) { PG(connection_status) = PHP_CONNECTION_ABORTED; zend_bailout(); @@ -399,9 +395,7 @@ #ifdef ROXEN_USE_ZTS GET_THIS(); #endif -#ifdef ZTS TSRMLS_FETCH(); -#endif if(!MY_FD_OBJ->prog) { @@ -446,7 +440,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.45 2001/08/05 05:35:06 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.46 2001/08/05 14:27:39 sas 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()); @@ -583,12 +577,9 @@ int res, len; char *dir; zend_file_handle file_handle; -#ifdef ZTS - TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); #endif -#endif file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = THIS->filename; @@ -621,10 +612,10 @@ struct svalue *done_callback, *raw_fd; struct pike_string *script, *ind; int status = 1; - TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + TSRMLS_FETCH(); if(current_thread == th_self()) error("PHP4.Interpreter->run: Tried to run a PHP-script from a PHP " Index: php4/sapi/tux/php_tux.c diff -u php4/sapi/tux/php_tux.c:1.6 php4/sapi/tux/php_tux.c:1.7 --- php4/sapi/tux/php_tux.c:1.6 Sun Aug 5 01:40:43 2001 +++ php4/sapi/tux/php_tux.c Sun Aug 5 10:27:39 2001 @@ -182,7 +182,6 @@ { char buf[BUF_SIZE + 1]; char *p; - TSRMLS_FETCH(); sprintf(buf, "Server: %s", TUXAPI_version); @@ -276,8 +275,6 @@ static void tux_module_main(TSRMLS_D) { zend_file_handle file_handle; - TSRMLS_FETCH()FETCH(); - TSRMLS_FETCH()FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated;