summaryrefslogtreecommitdiff
path: root/sapi/apache/sapi_apache.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-11-02 12:05:54 +0000
committerZeev Suraski <zeev@php.net>2000-11-02 12:05:54 +0000
commit8c4852c2cb6675ff0ee72b6a34b749116129513e (patch)
treea039c68d4ed9427eb9424e2bab2a56d80107d9f4 /sapi/apache/sapi_apache.c
parent3dd6c2d96f36f2da2263672443ea895ecd8d88fd (diff)
downloadphp-git-8c4852c2cb6675ff0ee72b6a34b749116129513e.tar.gz
Fix a nasty bug in the shutdown sequence of PHP under Apache.
Diffstat (limited to 'sapi/apache/sapi_apache.c')
-rw-r--r--sapi/apache/sapi_apache.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 161523bad2..e2cb151c37 100644
--- 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);