summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-08-15 16:44:40 +0000
committerZeev Suraski <zeev@php.net>2000-08-15 16:44:40 +0000
commit7795aca4ca2c7e5ec8520ee1e72b9810b8654c7d (patch)
treecd8a41e54995665c5aa0d9b5145b028a31f743e5 /Zend/zend_execute.c
parent28273dfaa286d3fca0d0cacf5b44237227c9bec5 (diff)
downloadphp-git-7795aca4ca2c7e5ec8520ee1e72b9810b8654c7d.tar.gz
Fix warning issue (compile errors inside require()'d files were incorrectly supressed)
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 871a4394ef..d4ee94ff83 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1986,7 +1986,7 @@ send_by_ref:
if (file_handle.handle.fp) {
if (!opened_path || zend_hash_add(&EG(included_files), opened_path, strlen(opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
- new_op_array = zend_compile_file(&file_handle CLS_CC);
+ new_op_array = zend_compile_file(&file_handle, (opline->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) CLS_CC);
zend_destroy_file_handle(&file_handle CLS_CC);
opened_path = NULL; /* zend_destroy_file_handle() already frees it */
} else {