diff options
| author | Zeev Suraski <zeev@php.net> | 2000-10-17 18:12:31 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-10-17 18:12:31 +0000 |
| commit | 98bbb1178085e25f2476ffd3df34a8110427f5a0 (patch) | |
| tree | 5c4562e9f5b4cfed81776a5e41fb07d53fe65adf | |
| parent | 68b899ce26945a879a4c607c34aa9e42f1f85cd9 (diff) | |
| download | php-git-98bbb1178085e25f2476ffd3df34a8110427f5a0.tar.gz | |
Fix a crash in CGI mode, in case no file is provided
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/main.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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(); } |