iliaa Tue Dec 6 18:33:05 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/main main.c
Log:
MFH: Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.94&r2=1.1247.2.920.2.95&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.94 php-src/NEWS:1.1247.2.920.2.95
--- php-src/NEWS:1.1247.2.920.2.94 Mon Dec 5 22:40:08 2005
+++ php-src/NEWS Tue Dec 6 18:33:03 2005
@@ -14,6 +14,8 @@
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
- Fixed bug #33201 (Crash when fetching some data types). (Frank)
+- Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
+ display_startup_error is off). (Ilia)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63.2.5&r2=1.512.2.63.2.6&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.5 php-src/main/main.c:1.512.2.63.2.6
--- php-src/main/main.c:1.512.2.63.2.5 Mon Dec 5 22:30:43 2005
+++ php-src/main/main.c Tue Dec 6 18:33:04 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.63.2.5 2005/12/06 03:30:43 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.6 2005/12/06 23:33:04 iliaa Exp $ */
/* {{{ includes
*/
@@ -640,9 +640,8 @@
if (!module_initialized || PG(log_errors)) {
char *log_buffer;
-
#ifdef PHP_WIN32
- if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
+ if ((type == E_CORE_ERROR || type == E_CORE_WARNING) &&
PG(display_startup_errors)) {
MessageBox(NULL, buffer, error_type_str,
MB_OK|ZEND_SERVICE_MB_STYLE);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
