diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-12-06 23:32:06 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-12-06 23:32:06 +0000 |
| commit | 481ec28566e8ec04dd706c84db1f30d39869116a (patch) | |
| tree | c703858652096ea88fea95afa16ac3c2d542c64a | |
| parent | 5e223ad13b913158bec2290aa3ebdc820fd40d28 (diff) | |
| download | php-git-481ec28566e8ec04dd706c84db1f30d39869116a.tar.gz | |
Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off).
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | main/main.c | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -37,7 +37,6 @@ PHP NEWS 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 @@ PHP NEWS - 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) diff --git a/main/main.c b/main/main.c index 82706abfc3..9b9ae472b4 100644 --- a/main/main.c +++ b/main/main.c @@ -746,9 +746,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ 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 |