cvs: php4 /sapi/pi3web pi3web_sapi.c /sapi/thttpd thttpd.c

sas Sun Aug 5 10:17:55 2001 EDT Modified files: /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/thttpd thttpd.c Log: further tsrm cleanup Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.28 php4/sapi/pi3web/pi3web_sapi.c:1.29 --- php4/sapi/pi3web/pi3web_sapi.c:1.28 Sun Aug 5 01:35:06 2001 +++ php4/sapi/pi3web/pi3web_sapi.c Sun Aug 5 10:17:55 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.28 2001/08/05 05:35:06 sebastian Exp $ */ +/* $Id: pi3web_sapi.c,v 1.29 2001/08/05 14:17:55 sas 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.28 2001/08/05 05:35:06 sebastian Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.29 2001/08/05 14:17:55 sas 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); @@ -180,7 +180,6 @@ char *combined_headers, *combined_headers_ptr; LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context); sapi_header_struct default_content_type; - TSRMLS_FETCH(); if ( !IWasLoaded ) return SAPI_HEADER_SENT_SUCCESSFULLY; @@ -320,7 +319,7 @@ SG(sapi_headers).http_response_code = 200; } -static void hash_pi3web_variables(TSRMLS_D TSRMLS_DC) +static void hash_pi3web_variables(TSRMLS_D) { char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE]; char *variable_buf; Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.51 php4/sapi/thttpd/thttpd.c:1.52 --- php4/sapi/thttpd/thttpd.c:1.51 Sun Aug 5 09:26:54 2001 +++ php4/sapi/thttpd/thttpd.c Sun Aug 5 10:17:55 2001 @@ -260,7 +260,7 @@ php_request_shutdown(NULL); } -static void thttpd_request_ctor(TSRMLS_D TSRMLS_DC) +static void thttpd_request_ctor(TSRMLS_D) { int offset; smart_str s = {0}; @@ -295,7 +295,7 @@ } } -static void thttpd_request_dtor(TSRMLS_D TSRMLS_DC) +static void thttpd_request_dtor(TSRMLS_D) { if (SG(request_info).query_string) free(SG(request_info).query_string);