cvs: php4 /sapi/caudium caudium.c /sapi/fastcgi fastcgi.c /sapi/nsapi nsapi.c /sapi/phttpd phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen
roxen.c /sapi/thttpd thttpd.c

sebastian Sun Aug 5 01:35:07 2001 EDT Modified files: /php4/sapi/caudium caudium.c /php4/sapi/fastcgi fastcgi.c /php4/sapi/nsapi nsapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/roxen roxen.c /php4/sapi/thttpd thttpd.c Log: Remove more duplicate TSRMLS_FETCH() calls. Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.17 php4/sapi/caudium/caudium.c:1.18 --- php4/sapi/caudium/caudium.c:1.17 Sat Aug 4 21:42:45 2001 +++ php4/sapi/caudium/caudium.c Sun Aug 5 01:35:05 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.17 2001/08/05 01:42:45 zeev Exp $ */ +/* $Id: caudium.c,v 1.18 2001/08/05 05:35:05 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.17 2001/08/05 01:42:45 zeev Exp $"); + 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, "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()); @@ -612,8 +612,6 @@ struct thread_state *state; extern struct program *thread_id_prog; #endif - TSRMLS_FETCH(); - TSRMLS_FETCH(); TSRMLS_FETCH(); GET_THIS(); THIS->filename = ureq->filename; Index: php4/sapi/fastcgi/fastcgi.c diff -u php4/sapi/fastcgi/fastcgi.c:1.12 php4/sapi/fastcgi/fastcgi.c:1.13 --- php4/sapi/fastcgi/fastcgi.c:1.12 Sat Aug 4 21:42:46 2001 +++ php4/sapi/fastcgi/fastcgi.c Sun Aug 5 01:35:05 2001 @@ -196,7 +196,6 @@ { 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/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.19 php4/sapi/nsapi/nsapi.c:1.20 --- php4/sapi/nsapi/nsapi.c:1.19 Sat Jul 28 07:36:33 2001 +++ php4/sapi/nsapi/nsapi.c Sun Aug 5 01:35:05 2001 @@ -448,7 +448,6 @@ int result; zend_file_handle file_handle; TSRMLS_FETCH(); - TSRMLS_FETCH(); if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.28 php4/sapi/phttpd/phttpd.c:1.29 --- php4/sapi/phttpd/phttpd.c:1.28 Sat Aug 4 21:42:47 2001 +++ php4/sapi/phttpd/phttpd.c Sun Aug 5 01:35:05 2001 @@ -255,7 +255,6 @@ zend_file_handle file_handle; struct httpinfo *hip = PHG(cip)->hip; TSRMLS_FETCH(); - TSRMLS_FETCH(); if (php_request_startup(TSRMLS_C) == FAILURE) { return -1; Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.27 php4/sapi/pi3web/pi3web_sapi.c:1.28 --- php4/sapi/pi3web/pi3web_sapi.c:1.27 Tue Jul 31 02:28:04 2001 +++ php4/sapi/pi3web/pi3web_sapi.c Sun Aug 5 01:35:06 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.27 2001/07/31 06:28:04 zeev Exp $ */ +/* $Id: pi3web_sapi.c,v 1.28 2001/08/05 05:35:06 sebastian Exp $ */ #include "pi3web_sapi.h" #include "php.h" @@ -78,7 +78,7 @@ PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.27 2001/07/31 06:28:04 zeev Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.28 2001/08/05 05:35:06 sebastian Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -377,8 +377,6 @@ zend_file_handle file_handle; char *header_line; int iRet = PIAPI_COMPLETED; - TSRMLS_FETCH(); - TSRMLS_FETCH(); TSRMLS_FETCH(); zend_try { Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.44 php4/sapi/roxen/roxen.c:1.45 --- php4/sapi/roxen/roxen.c:1.44 Sat Aug 4 21:42:47 2001 +++ php4/sapi/roxen/roxen.c Sun Aug 5 01:35:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.44 2001/08/05 01:42:47 zeev Exp $ */ +/* $Id: roxen.c,v 1.45 2001/08/05 05:35:06 sebastian Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -446,7 +446,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.44 2001/08/05 01:42:47 zeev Exp $"); + 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, "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()); @@ -584,7 +584,6 @@ char *dir; zend_file_handle file_handle; #ifdef ZTS - TSRMLS_FETCH(); TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.48 php4/sapi/thttpd/thttpd.c:1.49 --- php4/sapi/thttpd/thttpd.c:1.48 Sat Jul 28 07:36:36 2001 +++ php4/sapi/thttpd/thttpd.c Sun Aug 5 01:35:06 2001 @@ -262,7 +262,6 @@ { zend_file_handle file_handle; TSRMLS_FETCH(); - TSRMLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; @@ -446,7 +445,6 @@ int do_work = 50; httpd_conn *hc; TSRMLS_FETCH(); - TSRMLS_FETCH(); while (do_work) { hc = dequeue_request(); @@ -518,7 +516,6 @@ #ifdef ZTS queue_request(hc); #else - TSRMLS_FETCH(); TSRMLS_FETCH(); return thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC); #endif