[PHP-CVS] cvs: php-src /main main.c

[Dmitry Stogov]

dmitry          Thu Oct 18 13:12:01 2007 UTC

  Modified files:              
    /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.751&r2=1.752&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.751 php-src/main/main.c:1.752
--- php-src/main/main.c:1.751   Mon Oct  1 14:56:34 2007
+++ php-src/main/main.c Thu Oct 18 13:12:01 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.751 2007/10/01 14:56:34 iliaa Exp $ */
+/* $Id: main.c,v 1.752 2007/10/18 13:12:01 dmitry Exp $ */
 
 /* {{{ includes
  */
@@ -1070,7 +1070,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};

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php