iliaa Tue Dec 6 18:32:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main main.c
Log:
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.2027.2.277&r2=1.2027.2.278&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.277 php-src/NEWS:1.2027.2.278
--- php-src/NEWS:1.2027.2.277 Mon Dec 5 22:39:45 2005
+++ php-src/NEWS Tue Dec 6 18:32:04 2005
@@ -37,7 +37,6 @@
proper init). (Ilia)
- Fixed bug #35490 (socket_sendto() unable to handle IPv6 addresses). (Tony)
- Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
-- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev)
- Fixed bug #35470 (Assigning global using variable name from array doesn't
function). (Dmitry)
- Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia)
@@ -61,6 +60,9 @@
- Fixed bug #35062 (socket_read() produces warnings on non blocking sockets).
(Nuno, Ilia)
- Fixed bug #35028 (SimpleXML object fails FALSE test). (Marcus)
+- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev)
+- Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
+ display_startup_error is off). (Ilia)
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.10&r2=1.640.2.11&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.10 php-src/main/main.c:1.640.2.11
--- php-src/main/main.c:1.640.2.10 Mon Dec 5 22:09:24 2005
+++ php-src/main/main.c Tue Dec 6 18:32:06 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.10 2005/12/06 03:09:24 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.11 2005/12/06 23:32:06 iliaa Exp $ */
/* {{{ includes
*/
@@ -746,9 +746,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
