summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c
index aed9adf05d..2cc9dcfac8 100644
--- a/main/main.c
+++ b/main/main.c
@@ -417,17 +417,19 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
}
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;
}