cvs: php4(PHP_4_3) /sapi/aolserver aolserver.c /sapi/apache mod_php4.c sapi_apache.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler
sapi_apache2.c /sapi/caudium caudium.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/isapi php4isapi.c /sapi/nsapi nsapi.c /sapi/phttpd
phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen roxen.c /sapi/servlet servlet.c /sapi/thttpd thttpd.c /sapi/tux php_tux.c /sapi/webjames
webjames.c
| From: | Sascha Schumann | Date: | Sat, 17 May 2003 08:06:54 +0000 |
| Subject: | cvs: php4(PHP_4_3) /sapi/aolserver aolserver.c /sapi/apache mod_php4.c sapi_apache.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/caudium caudium.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/isapi php4isapi.c /sapi/nsapi nsapi.c /sapi/phttpd phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen roxen.c /sapi/servlet servlet.c /sapi/thttpd thttpd.c /sapi/tux php_tux.c /sapi/webjames webjames.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20986@lists.php.net to get a copy of this message | ||
sas Sat May 17 04:06:54 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/aolserver aolserver.c
/php4/sapi/apache mod_php4.c sapi_apache.c
/php4/sapi/apache2filter sapi_apache2.c
/php4/sapi/apache2handler sapi_apache2.c
/php4/sapi/caudium caudium.c
/php4/sapi/cgi cgi_main.c
/php4/sapi/cli php_cli.c
/php4/sapi/isapi php4isapi.c
/php4/sapi/nsapi nsapi.c
/php4/sapi/phttpd phttpd.c
/php4/sapi/pi3web pi3web_sapi.c
/php4/sapi/roxen roxen.c
/php4/sapi/servlet servlet.c
/php4/sapi/thttpd thttpd.c
/php4/sapi/tux php_tux.c
/php4/sapi/webjames webjames.c
Log:
protect against further surprises by initializing all zend_file_handle's
Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.72.2.1 php4/sapi/aolserver/aolserver.c:1.72.2.2 --- php4/sapi/aolserver/aolserver.c:1.72.2.1 Tue Dec 31 11:26:41 2002 +++ php4/sapi/aolserver/aolserver.c Sat May 17 04:06:52 2003 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.72.2.1 2002/12/31 16:26:41 sebastian Exp $ */ +/* $Id: aolserver.c,v 1.72.2.2 2003/05/17 08:06:52 sas Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72.2.1 2002/12/31 16:26:41 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72.2.2 2003/05/17 08:06:52 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()); @@ -404,7 +404,7 @@ static int php_ns_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.146.2.8 php4/sapi/apache/mod_php4.c:1.146.2.9 --- php4/sapi/apache/mod_php4.c:1.146.2.8 Fri May 9 05:08:09 2003 +++ php4/sapi/apache/mod_php4.c Sat May 17 04:06:52 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.146.2.8 2003/05/09 09:08:09 edink Exp $ */ +/* $Id: mod_php4.c,v 1.146.2.9 2003/05/17 08:06:52 sas Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -534,7 +534,7 @@ TSRMLS_FETCH(); if (AP(in_request)) { - zend_file_handle fh; + zend_file_handle fh = {0}; fh.filename = r->filename; fh.opened_path = NULL; Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.40.4.2 php4/sapi/apache/sapi_apache.c:1.40.4.3 --- php4/sapi/apache/sapi_apache.c:1.40.4.2 Fri May 16 19:08:47 2003 +++ php4/sapi/apache/sapi_apache.c Sat May 17 04:06:52 2003 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.40.4.2 2003/05/16 23:08:47 moriyoshi Exp $ */ +/* $Id: sapi_apache.c,v 1.40.4.3 2003/05/17 08:06:52 sas Exp $ */ #include "php_apache_http.h" @@ -28,7 +28,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) { int retval = OK; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91.2.11 php4/sapi/apache2filter/sapi_apache2.c:1.91.2.12 --- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.11 Wed May 14 14:19:57 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Sat May 17 04:06:52 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.91.2.11 2003/05/14 18:19:57 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.12 2003/05/17 08:06:52 sas Exp $ */ #include <fcntl.h> @@ -445,7 +445,7 @@ } for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) { - zend_file_handle zfd; + zend_file_handle zfd = {0}; if (!ctx->request_processed && APR_BUCKET_IS_FILE(b)) { const char *path; Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.1.2.11 php4/sapi/apache2handler/sapi_apache2.c:1.1.2.12 --- php4/sapi/apache2handler/sapi_apache2.c:1.1.2.11 Wed May 14 14:19:57 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Sat May 17 04:06:52 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.1.2.11 2003/05/14 18:19:57 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.12 2003/05/17 08:06:52 sas Exp $ */ #include <fcntl.h> @@ -507,7 +507,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); highlight_file((char *)r->filename, &syntax_highlighter_ini TSRMLS_CC); } else { - zend_file_handle zfd; + zend_file_handle zfd = {0}; zfd.type = ZEND_HANDLE_FILENAME; zfd.filename = (char *) r->filename; Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.28.2.1 php4/sapi/caudium/caudium.c:1.28.2.2 --- php4/sapi/caudium/caudium.c:1.28.2.1 Tue Dec 31 11:27:03 2002 +++ php4/sapi/caudium/caudium.c Sat May 17 04:06:52 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.28.2.1 2002/12/31 16:27:03 sebastian Exp $ */ +/* $Id: caudium.c,v 1.28.2.2 2003/05/17 08:06:52 sas Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -444,7 +444,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28.2.1 2002/12/31 16:27:03 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28.2.2 2003/05/17 08:06:52 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()); @@ -564,7 +564,7 @@ static void php_caudium_module_main(php_caudium_request *ureq) { int res; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; #ifndef USE_PIKE_LEVEL_THREADS struct thread_state *state; extern struct program *thread_id_prog; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.190.2.24 php4/sapi/cgi/cgi_main.c:1.190.2.25 --- php4/sapi/cgi/cgi_main.c:1.190.2.24 Thu May 15 10:47:00 2003 +++ php4/sapi/cgi/cgi_main.c Sat May 17 04:06:52 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.24 2003/05/15 14:47:00 sniper Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.25 2003/05/17 08:06:52 sas Exp $ */ #include "php.h" #include "php_globals.h" @@ -894,7 +894,7 @@ { int exit_status = SUCCESS; int cgi = 0, c, i, len; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int retval = FAILURE; char *s; /* temporary locals */ Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.51.2.14 php4/sapi/cli/php_cli.c:1.51.2.15 --- php4/sapi/cli/php_cli.c:1.51.2.14 Tue May 13 20:11:01 2003 +++ php4/sapi/cli/php_cli.c Sat May 17 04:06:52 2003 @@ -438,7 +438,7 @@ { int exit_status = SUCCESS; int c; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; /* temporary locals */ int behavior=PHP_MODE_STANDARD; int no_headers=1; Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.92.2.4 php4/sapi/isapi/php4isapi.c:1.92.2.5 --- php4/sapi/isapi/php4isapi.c:1.92.2.4 Thu Mar 27 12:57:58 2003 +++ php4/sapi/isapi/php4isapi.c Sat May 17 04:06:53 2003 @@ -717,7 +717,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; zend_bool stack_overflown=0; #ifdef PHP_ENABLE_SEH LPEXCEPTION_POINTERS e; Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.28.2.5 php4/sapi/nsapi/nsapi.c:1.28.2.6 --- php4/sapi/nsapi/nsapi.c:1.28.2.5 Mon Mar 24 05:33:47 2003 +++ php4/sapi/nsapi/nsapi.c Sat May 17 04:06:53 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.28.2.5 2003/03/24 10:33:47 thetaphi Exp $ */ +/* $Id: nsapi.c,v 1.28.2.6 2003/05/17 08:06:53 sas Exp $ */ /* * PHP includes @@ -493,7 +493,7 @@ int nsapi_module_main(NSLS_D TSRMLS_DC) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.35.2.1 php4/sapi/phttpd/phttpd.c:1.35.2.2 --- php4/sapi/phttpd/phttpd.c:1.35.2.1 Tue Dec 31 11:27:15 2002 +++ php4/sapi/phttpd/phttpd.c Sat May 17 04:06:53 2003 @@ -247,7 +247,7 @@ int php_doit(TSRMLS_D TSRMLS_DC) { struct stat sb; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; struct httpinfo *hip = PHG(cip)->hip; TSRMLS_FETCH(); Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.46.2.2 php4/sapi/pi3web/pi3web_sapi.c:1.46.2.3 --- php4/sapi/pi3web/pi3web_sapi.c:1.46.2.2 Tue Dec 31 11:27:16 2002 +++ php4/sapi/pi3web/pi3web_sapi.c Sat May 17 04:06:53 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.46.2.2 2002/12/31 16:27:16 sebastian Exp $ */ +/* $Id: pi3web_sapi.c,v 1.46.2.3 2003/05/17 08:06:53 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.46.2.2 2002/12/31 16:27:16 sebastian Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46.2.3 2003/05/17 08:06:53 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); @@ -387,7 +387,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int iRet = PIAPI_COMPLETED; TSRMLS_FETCH(); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.53.2.2 php4/sapi/roxen/roxen.c:1.53.2.3 --- php4/sapi/roxen/roxen.c:1.53.2.2 Tue Dec 31 11:27:17 2002 +++ php4/sapi/roxen/roxen.c Sat May 17 04:06:53 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.53.2.2 2002/12/31 16:27:17 sebastian Exp $ */ +/* $Id: roxen.c,v 1.53.2.3 2003/05/17 08:06:53 sas Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -438,7 +438,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53.2.2 2002/12/31 16:27:17 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53.2.3 2003/05/17 08:06:53 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()); @@ -575,7 +575,7 @@ { int res, len; char *dir; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.65.2.3 php4/sapi/servlet/servlet.c:1.65.2.4 --- php4/sapi/servlet/servlet.c:1.65.2.3 Thu Mar 6 15:58:19 2003 +++ php4/sapi/servlet/servlet.c Sat May 17 04:06:53 2003 @@ -310,7 +310,7 @@ jstring contentType, jint contentLength, jstring authUser, jboolean display_source_mode) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int retval; #ifndef VIRTUAL_DIR char cwd[MAXPATHLEN]; Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.77.2.9 php4/sapi/thttpd/thttpd.c:1.77.2.10 --- php4/sapi/thttpd/thttpd.c:1.77.2.9 Fri May 16 18:33:15 2003 +++ php4/sapi/thttpd/thttpd.c Sat May 17 04:06:53 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: thttpd.c,v 1.77.2.9 2003/05/16 22:33:15 sas Exp $ */ +/* $Id: thttpd.c,v 1.77.2.10 2003/05/17 08:06:53 sas Exp $ */ #include "php.h" #include "SAPI.h" @@ -388,7 +388,7 @@ static void thttpd_module_main(int show_source TSRMLS_DC) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return; Index: php4/sapi/tux/php_tux.c diff -u php4/sapi/tux/php_tux.c:1.18.2.2 php4/sapi/tux/php_tux.c:1.18.2.3 --- php4/sapi/tux/php_tux.c:1.18.2.2 Fri Mar 14 12:40:55 2003 +++ php4/sapi/tux/php_tux.c Sat May 17 04:06:53 2003 @@ -296,7 +296,7 @@ static void tux_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; Index: php4/sapi/webjames/webjames.c diff -u php4/sapi/webjames/webjames.c:1.5.2.1 php4/sapi/webjames/webjames.c:1.5.2.2 --- php4/sapi/webjames/webjames.c:1.5.2.1 Tue Dec 31 11:27:24 2002 +++ php4/sapi/webjames/webjames.c Sat May 17 04:06:53 2003 @@ -142,7 +142,7 @@ static void webjames_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; FILE *fp=NULL; char *path;
Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.72.2.1 php4/sapi/aolserver/aolserver.c:1.72.2.2 --- php4/sapi/aolserver/aolserver.c:1.72.2.1 Tue Dec 31 11:26:41 2002 +++ php4/sapi/aolserver/aolserver.c Sat May 17 04:06:52 2003 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.72.2.1 2002/12/31 16:26:41 sebastian Exp $ */ +/* $Id: aolserver.c,v 1.72.2.2 2003/05/17 08:06:52 sas Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72.2.1 2002/12/31 16:26:41 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72.2.2 2003/05/17 08:06:52 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()); @@ -404,7 +404,7 @@ static int php_ns_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.146.2.8 php4/sapi/apache/mod_php4.c:1.146.2.9 --- php4/sapi/apache/mod_php4.c:1.146.2.8 Fri May 9 05:08:09 2003 +++ php4/sapi/apache/mod_php4.c Sat May 17 04:06:52 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.146.2.8 2003/05/09 09:08:09 edink Exp $ */ +/* $Id: mod_php4.c,v 1.146.2.9 2003/05/17 08:06:52 sas Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -534,7 +534,7 @@ TSRMLS_FETCH(); if (AP(in_request)) { - zend_file_handle fh; + zend_file_handle fh = {0}; fh.filename = r->filename; fh.opened_path = NULL; Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.40.4.2 php4/sapi/apache/sapi_apache.c:1.40.4.3 --- php4/sapi/apache/sapi_apache.c:1.40.4.2 Fri May 16 19:08:47 2003 +++ php4/sapi/apache/sapi_apache.c Sat May 17 04:06:52 2003 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.40.4.2 2003/05/16 23:08:47 moriyoshi Exp $ */ +/* $Id: sapi_apache.c,v 1.40.4.3 2003/05/17 08:06:52 sas Exp $ */ #include "php_apache_http.h" @@ -28,7 +28,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) { int retval = OK; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91.2.11 php4/sapi/apache2filter/sapi_apache2.c:1.91.2.12 --- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.11 Wed May 14 14:19:57 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Sat May 17 04:06:52 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.91.2.11 2003/05/14 18:19:57 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.12 2003/05/17 08:06:52 sas Exp $ */ #include <fcntl.h> @@ -445,7 +445,7 @@ } for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) { - zend_file_handle zfd; + zend_file_handle zfd = {0}; if (!ctx->request_processed && APR_BUCKET_IS_FILE(b)) { const char *path; Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.1.2.11 php4/sapi/apache2handler/sapi_apache2.c:1.1.2.12 --- php4/sapi/apache2handler/sapi_apache2.c:1.1.2.11 Wed May 14 14:19:57 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Sat May 17 04:06:52 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.1.2.11 2003/05/14 18:19:57 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.12 2003/05/17 08:06:52 sas Exp $ */ #include <fcntl.h> @@ -507,7 +507,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); highlight_file((char *)r->filename, &syntax_highlighter_ini TSRMLS_CC); } else { - zend_file_handle zfd; + zend_file_handle zfd = {0}; zfd.type = ZEND_HANDLE_FILENAME; zfd.filename = (char *) r->filename; Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.28.2.1 php4/sapi/caudium/caudium.c:1.28.2.2 --- php4/sapi/caudium/caudium.c:1.28.2.1 Tue Dec 31 11:27:03 2002 +++ php4/sapi/caudium/caudium.c Sat May 17 04:06:52 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.28.2.1 2002/12/31 16:27:03 sebastian Exp $ */ +/* $Id: caudium.c,v 1.28.2.2 2003/05/17 08:06:52 sas Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -444,7 +444,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28.2.1 2002/12/31 16:27:03 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28.2.2 2003/05/17 08:06:52 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()); @@ -564,7 +564,7 @@ static void php_caudium_module_main(php_caudium_request *ureq) { int res; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; #ifndef USE_PIKE_LEVEL_THREADS struct thread_state *state; extern struct program *thread_id_prog; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.190.2.24 php4/sapi/cgi/cgi_main.c:1.190.2.25 --- php4/sapi/cgi/cgi_main.c:1.190.2.24 Thu May 15 10:47:00 2003 +++ php4/sapi/cgi/cgi_main.c Sat May 17 04:06:52 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.24 2003/05/15 14:47:00 sniper Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.25 2003/05/17 08:06:52 sas Exp $ */ #include "php.h" #include "php_globals.h" @@ -894,7 +894,7 @@ { int exit_status = SUCCESS; int cgi = 0, c, i, len; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int retval = FAILURE; char *s; /* temporary locals */ Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.51.2.14 php4/sapi/cli/php_cli.c:1.51.2.15 --- php4/sapi/cli/php_cli.c:1.51.2.14 Tue May 13 20:11:01 2003 +++ php4/sapi/cli/php_cli.c Sat May 17 04:06:52 2003 @@ -438,7 +438,7 @@ { int exit_status = SUCCESS; int c; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; /* temporary locals */ int behavior=PHP_MODE_STANDARD; int no_headers=1; Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.92.2.4 php4/sapi/isapi/php4isapi.c:1.92.2.5 --- php4/sapi/isapi/php4isapi.c:1.92.2.4 Thu Mar 27 12:57:58 2003 +++ php4/sapi/isapi/php4isapi.c Sat May 17 04:06:53 2003 @@ -717,7 +717,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; zend_bool stack_overflown=0; #ifdef PHP_ENABLE_SEH LPEXCEPTION_POINTERS e; Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.28.2.5 php4/sapi/nsapi/nsapi.c:1.28.2.6 --- php4/sapi/nsapi/nsapi.c:1.28.2.5 Mon Mar 24 05:33:47 2003 +++ php4/sapi/nsapi/nsapi.c Sat May 17 04:06:53 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.28.2.5 2003/03/24 10:33:47 thetaphi Exp $ */ +/* $Id: nsapi.c,v 1.28.2.6 2003/05/17 08:06:53 sas Exp $ */ /* * PHP includes @@ -493,7 +493,7 @@ int nsapi_module_main(NSLS_D TSRMLS_DC) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.35.2.1 php4/sapi/phttpd/phttpd.c:1.35.2.2 --- php4/sapi/phttpd/phttpd.c:1.35.2.1 Tue Dec 31 11:27:15 2002 +++ php4/sapi/phttpd/phttpd.c Sat May 17 04:06:53 2003 @@ -247,7 +247,7 @@ int php_doit(TSRMLS_D TSRMLS_DC) { struct stat sb; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; struct httpinfo *hip = PHG(cip)->hip; TSRMLS_FETCH(); Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.46.2.2 php4/sapi/pi3web/pi3web_sapi.c:1.46.2.3 --- php4/sapi/pi3web/pi3web_sapi.c:1.46.2.2 Tue Dec 31 11:27:16 2002 +++ php4/sapi/pi3web/pi3web_sapi.c Sat May 17 04:06:53 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.46.2.2 2002/12/31 16:27:16 sebastian Exp $ */ +/* $Id: pi3web_sapi.c,v 1.46.2.3 2003/05/17 08:06:53 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.46.2.2 2002/12/31 16:27:16 sebastian Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46.2.3 2003/05/17 08:06:53 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); @@ -387,7 +387,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int iRet = PIAPI_COMPLETED; TSRMLS_FETCH(); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.53.2.2 php4/sapi/roxen/roxen.c:1.53.2.3 --- php4/sapi/roxen/roxen.c:1.53.2.2 Tue Dec 31 11:27:17 2002 +++ php4/sapi/roxen/roxen.c Sat May 17 04:06:53 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.53.2.2 2002/12/31 16:27:17 sebastian Exp $ */ +/* $Id: roxen.c,v 1.53.2.3 2003/05/17 08:06:53 sas Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -438,7 +438,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53.2.2 2002/12/31 16:27:17 sebastian Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53.2.3 2003/05/17 08:06:53 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()); @@ -575,7 +575,7 @@ { int res, len; char *dir; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.65.2.3 php4/sapi/servlet/servlet.c:1.65.2.4 --- php4/sapi/servlet/servlet.c:1.65.2.3 Thu Mar 6 15:58:19 2003 +++ php4/sapi/servlet/servlet.c Sat May 17 04:06:53 2003 @@ -310,7 +310,7 @@ jstring contentType, jint contentLength, jstring authUser, jboolean display_source_mode) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int retval; #ifndef VIRTUAL_DIR char cwd[MAXPATHLEN]; Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.77.2.9 php4/sapi/thttpd/thttpd.c:1.77.2.10 --- php4/sapi/thttpd/thttpd.c:1.77.2.9 Fri May 16 18:33:15 2003 +++ php4/sapi/thttpd/thttpd.c Sat May 17 04:06:53 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: thttpd.c,v 1.77.2.9 2003/05/16 22:33:15 sas Exp $ */ +/* $Id: thttpd.c,v 1.77.2.10 2003/05/17 08:06:53 sas Exp $ */ #include "php.h" #include "SAPI.h" @@ -388,7 +388,7 @@ static void thttpd_module_main(int show_source TSRMLS_DC) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return; Index: php4/sapi/tux/php_tux.c diff -u php4/sapi/tux/php_tux.c:1.18.2.2 php4/sapi/tux/php_tux.c:1.18.2.3 --- php4/sapi/tux/php_tux.c:1.18.2.2 Fri Mar 14 12:40:55 2003 +++ php4/sapi/tux/php_tux.c Sat May 17 04:06:53 2003 @@ -296,7 +296,7 @@ static void tux_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; Index: php4/sapi/webjames/webjames.c diff -u php4/sapi/webjames/webjames.c:1.5.2.1 php4/sapi/webjames/webjames.c:1.5.2.2 --- php4/sapi/webjames/webjames.c:1.5.2.1 Tue Dec 31 11:27:24 2002 +++ php4/sapi/webjames/webjames.c Sat May 17 04:06:53 2003 @@ -142,7 +142,7 @@ static void webjames_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; FILE *fp=NULL; char *path;