Fix a nasty bug in the shutdown sequence of PHP under Apache.

diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 161523bad201e774cec05308c95bc6b9b915e9f8..e2cb151c37e02c1d80ad4b2edda49014dc9fa1fa 100644 (file)
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -89,6 +89,9 @@ int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC
                (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
        }
        
+        if (setjmp(EG(bailout))!=0) {
+               return OK;
+       }
        php_header();                   /* Make sure headers have been sent */
        php_end_ob_buffers(1);
        return (OK);