From: Zeev Suraski <zeev@php.net>
Date: Sat, 22 May 1999 01:07:50 +0000 (+0000)
Subject: more fixes
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac94c83867e69e2fc7105034e825f1b3bc143a9d;p=php

more fixes
---

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 21a2fcce44..36f0625012 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -413,17 +413,19 @@ int require_filename(char *filename CLS_DC)
 int require_file(zend_file_handle *file_handle CLS_DC)
 {
 	zend_lex_state original_lex_state;
+	int compiler_result;
 
 	save_lexical_state(&original_lex_state CLS_CC);
 	if (open_file_for_scanning(file_handle CLS_CC)==FAILURE) {
 		zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename);
 		return FAILURE;
 	}
-	if (zendparse(CLS_C)==1) {
-		zend_bailout();
-	}
+	compiler_result = zendparse(CLS_C);
 	zend_close_file_handle(file_handle);
 	restore_lexical_state(&original_lex_state CLS_CC);
+	if (compiler_result==1) {
+		zend_bailout();
+	}
 	return SUCCESS;
 }