diff options
| author | Andi Gutmans <andi@php.net> | 2000-07-27 15:36:54 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-07-27 15:36:54 +0000 |
| commit | 290525fdcde46fe1cbf2622d16e549498e1116f7 (patch) | |
| tree | c2166d6f98e9cead31b72f2cffbbfe6b5e15345f | |
| parent | 29585f985e5078fc068ef48501e6fc455a904969 (diff) | |
| download | php-git-290525fdcde46fe1cbf2622d16e549498e1116f7.tar.gz | |
Always store full filename as compiled file name
| -rw-r--r-- | Zend/zend-scanner.l | 8 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l index 192a4bd5ac..a2589713bf 100644 --- 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 6d48394c56..d15cedb12d 100644 --- 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) { |