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

…op_array
php · May 14, 1999 · b9fb0b8 · b9fb0b8
1 parent 53f98a6
commit b9fb0b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);