If a require() dies, we must bail out (since it corrupts an existing op_array

diff --git a/Zend/configure.in b/Zend/configure.in
index fa895fb09126455e4c1bb171dd68ea2d6d851938..116c75d536c24c0812cffb57da8801394c28fafb 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -5,6 +5,7 @@ AC_INIT(zend.c)
 AM_INIT_AUTOMAKE(zend, 0.80A)
 AM_CONFIG_HEADER(zend_config.h)
 AM_SANITY_CHECK
+AM_MAINTAINER_MODE
 ZEND_VERSION=$VERSION
 
 dnl We want this one before the checks, so the checks can modify CFLAGS.

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 30cf2d9f0e07e71644b0be0da66a7bcac0eca4a3..cd1af3af6910db981ee75ca8954abd816396138f 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -411,7 +411,7 @@ int require_file(zend_file_handle *file_handle CLS_DC)
                return FAILURE;
        }
        if (zendparse(CLS_C)==1) {
-               CG(unclean_shutdown) = 1;
+               zend_bailout();
        }
        zend_close_file_handle(file_handle);
        restore_lexical_state(&original_lex_state CLS_CC);