summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-10-17 18:12:31 +0000
committerZeev Suraski <zeev@php.net>2000-10-17 18:12:31 +0000
commit98bbb1178085e25f2476ffd3df34a8110427f5a0 (patch)
tree5c4562e9f5b4cfed81776a5e41fb07d53fe65adf /main
parent68b899ce26945a879a4c607c34aa9e42f1f85cd9 (diff)
downloadphp-git-98bbb1178085e25f2476ffd3df34a8110427f5a0.tar.gz
Fix a crash in CGI mode, in case no file is provided
Diffstat (limited to 'main')
-rw-r--r--main/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index d2e18fcffd..dd5a02ddcc 100644
--- a/main/main.c
+++ b/main/main.c
@@ -67,6 +67,7 @@
#include "zend_execute.h"
#include "zend_highlight.h"
#include "zend_indent.h"
+#include "zend_extensions.h"
#include "php_content_types.h"
#include "php_ticks.h"
@@ -657,7 +658,7 @@ void php_request_shutdown(void *dummy)
php_end_ob_buffers(SG(request_info).headers_only?0:1);
}
- if (setjmp(EG(bailout))==0) {
+ if (PG(modules_activated) && setjmp(EG(bailout))==0) {
php_call_shutdown_functions();
}