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

sebastian Sun Aug 5 09:26:55 2001 EDT Modified files: /php4/sapi/caudium caudium.c /php4/sapi/thttpd thttpd.c Log: Even more TSRM cleanup. Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.19 php4/sapi/caudium/caudium.c:1.20 --- php4/sapi/caudium/caudium.c:1.19 Sun Aug 5 08:36:13 2001 +++ php4/sapi/caudium/caudium.c Sun Aug 5 09:26:54 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.19 2001/08/05 12:36:13 sebastian Exp $ */ +/* $Id: caudium.c,v 1.20 2001/08/05 13:26:54 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.19 2001/08/05 12:36:13 sebastian Exp $"); + 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, "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()); @@ -474,7 +474,7 @@ }; -INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC) +INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC) { char *tmp; php_register_variable("PHP_SELF", SG(request_info).request_uri, Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.50 php4/sapi/thttpd/thttpd.c:1.51 --- php4/sapi/thttpd/thttpd.c:1.50 Sun Aug 5 06:32:48 2001 +++ php4/sapi/thttpd/thttpd.c Sun Aug 5 09:26:54 2001 @@ -441,7 +441,7 @@ thread_atomic_dec(nr_free_threads); - thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC); + thttpd_real_php_request(hc TSRMLS_CC); shutdown(hc->conn_fd, 0); destroy_conn(hc); free(hc); @@ -480,7 +480,7 @@ #endif -static off_t thttpd_real_php_request(httpd_conn *hc TSRMLS_DC TSRMLS_DC) +static off_t thttpd_real_php_request(httpd_conn *hc TSRMLS_DC) { TG(hc) = hc; hc->bytes_sent = 0;