cvs: php4(PHP_4_3) / NEWS /ext/standard basic_functions.c browscap.c /main main.c php_ini.c /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: | Zeev Suraski | Date: | Wed, 21 May 2003 09:34:18 +0000 |
| Subject: | cvs: php4(PHP_4_3) / NEWS /ext/standard basic_functions.c browscap.c /main main.c php_ini.c /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-21168@lists.php.net to get a copy of this message | ||
zeev Wed May 21 05:34:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 NEWS
/php4/ext/standard basic_functions.c browscap.c
/php4/main main.c php_ini.c
/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:
Revert PHP part of the fd patch
Index: php4/NEWS diff -u php4/NEWS:1.1247.2.209 php4/NEWS:1.1247.2.210 --- php4/NEWS:1.1247.2.209 Tue May 20 20:36:50 2003 +++ php4/NEWS Wed May 21 05:34:11 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? May 2003, Version 4.3.2 -- Improved the engine to use POSIX/socket IO where feasible. (Sascha) - Syncronized bundled GD library with GD 2.0.12. (Ilia) - Removed support for GDLIB version 1.x.x (php_gd.dll) on Windows. (Edin) - Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.543.2.16 php4/ext/standard/basic_functions.c:1.543.2.17 --- php4/ext/standard/basic_functions.c:1.543.2.16 Mon May 19 13:45:50 2003 +++ php4/ext/standard/basic_functions.c Wed May 21 05:34:12 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.543.2.16 2003/05/19 17:45:50 derick Exp $ */ +/* $Id: basic_functions.c,v 1.543.2.17 2003/05/21 09:34:12 zeev Exp $ */ #include "php.h" #include "php_streams.h" @@ -2840,7 +2840,7 @@ PHP_FUNCTION(parse_ini_file) { zval **filename, **process_sections; - zend_file_handle fh = {0}; + zend_file_handle fh; zend_ini_parser_cb_t ini_parser_cb; switch (ARG_COUNT(ht)) { Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.60.2.9 php4/ext/standard/browscap.c:1.60.2.10 --- php4/ext/standard/browscap.c:1.60.2.9 Sat May 17 03:55:18 2003 +++ php4/ext/standard/browscap.c Wed May 21 05:34:12 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.60.2.9 2003/05/17 07:55:18 sas Exp $ */ +/* $Id: browscap.c,v 1.60.2.10 2003/05/21 09:34:12 zeev Exp $ */ #include "php.h" #include "php_regex.h" @@ -150,7 +150,7 @@ char *browscap = INI_STR("browscap"); if (browscap) { - zend_file_handle fh = {0}; + zend_file_handle fh; if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t) browscap_entry_dtor, 1)==FAILURE) { return FAILURE; Index: php4/main/main.c diff -u php4/main/main.c:1.512.2.35 php4/main/main.c:1.512.2.36 --- php4/main/main.c:1.512.2.35 Sat May 17 03:55:18 2003 +++ php4/main/main.c Wed May 21 05:34:12 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.512.2.35 2003/05/17 07:55:18 sas Exp $ */ +/* $Id: main.c,v 1.512.2.36 2003/05/21 09:34:12 zeev Exp $ */ /* {{{ includes */ @@ -763,17 +763,6 @@ } /* }}} */ - -/* {{{ php_open_wrapper_for_zend - */ -static zend_bool php_open_wrapper_for_zend(const char *filename, struct _zend_file_handle *fh) -{ - TSRMLS_FETCH(); - - return php_stream_open_wrapper_as_file_handle((char *)filename, "rb", ENFORCE_SAFE_MODE|USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, fh); -} -/* }}} */ - /* {{{ php_get_configuration_directive_for_zend */ static int php_get_configuration_directive_for_zend(char *name, uint name_length, zval *contents) @@ -1107,7 +1096,6 @@ zuf.printf_function = php_printf; zuf.write_function = php_body_write_wrapper; zuf.fopen_function = php_fopen_wrapper_for_zend; - zuf.open_function = php_open_wrapper_for_zend; zuf.message_handler = php_message_handler_for_zend; zuf.block_interruptions = sapi_module.block_interruptions; zuf.unblock_interruptions = sapi_module.unblock_interruptions; @@ -1600,7 +1588,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) { zend_file_handle *prepend_file_p, *append_file_p; - zend_file_handle prepend_file = {0}, append_file = {0}; + zend_file_handle prepend_file, append_file; #if HAVE_BROKEN_GETCWD int old_cwd_fd = -1; #else Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.106.2.10 php4/main/php_ini.c:1.106.2.11 --- php4/main/php_ini.c:1.106.2.10 Sat May 17 03:55:18 2003 +++ php4/main/php_ini.c Wed May 21 05:34:13 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.106.2.10 2003/05/17 07:55:18 sas Exp $ */ +/* $Id: php_ini.c,v 1.106.2.11 2003/05/21 09:34:13 zeev Exp $ */ /* Check CWD for php.ini */ #define INI_CHECK_CWD @@ -236,7 +236,7 @@ int safe_mode_state; char *open_basedir; int free_ini_search_path=0; - zend_file_handle fh = {0}; + zend_file_handle fh; struct stat sb; char ini_file[MAXPATHLEN]; char *p; @@ -347,6 +347,7 @@ PG(safe_mode) = 0; PG(open_basedir) = NULL; + memset(&fh, 0, sizeof(fh)); /* Check if php_ini_path_override is a file */ if (!sapi_module.php_ini_ignore) { if (sapi_module.php_ini_path_override && sapi_module.php_ini_path_override[0]) { Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.72.2.2 php4/sapi/aolserver/aolserver.c:1.72.2.3 --- php4/sapi/aolserver/aolserver.c:1.72.2.2 Sat May 17 04:06:52 2003 +++ php4/sapi/aolserver/aolserver.c Wed May 21 05:34:13 2003 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.72.2.2 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: aolserver.c,v 1.72.2.3 2003/05/21 09:34:13 zeev 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.2 2003/05/17 08:06:52 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72.2.3 2003/05/21 09:34:13 zeev 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 = {0}; + zend_file_handle file_handle; 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.9 php4/sapi/apache/mod_php4.c:1.146.2.10 --- php4/sapi/apache/mod_php4.c:1.146.2.9 Sat May 17 04:06:52 2003 +++ php4/sapi/apache/mod_php4.c Wed May 21 05:34:13 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.146.2.9 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: mod_php4.c,v 1.146.2.10 2003/05/21 09:34:13 zeev 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 = {0}; + zend_file_handle fh; 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.3 php4/sapi/apache/sapi_apache.c:1.40.4.4 --- php4/sapi/apache/sapi_apache.c:1.40.4.3 Sat May 17 04:06:52 2003 +++ php4/sapi/apache/sapi_apache.c Wed May 21 05:34:13 2003 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.40.4.3 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: sapi_apache.c,v 1.40.4.4 2003/05/21 09:34:13 zeev 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 = {0}; + zend_file_handle file_handle; 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.13 php4/sapi/apache2filter/sapi_apache2.c:1.91.2.14 --- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.13 Tue May 20 03:34:08 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Wed May 21 05:34:14 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.91.2.13 2003/05/20 07:34:08 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.14 2003/05/21 09:34:14 zeev Exp $ */ #include <fcntl.h> @@ -452,7 +452,7 @@ } for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) { - zend_file_handle zfd = {0}; + zend_file_handle zfd; 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.13 php4/sapi/apache2handler/sapi_apache2.c:1.1.2.14 --- php4/sapi/apache2handler/sapi_apache2.c:1.1.2.13 Tue May 20 03:34:08 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Wed May 21 05:34:14 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.1.2.13 2003/05/20 07:34:08 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.14 2003/05/21 09:34:14 zeev Exp $ */ #include <fcntl.h> @@ -514,7 +514,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); highlight_file((char *)r->filename, &syntax_highlighter_ini TSRMLS_CC); } else { - zend_file_handle zfd = {0}; + zend_file_handle zfd; 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.2 php4/sapi/caudium/caudium.c:1.28.2.3 --- php4/sapi/caudium/caudium.c:1.28.2.2 Sat May 17 04:06:52 2003 +++ php4/sapi/caudium/caudium.c Wed May 21 05:34:14 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.28.2.2 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: caudium.c,v 1.28.2.3 2003/05/21 09:34:14 zeev 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.2 2003/05/17 08:06:52 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28.2.3 2003/05/21 09:34:14 zeev 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 = {0}; + zend_file_handle file_handle; #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.28 php4/sapi/cgi/cgi_main.c:1.190.2.29 --- php4/sapi/cgi/cgi_main.c:1.190.2.28 Mon May 19 02:46:50 2003 +++ php4/sapi/cgi/cgi_main.c Wed May 21 05:34:15 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.28 2003/05/19 06:46:50 shane Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.29 2003/05/21 09:34:15 zeev 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 = {0}; + zend_file_handle file_handle; 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.15 php4/sapi/cli/php_cli.c:1.51.2.16 --- php4/sapi/cli/php_cli.c:1.51.2.15 Sat May 17 04:06:52 2003 +++ php4/sapi/cli/php_cli.c Wed May 21 05:34:15 2003 @@ -438,7 +438,7 @@ { int exit_status = SUCCESS; int c; - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; /* temporary locals */ int behavior=PHP_MODE_STANDARD; int no_headers=1; @@ -725,7 +725,7 @@ ap_php_optind++; } if (script_file) { - if (!(file_handle.handle.fd = VCWD_OPEN(script_file, O_RDONLY | O_BINARY))) { + if (!(file_handle.handle.fp = VCWD_FOPEN(script_file, "rb"))) { SG(headers_sent) = 1; SG(request_info).no_headers = 1; php_printf("Could not open input file: %s.\n", script_file); @@ -734,30 +734,27 @@ file_handle.filename = script_file; script_filename = script_file; /* #!php support */ - c = 0; - read(file_handle.handle.fd, &c, 1); + c = fgetc(file_handle.handle.fp); if (c == '#') { while (c != 10 && c != 13) { - /* skip to end of line */ - if (read(file_handle.handle.fd, &c, 1) != 1) - break; + c = fgetc(file_handle.handle.fp); /* skip to end of line */ } /* handle situations where line is terminated by \r\n */ if (c == 13) { - if (read(file_handle.handle.fd, &c, 1) == 1 && c != 10) { + if (fgetc(file_handle.handle.fp) != 10) { long pos = ftell(file_handle.handle.fp); fseek(file_handle.handle.fp, pos - 1, SEEK_SET); } } is_hashbang = 1; } else { - lseek(file_handle.handle.fd, 0, SEEK_SET); + rewind(file_handle.handle.fp); } } else { file_handle.filename = "-"; - file_handle.handle.fd = STDIN_FILENO; + file_handle.handle.fp = stdin; } - file_handle.type = ZEND_HANDLE_FD; + file_handle.type = ZEND_HANDLE_FP file_handle.opened_path = NULL; file_handle.free_filename = 0; php_self = file_handle.filename; @@ -773,7 +770,7 @@ if (php_request_startup(TSRMLS_C)==FAILURE) { *arg_excp = arg_free; - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); SG(headers_sent) = 1; SG(request_info).no_headers = 1; php_request_shutdown((void *) 0); @@ -816,7 +813,7 @@ case PHP_MODE_STRIP: if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { zend_strip(TSRMLS_C); - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); } goto out; break; @@ -827,7 +824,7 @@ if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { php_get_highlight_struct(&syntax_highlighter_ini); zend_highlight(&syntax_highlighter_ini TSRMLS_CC); - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); } goto out; } @@ -837,7 +834,7 @@ case PHP_MODE_INDENT: open_file_for_scanning(&file_handle TSRMLS_CC); zend_indent(); - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); goto out; break; #endif Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.92.2.5 php4/sapi/isapi/php4isapi.c:1.92.2.6 --- php4/sapi/isapi/php4isapi.c:1.92.2.5 Sat May 17 04:06:53 2003 +++ php4/sapi/isapi/php4isapi.c Wed May 21 05:34:15 2003 @@ -717,7 +717,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.6 php4/sapi/nsapi/nsapi.c:1.28.2.7 --- php4/sapi/nsapi/nsapi.c:1.28.2.6 Sat May 17 04:06:53 2003 +++ php4/sapi/nsapi/nsapi.c Wed May 21 05:34:15 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.28.2.6 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: nsapi.c,v 1.28.2.7 2003/05/21 09:34:15 zeev Exp $ */ /* * PHP includes @@ -493,7 +493,7 @@ int nsapi_module_main(NSLS_D TSRMLS_DC) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.2 php4/sapi/phttpd/phttpd.c:1.35.2.3 --- php4/sapi/phttpd/phttpd.c:1.35.2.2 Sat May 17 04:06:53 2003 +++ php4/sapi/phttpd/phttpd.c Wed May 21 05:34:16 2003 @@ -247,7 +247,7 @@ int php_doit(TSRMLS_D TSRMLS_DC) { struct stat sb; - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.3 php4/sapi/pi3web/pi3web_sapi.c:1.46.2.4 --- php4/sapi/pi3web/pi3web_sapi.c:1.46.2.3 Sat May 17 04:06:53 2003 +++ php4/sapi/pi3web/pi3web_sapi.c Wed May 21 05:34:16 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.46.2.3 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: pi3web_sapi.c,v 1.46.2.4 2003/05/21 09:34:16 zeev 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.3 2003/05/17 08:06:53 sas Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46.2.4 2003/05/21 09:34:16 zeev 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 = {0}; + zend_file_handle file_handle; int iRet = PIAPI_COMPLETED; TSRMLS_FETCH(); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.53.2.3 php4/sapi/roxen/roxen.c:1.53.2.4 --- php4/sapi/roxen/roxen.c:1.53.2.3 Sat May 17 04:06:53 2003 +++ php4/sapi/roxen/roxen.c Wed May 21 05:34:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.53.2.3 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: roxen.c,v 1.53.2.4 2003/05/21 09:34:16 zeev 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.3 2003/05/17 08:06:53 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53.2.4 2003/05/21 09:34:16 zeev 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 = {0}; + zend_file_handle file_handle; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.65.2.4 php4/sapi/servlet/servlet.c:1.65.2.5 --- php4/sapi/servlet/servlet.c:1.65.2.4 Sat May 17 04:06:53 2003 +++ php4/sapi/servlet/servlet.c Wed May 21 05:34:16 2003 @@ -310,7 +310,7 @@ jstring contentType, jint contentLength, jstring authUser, jboolean display_source_mode) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; int retval; #ifndef VIRTUAL_DIR char cwd[MAXPATHLEN]; Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.77.2.10 php4/sapi/thttpd/thttpd.c:1.77.2.11 --- php4/sapi/thttpd/thttpd.c:1.77.2.10 Sat May 17 04:06:53 2003 +++ php4/sapi/thttpd/thttpd.c Wed May 21 05:34:16 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: thttpd.c,v 1.77.2.10 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: thttpd.c,v 1.77.2.11 2003/05/21 09:34:16 zeev 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 = {0}; + zend_file_handle file_handle; 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.3 php4/sapi/tux/php_tux.c:1.18.2.4 --- php4/sapi/tux/php_tux.c:1.18.2.3 Sat May 17 04:06:53 2003 +++ php4/sapi/tux/php_tux.c Wed May 21 05:34:17 2003 @@ -296,7 +296,7 @@ static void tux_module_main(TSRMLS_D) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.2 php4/sapi/webjames/webjames.c:1.5.2.3 --- php4/sapi/webjames/webjames.c:1.5.2.2 Sat May 17 04:06:53 2003 +++ php4/sapi/webjames/webjames.c Wed May 21 05:34:17 2003 @@ -142,7 +142,7 @@ static void webjames_module_main(TSRMLS_D) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; FILE *fp=NULL; char *path;
Index: php4/NEWS diff -u php4/NEWS:1.1247.2.209 php4/NEWS:1.1247.2.210 --- php4/NEWS:1.1247.2.209 Tue May 20 20:36:50 2003 +++ php4/NEWS Wed May 21 05:34:11 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? May 2003, Version 4.3.2 -- Improved the engine to use POSIX/socket IO where feasible. (Sascha) - Syncronized bundled GD library with GD 2.0.12. (Ilia) - Removed support for GDLIB version 1.x.x (php_gd.dll) on Windows. (Edin) - Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.543.2.16 php4/ext/standard/basic_functions.c:1.543.2.17 --- php4/ext/standard/basic_functions.c:1.543.2.16 Mon May 19 13:45:50 2003 +++ php4/ext/standard/basic_functions.c Wed May 21 05:34:12 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.543.2.16 2003/05/19 17:45:50 derick Exp $ */ +/* $Id: basic_functions.c,v 1.543.2.17 2003/05/21 09:34:12 zeev Exp $ */ #include "php.h" #include "php_streams.h" @@ -2840,7 +2840,7 @@ PHP_FUNCTION(parse_ini_file) { zval **filename, **process_sections; - zend_file_handle fh = {0}; + zend_file_handle fh; zend_ini_parser_cb_t ini_parser_cb; switch (ARG_COUNT(ht)) { Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.60.2.9 php4/ext/standard/browscap.c:1.60.2.10 --- php4/ext/standard/browscap.c:1.60.2.9 Sat May 17 03:55:18 2003 +++ php4/ext/standard/browscap.c Wed May 21 05:34:12 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.60.2.9 2003/05/17 07:55:18 sas Exp $ */ +/* $Id: browscap.c,v 1.60.2.10 2003/05/21 09:34:12 zeev Exp $ */ #include "php.h" #include "php_regex.h" @@ -150,7 +150,7 @@ char *browscap = INI_STR("browscap"); if (browscap) { - zend_file_handle fh = {0}; + zend_file_handle fh; if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t) browscap_entry_dtor, 1)==FAILURE) { return FAILURE; Index: php4/main/main.c diff -u php4/main/main.c:1.512.2.35 php4/main/main.c:1.512.2.36 --- php4/main/main.c:1.512.2.35 Sat May 17 03:55:18 2003 +++ php4/main/main.c Wed May 21 05:34:12 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.512.2.35 2003/05/17 07:55:18 sas Exp $ */ +/* $Id: main.c,v 1.512.2.36 2003/05/21 09:34:12 zeev Exp $ */ /* {{{ includes */ @@ -763,17 +763,6 @@ } /* }}} */ - -/* {{{ php_open_wrapper_for_zend - */ -static zend_bool php_open_wrapper_for_zend(const char *filename, struct _zend_file_handle *fh) -{ - TSRMLS_FETCH(); - - return php_stream_open_wrapper_as_file_handle((char *)filename, "rb", ENFORCE_SAFE_MODE|USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, fh); -} -/* }}} */ - /* {{{ php_get_configuration_directive_for_zend */ static int php_get_configuration_directive_for_zend(char *name, uint name_length, zval *contents) @@ -1107,7 +1096,6 @@ zuf.printf_function = php_printf; zuf.write_function = php_body_write_wrapper; zuf.fopen_function = php_fopen_wrapper_for_zend; - zuf.open_function = php_open_wrapper_for_zend; zuf.message_handler = php_message_handler_for_zend; zuf.block_interruptions = sapi_module.block_interruptions; zuf.unblock_interruptions = sapi_module.unblock_interruptions; @@ -1600,7 +1588,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) { zend_file_handle *prepend_file_p, *append_file_p; - zend_file_handle prepend_file = {0}, append_file = {0}; + zend_file_handle prepend_file, append_file; #if HAVE_BROKEN_GETCWD int old_cwd_fd = -1; #else Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.106.2.10 php4/main/php_ini.c:1.106.2.11 --- php4/main/php_ini.c:1.106.2.10 Sat May 17 03:55:18 2003 +++ php4/main/php_ini.c Wed May 21 05:34:13 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.106.2.10 2003/05/17 07:55:18 sas Exp $ */ +/* $Id: php_ini.c,v 1.106.2.11 2003/05/21 09:34:13 zeev Exp $ */ /* Check CWD for php.ini */ #define INI_CHECK_CWD @@ -236,7 +236,7 @@ int safe_mode_state; char *open_basedir; int free_ini_search_path=0; - zend_file_handle fh = {0}; + zend_file_handle fh; struct stat sb; char ini_file[MAXPATHLEN]; char *p; @@ -347,6 +347,7 @@ PG(safe_mode) = 0; PG(open_basedir) = NULL; + memset(&fh, 0, sizeof(fh)); /* Check if php_ini_path_override is a file */ if (!sapi_module.php_ini_ignore) { if (sapi_module.php_ini_path_override && sapi_module.php_ini_path_override[0]) { Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.72.2.2 php4/sapi/aolserver/aolserver.c:1.72.2.3 --- php4/sapi/aolserver/aolserver.c:1.72.2.2 Sat May 17 04:06:52 2003 +++ php4/sapi/aolserver/aolserver.c Wed May 21 05:34:13 2003 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.72.2.2 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: aolserver.c,v 1.72.2.3 2003/05/21 09:34:13 zeev 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.2 2003/05/17 08:06:52 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72.2.3 2003/05/21 09:34:13 zeev 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 = {0}; + zend_file_handle file_handle; 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.9 php4/sapi/apache/mod_php4.c:1.146.2.10 --- php4/sapi/apache/mod_php4.c:1.146.2.9 Sat May 17 04:06:52 2003 +++ php4/sapi/apache/mod_php4.c Wed May 21 05:34:13 2003 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.146.2.9 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: mod_php4.c,v 1.146.2.10 2003/05/21 09:34:13 zeev 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 = {0}; + zend_file_handle fh; 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.3 php4/sapi/apache/sapi_apache.c:1.40.4.4 --- php4/sapi/apache/sapi_apache.c:1.40.4.3 Sat May 17 04:06:52 2003 +++ php4/sapi/apache/sapi_apache.c Wed May 21 05:34:13 2003 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.40.4.3 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: sapi_apache.c,v 1.40.4.4 2003/05/21 09:34:13 zeev 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 = {0}; + zend_file_handle file_handle; 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.13 php4/sapi/apache2filter/sapi_apache2.c:1.91.2.14 --- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.13 Tue May 20 03:34:08 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Wed May 21 05:34:14 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.91.2.13 2003/05/20 07:34:08 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.14 2003/05/21 09:34:14 zeev Exp $ */ #include <fcntl.h> @@ -452,7 +452,7 @@ } for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) { - zend_file_handle zfd = {0}; + zend_file_handle zfd; 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.13 php4/sapi/apache2handler/sapi_apache2.c:1.1.2.14 --- php4/sapi/apache2handler/sapi_apache2.c:1.1.2.13 Tue May 20 03:34:08 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Wed May 21 05:34:14 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.1.2.13 2003/05/20 07:34:08 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.14 2003/05/21 09:34:14 zeev Exp $ */ #include <fcntl.h> @@ -514,7 +514,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); highlight_file((char *)r->filename, &syntax_highlighter_ini TSRMLS_CC); } else { - zend_file_handle zfd = {0}; + zend_file_handle zfd; 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.2 php4/sapi/caudium/caudium.c:1.28.2.3 --- php4/sapi/caudium/caudium.c:1.28.2.2 Sat May 17 04:06:52 2003 +++ php4/sapi/caudium/caudium.c Wed May 21 05:34:14 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.28.2.2 2003/05/17 08:06:52 sas Exp $ */ +/* $Id: caudium.c,v 1.28.2.3 2003/05/21 09:34:14 zeev 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.2 2003/05/17 08:06:52 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.28.2.3 2003/05/21 09:34:14 zeev 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 = {0}; + zend_file_handle file_handle; #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.28 php4/sapi/cgi/cgi_main.c:1.190.2.29 --- php4/sapi/cgi/cgi_main.c:1.190.2.28 Mon May 19 02:46:50 2003 +++ php4/sapi/cgi/cgi_main.c Wed May 21 05:34:15 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.28 2003/05/19 06:46:50 shane Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.29 2003/05/21 09:34:15 zeev 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 = {0}; + zend_file_handle file_handle; 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.15 php4/sapi/cli/php_cli.c:1.51.2.16 --- php4/sapi/cli/php_cli.c:1.51.2.15 Sat May 17 04:06:52 2003 +++ php4/sapi/cli/php_cli.c Wed May 21 05:34:15 2003 @@ -438,7 +438,7 @@ { int exit_status = SUCCESS; int c; - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; /* temporary locals */ int behavior=PHP_MODE_STANDARD; int no_headers=1; @@ -725,7 +725,7 @@ ap_php_optind++; } if (script_file) { - if (!(file_handle.handle.fd = VCWD_OPEN(script_file, O_RDONLY | O_BINARY))) { + if (!(file_handle.handle.fp = VCWD_FOPEN(script_file, "rb"))) { SG(headers_sent) = 1; SG(request_info).no_headers = 1; php_printf("Could not open input file: %s.\n", script_file); @@ -734,30 +734,27 @@ file_handle.filename = script_file; script_filename = script_file; /* #!php support */ - c = 0; - read(file_handle.handle.fd, &c, 1); + c = fgetc(file_handle.handle.fp); if (c == '#') { while (c != 10 && c != 13) { - /* skip to end of line */ - if (read(file_handle.handle.fd, &c, 1) != 1) - break; + c = fgetc(file_handle.handle.fp); /* skip to end of line */ } /* handle situations where line is terminated by \r\n */ if (c == 13) { - if (read(file_handle.handle.fd, &c, 1) == 1 && c != 10) { + if (fgetc(file_handle.handle.fp) != 10) { long pos = ftell(file_handle.handle.fp); fseek(file_handle.handle.fp, pos - 1, SEEK_SET); } } is_hashbang = 1; } else { - lseek(file_handle.handle.fd, 0, SEEK_SET); + rewind(file_handle.handle.fp); } } else { file_handle.filename = "-"; - file_handle.handle.fd = STDIN_FILENO; + file_handle.handle.fp = stdin; } - file_handle.type = ZEND_HANDLE_FD; + file_handle.type = ZEND_HANDLE_FP file_handle.opened_path = NULL; file_handle.free_filename = 0; php_self = file_handle.filename; @@ -773,7 +770,7 @@ if (php_request_startup(TSRMLS_C)==FAILURE) { *arg_excp = arg_free; - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); SG(headers_sent) = 1; SG(request_info).no_headers = 1; php_request_shutdown((void *) 0); @@ -816,7 +813,7 @@ case PHP_MODE_STRIP: if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { zend_strip(TSRMLS_C); - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); } goto out; break; @@ -827,7 +824,7 @@ if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { php_get_highlight_struct(&syntax_highlighter_ini); zend_highlight(&syntax_highlighter_ini TSRMLS_CC); - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); } goto out; } @@ -837,7 +834,7 @@ case PHP_MODE_INDENT: open_file_for_scanning(&file_handle TSRMLS_CC); zend_indent(); - zend_file_handle_dtor(&file_handle); + fclose(file_handle.handle.fp); goto out; break; #endif Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.92.2.5 php4/sapi/isapi/php4isapi.c:1.92.2.6 --- php4/sapi/isapi/php4isapi.c:1.92.2.5 Sat May 17 04:06:53 2003 +++ php4/sapi/isapi/php4isapi.c Wed May 21 05:34:15 2003 @@ -717,7 +717,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.6 php4/sapi/nsapi/nsapi.c:1.28.2.7 --- php4/sapi/nsapi/nsapi.c:1.28.2.6 Sat May 17 04:06:53 2003 +++ php4/sapi/nsapi/nsapi.c Wed May 21 05:34:15 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nsapi.c,v 1.28.2.6 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: nsapi.c,v 1.28.2.7 2003/05/21 09:34:15 zeev Exp $ */ /* * PHP includes @@ -493,7 +493,7 @@ int nsapi_module_main(NSLS_D TSRMLS_DC) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.2 php4/sapi/phttpd/phttpd.c:1.35.2.3 --- php4/sapi/phttpd/phttpd.c:1.35.2.2 Sat May 17 04:06:53 2003 +++ php4/sapi/phttpd/phttpd.c Wed May 21 05:34:16 2003 @@ -247,7 +247,7 @@ int php_doit(TSRMLS_D TSRMLS_DC) { struct stat sb; - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.3 php4/sapi/pi3web/pi3web_sapi.c:1.46.2.4 --- php4/sapi/pi3web/pi3web_sapi.c:1.46.2.3 Sat May 17 04:06:53 2003 +++ php4/sapi/pi3web/pi3web_sapi.c Wed May 21 05:34:16 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.46.2.3 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: pi3web_sapi.c,v 1.46.2.4 2003/05/21 09:34:16 zeev 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.3 2003/05/17 08:06:53 sas Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.46.2.4 2003/05/21 09:34:16 zeev 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 = {0}; + zend_file_handle file_handle; int iRet = PIAPI_COMPLETED; TSRMLS_FETCH(); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.53.2.3 php4/sapi/roxen/roxen.c:1.53.2.4 --- php4/sapi/roxen/roxen.c:1.53.2.3 Sat May 17 04:06:53 2003 +++ php4/sapi/roxen/roxen.c Wed May 21 05:34:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.53.2.3 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: roxen.c,v 1.53.2.4 2003/05/21 09:34:16 zeev 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.3 2003/05/17 08:06:53 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.53.2.4 2003/05/21 09:34:16 zeev 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 = {0}; + zend_file_handle file_handle; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.65.2.4 php4/sapi/servlet/servlet.c:1.65.2.5 --- php4/sapi/servlet/servlet.c:1.65.2.4 Sat May 17 04:06:53 2003 +++ php4/sapi/servlet/servlet.c Wed May 21 05:34:16 2003 @@ -310,7 +310,7 @@ jstring contentType, jint contentLength, jstring authUser, jboolean display_source_mode) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; int retval; #ifndef VIRTUAL_DIR char cwd[MAXPATHLEN]; Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.77.2.10 php4/sapi/thttpd/thttpd.c:1.77.2.11 --- php4/sapi/thttpd/thttpd.c:1.77.2.10 Sat May 17 04:06:53 2003 +++ php4/sapi/thttpd/thttpd.c Wed May 21 05:34:16 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: thttpd.c,v 1.77.2.10 2003/05/17 08:06:53 sas Exp $ */ +/* $Id: thttpd.c,v 1.77.2.11 2003/05/21 09:34:16 zeev 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 = {0}; + zend_file_handle file_handle; 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.3 php4/sapi/tux/php_tux.c:1.18.2.4 --- php4/sapi/tux/php_tux.c:1.18.2.3 Sat May 17 04:06:53 2003 +++ php4/sapi/tux/php_tux.c Wed May 21 05:34:17 2003 @@ -296,7 +296,7 @@ static void tux_module_main(TSRMLS_D) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; 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.2 php4/sapi/webjames/webjames.c:1.5.2.3 --- php4/sapi/webjames/webjames.c:1.5.2.2 Sat May 17 04:06:53 2003 +++ php4/sapi/webjames/webjames.c Wed May 21 05:34:17 2003 @@ -142,7 +142,7 @@ static void webjames_module_main(TSRMLS_D) { - zend_file_handle file_handle = {0}; + zend_file_handle file_handle; FILE *fp=NULL; char *path;