Always store full filename as compiled file name

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 192a4bd5ac3c56bbcf5295b8c7935e00fc796e5a..a2589713bf68c87776a3e5ee4de40457869e43e9 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -243,10 +243,16 @@ ZEND_API void zend_close_file_handle(zend_file_handle *file_handle CLS_DC)
 
 ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
 {
+  char *file_path = file_handle->opened_path;
+  if(!file_path) {
+       file_path = file_handle->filename;
+  }
+
 #ifndef ZTS
        switch (file_handle->type) {
                case ZEND_HANDLE_FILENAME:
                        file_handle->handle.fp = zend_fopen(file_handle->filename, &file_handle->opened_path);
+                   file_path = file_handle->opened_path; 
                        break;
                case ZEND_HANDLE_FD:
                        file_handle->opened_path = NULL;
@@ -309,7 +315,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
        CG(ZFL) = new ZendFlexLexer;
        CG(ZFL)->switch_streams(file_handle->handle.is, &cout);
 #endif
-       zend_set_compiled_filename(file_handle->filename);
+       zend_set_compiled_filename(file_path);
        CG(zend_lineno) = 1;
        return SUCCESS;
 }

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 6d48394c5625b684c57744495bf100a2bd7ef79a..d15cedb12d0343e89292fec82ac62d57a25a4917 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2040,6 +2040,7 @@ send_by_ref:
                                                                file_handle.handle.fp = zend_fopen(inc_filename->value.str.val, &opened_path);
                                                                file_handle.type = ZEND_HANDLE_FP;
                                                                file_handle.filename = inc_filename->value.str.val;
+                                                               file_handle.opened_path = opened_path;
                                                                file_handle.free_filename = 0;
                                                                
                                                                if (file_handle.handle.fp) {