php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 01:23:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Andi Gutmans
2000-04-10 21:12:33 +00:00
parent e663d856b3
commit 73c6fbff7e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/zend-scanner.l
View File

@@ -389,9 +389,6 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
if (compiled_files>0) {
CG(active_op_array) = original_active_op_array;
pass_two(op_array);
if (mark_as_ref) {
pass_include_eval(op_array);
}
} else {
CG(active_op_array) = original_active_op_array;
destroy_op_array(op_array);

6
Zend/zend_execute.c
View File

@@ -2053,6 +2053,9 @@ 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 = compile_files(1 CLS_CC, 1, &file_handle);
if (new_op_array) {
pass_include_eval(new_op_array);
}
}
if (opened_path) {
free(opened_path);
@@ -2067,6 +2070,9 @@ send_by_ref:
case ZEND_INCLUDE:
case ZEND_REQUIRE:
new_op_array = compile_filename(opline->op2.u.constant.value.lval, get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R) CLS_CC ELS_CC);
if (new_op_array) {
pass_include_eval(new_op_array);
}
break;
case ZEND_EVAL:
new_op_array = compile_string(get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R) CLS_CC);