Fixed realpath() cache for main script with FastCGI SAPI

diff --git a/main/main.c b/main/main.c
index 671a20fdca22def0caef10aa21b012540629996b..55f018efa99e1c5284e178c3722aabc27fe50a1c 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1752,7 +1752,6 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 #else
        char *old_cwd;
 #endif
-       char *old_primary_file_path = NULL;
        int retval = 0;
 
        EG(exit_status) = 0;
@@ -1789,16 +1788,14 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                /* 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) {                     
+               if (primary_file->filename &&
+                   primary_file->opened_path == NULL &&
+                   primary_file->type != ZEND_HANDLE_FILENAME) {                       
                        int realfile_len;
                        int dummy = 1;
                        if (VCWD_REALPATH(primary_file->filename, realfile)) {
                                realfile_len =  strlen(realfile);
                                zend_hash_add(&EG(included_files), realfile, realfile_len+1, (void *)&dummy, sizeof(int), NULL);
-                               if (strncmp(realfile, primary_file->filename, realfile_len)) {
-                                       old_primary_file_path = primary_file->filename;
-                                       primary_file->filename = realfile;
-                               }       
                        }
                }
 
@@ -1827,10 +1824,6 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                zend_set_timeout(INI_INT("max_execution_time"));
                retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS);
                
-               if (old_primary_file_path) {
-                       primary_file->filename = old_primary_file_path;
-               }
-               
        } zend_end_try();
 
 #if HAVE_BROKEN_GETCWD