cvs: php4 /sapi/pi3web pi3web_sapi.c

dbeu Tue Aug 14 13:31:01 2001 EDT Modified files: /php4/sapi/pi3web pi3web_sapi.c Log: TSRMLS fixes Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.31 php4/sapi/pi3web/pi3web_sapi.c:1.32 --- php4/sapi/pi3web/pi3web_sapi.c:1.31 Wed Aug 8 10:01:21 2001 +++ php4/sapi/pi3web/pi3web_sapi.c Tue Aug 14 13:31:00 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.31 2001/08/08 14:01:21 zeev Exp $ */ +/* $Id: pi3web_sapi.c,v 1.32 2001/08/14 17:31:00 dbeu Exp $ */ #include "pi3web_sapi.h" #include "php.h" @@ -71,14 +71,13 @@ char variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE]; DWORD variable_len; LPCONTROL_BLOCK lpCB; - TSRMLS_FETCH(); lpCB = (LPCONTROL_BLOCK) SG(server_context); 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.31 2001/08/08 14:01:21 zeev Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.32 2001/08/14 17:31:00 dbeu 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); @@ -193,7 +192,7 @@ combined_headers = (char *) emalloc(total_length+1); combined_headers_ptr = combined_headers; if (SG(sapi_headers).send_default_content_type) { - concat_header(&default_content_type, (void *) &combined_headers_ptr); + concat_header(&default_content_type, (void *) &combined_headers_ptr TSRMLS_CC); sapi_free_header(&default_content_type); /* we no longer need it */ } zend_llist_apply_with_argument(&SG(sapi_headers).headers, (llist_apply_with_arg_func_t) concat_header, (void *) &combined_headers_ptr TSRMLS_CC); @@ -301,7 +300,7 @@ STANDARD_SAPI_MODULE_PROPERTIES }; -static void init_request_info(sapi_globals_struct *sapi_globals, LPCONTROL_BLOCK lpCB) +static void init_request_info(LPCONTROL_BLOCK lpCB TSRMLS_DC) { char *path_end = strrchr(lpCB->lpszFileName, PHP_DIR_SEPARATOR); if ( path_end ) *path_end = PHP_DIR_SEPARATOR; @@ -384,7 +383,7 @@ file_handle.opened_path = NULL; CG(extended_info) = 0; - init_request_info(sapi_globals, lpCB); + init_request_info(lpCB TSRMLS_CC); php_request_startup(TSRMLS_C); hash_pi3web_variables(TSRMLS_C);