summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian France <bfrance@php.net>2006-03-10 18:19:29 +0000
committerBrian France <bfrance@php.net>2006-03-10 18:19:29 +0000
commit6c4e9d30b986b4c202ee1383281f8a227f480f8f (patch)
tree08dceb73e9c271e9b2b72a13840daa044914c44e
parent0ebab9d49548d33635e6e00ebcdbfef378d990ac (diff)
downloadphp-git-6c4e9d30b986b4c202ee1383281f8a227f480f8f.tar.gz
MFH:
for the primary file only lookup the real file path and add it to the included_files list if already opened otherwise it will get opened and added to the included_files list in zend_execute_scripts
-rw-r--r--main/main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index 7dafc652b7..4c9c4bc508 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1681,7 +1681,10 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
VCWD_CHDIR_FILE(primary_file->filename);
}
- if (primary_file->filename) {
+ /* Only lookup the real file path and add it to the included_files list if already opened
+ * otherwise it will get opened and added to the included_files list in zend_execute_scripts
+ */
+ if (primary_file->filename && primary_file->type != ZEND_HANDLE_FILENAME) {
int realfile_len;
int dummy = 1;
if (VCWD_REALPATH(primary_file->filename, realfile)) {