cvs: php4 / NEWS /main main.c

zeev Tue Oct 17 11:12:31 2000 EDT Modified files: /php4 NEWS /php4/main main.c Log: Fix a crash in CGI mode, in case no file is provided Index: php4/NEWS diff -u php4/NEWS:1.478 php4/NEWS:1.479 --- php4/NEWS:1.478 Tue Oct 17 08:45:48 2000 +++ php4/NEWS Tue Oct 17 11:12:30 2000 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 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) Index: php4/main/main.c diff -u php4/main/main.c:1.324 php4/main/main.c:1.325 --- php4/main/main.c:1.324 Fri Oct 13 03:04:17 2000 +++ php4/main/main.c Tue Oct 17 11:12:31 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.324 2000/10/13 10:04:17 hholzgra Exp $ */ +/* $Id: main.c,v 1.325 2000/10/17 18:12:31 zeev Exp $ */ #include <stdio.h> @@ -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 @@ 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(); }