cvs: php4 / NEWS /main configuration-parser.y main.c /win32 time.h

zeev Fri Jun 30 06:23:08 2000 EDT Modified files: /php4 NEWS /php4/main configuration-parser.y main.c /php4/win32 time.h Log: - Revert bogus time.h commit - Fixed a problem under some versions of Windows that could cause PHP to hang on startup if errors occured, e.g. in the php.ini file Index: php4/NEWS diff -u php4/NEWS:1.334 php4/NEWS:1.335 --- php4/NEWS:1.334 Thu Jun 29 14:51:39 2000 +++ php4/NEWS Fri Jun 30 06:23:07 2000 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2000, Version 4.0.2 +- Fixed a problem under some versions of Windows that could cause PHP to hang + on startup if errors occured, e.g. in the php.ini file (Zeev) - Fixed opendir() again. It should actually work well continuously now (Zeev) - Added three additional arguments to be sent to a user-defined error handler - the filename and line number in which the error occured, and the context Index: php4/main/configuration-parser.y diff -u php4/main/configuration-parser.y:1.50 php4/main/configuration-parser.y:1.51 --- php4/main/configuration-parser.y:1.50 Fri Jun 30 05:16:57 2000 +++ php4/main/configuration-parser.y Fri Jun 30 06:23:07 2000 @@ -19,7 +19,7 @@ -/* $Id: configuration-parser.y,v 1.50 2000/06/30 12:16:57 zeev Exp $ */ +/* $Id: configuration-parser.y,v 1.51 2000/06/30 13:23:07 zeev Exp $ */ #define DEBUG_CFG_PARSER 0 #include "php.h" @@ -127,7 +127,7 @@ sprintf(error_buf, "Error parsing %s on line %d\n", currently_parsed_filename, cfglineno); #ifdef PHP_WIN32 - MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_SERVICE_NOTIFICATION|MB_TOPMOST); + MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L); #else fprintf(stderr, "PHP: %s", error_buf); #endif Index: php4/main/main.c diff -u php4/main/main.c:1.275 php4/main/main.c:1.276 --- php4/main/main.c:1.275 Fri Jun 30 05:16:57 2000 +++ php4/main/main.c Fri Jun 30 06:23:07 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.275 2000/06/30 12:16:57 zeev Exp $ */ +/* $Id: main.c,v 1.276 2000/06/30 13:23:07 zeev Exp $ */ #include <stdio.h> @@ -377,7 +377,7 @@ #ifdef PHP_WIN32 if (type==E_CORE_ERROR || type==E_CORE_WARNING) { - MessageBox(NULL, buffer, error_type_str, MB_OK|MB_SERVICE_NOTIFICATION|MB_TOPMOST); + MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE); } #endif snprintf(log_buffer, 1024, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); Index: php4/win32/time.h diff -u php4/win32/time.h:1.3 php4/win32/time.h:1.4 --- php4/win32/time.h:1.3 Fri Jun 30 05:16:58 2000 +++ php4/win32/time.h Fri Jun 30 06:23:08 2000 @@ -13,8 +13,8 @@ #define _DH_TIME_H /* Include stuff ************************************************************ */ -#include <winsock2.h> -//#include <time.h> +#include <winsock.h> +#include <time.h> /* Struct stuff ************************************************************* */ struct timezone {