diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-14 20:16:22 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-14 20:16:22 +0000 |
| commit | b9fb0b8e4d797ef81430ead4cb6b2afd0031e54b (patch) | |
| tree | 15b35d6a18d76a2496dcf8ed1fa3e51bf6b68d85 /Zend | |
| parent | 53f98a66cf2e952e9d3c6338cbb433b76b708be7 (diff) | |
| download | php-git-b9fb0b8e4d797ef81430ead4cb6b2afd0031e54b.tar.gz | |
If a require() dies, we must bail out (since it corrupts an existing op_array
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/configure.in | 1 | ||||
| -rw-r--r-- | Zend/zend-scanner.l | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Zend/configure.in b/Zend/configure.in index fa895fb091..116c75d536 100644 --- 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 30cf2d9f0e..cd1af3af69 100644 --- 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); |