summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--main/main.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c4e251fdae..2c4dae4fc5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4.0 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2000, Version 4.0.4
+- Fixed a crash in CGI mode, in case no file was provided (Daniel Beulshausen
+ & Zeev)
- Fixed possible crash bug in imap_fetchstructure() (Jani)
- Fixed possible crash bug in imap_open() (Jani & Mark Musone)
- Added url_rewriter.tags configuration directive (Sascha)
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();
}