cvs: ZendEngine2 / zend_execute.c

zeev Sat Aug 17 12:22:40 2002 EDT Modified files: /ZendEngine2 zend_execute.c Log: MFZE1 Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.359 ZendEngine2/zend_execute.c:1.360 --- ZendEngine2/zend_execute.c:1.359 Thu Aug 8 12:32:34 2002 +++ ZendEngine2/zend_execute.c Sat Aug 17 12:22:40 2002 @@ -2673,7 +2673,11 @@ file_handle.free_filename = 0; 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) { + if( !opened_path ) { + opened_path = file_handle.opened_path = estrdup(inc_filename->value.str.val); + } + + if (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, (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC); zend_destroy_file_handle(&file_handle TSRMLS_CC); opened_path = NULL; /* zend_destroy_file_handle() already frees it */