cvs: php-src(PHP_5_3) /main main.c
| From: | Dmitry Stogov | Date: | Thu, 18 Oct 2007 13:11:46 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-46707@lists.php.net to get a copy of this message | ||
dmitry Thu Oct 18 13:11:46 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main main.c
Log:
Fixed bug #42722 (display_errors setting ignored for E_PARSE and HTTP 500 page)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.2&r2=1.640.2.23.2.57.2.3&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.2 php-src/main/main.c:1.640.2.23.2.57.2.3
--- php-src/main/main.c:1.640.2.23.2.57.2.2 Mon Oct 1 14:51:11 2007
+++ php-src/main/main.c Thu Oct 18 13:11:46 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.2 2007/10/01 14:51:11 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.3 2007/10/18 13:11:46 dmitry Exp $ */
/* {{{ includes
*/
@@ -976,7 +976,8 @@
case E_USER_ERROR:
EG(exit_status) = 255;
if (module_initialized) {
- if (!SG(headers_sent) &&
+ if (!PG(display_errors) &&
+ !SG(headers_sent) &&
SG(sapi_headers).http_response_code == 200
) {
sapi_header_line ctr = {0};