cvs: php4 /main main.c

stas Sun Jul 2 09:36:31 2000 EDT Modified files: /php4/main main.c Log: react only on CORE_ERROR Index: php4/main/main.c diff -u php4/main/main.c:1.277 php4/main/main.c:1.278 --- php4/main/main.c:1.277 Sun Jul 2 09:23:43 2000 +++ php4/main/main.c Sun Jul 2 09:36:31 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.277 2000/07/02 16:23:43 stas Exp $ */ +/* $Id: main.c,v 1.278 2000/07/02 16:36:31 stas Exp $ */ #include <stdio.h> @@ -417,17 +417,19 @@ } switch (type) { - case E_ERROR: case E_CORE_ERROR: + if(!module_initialized) { + /* bad error in module startup - no way we can live with this */ + exit(-2); + } + /* no break - intentionally */ + case E_ERROR: /*case E_PARSE: the parser would return 1 (failure), we can bail out nicely */ case E_COMPILE_ERROR: case E_USER_ERROR: if (module_initialized) { zend_bailout(); return; - } else { - /* bad error in module startup - no way we can live with this */ - exit(-2); } break; }