Fixed bug #36809 (__FILE__ behavior changed)

diff --git a/NEWS b/NEWS
index 84b9e8346aaa43589c615dd50446be2c30ad61b2..2ca68d26390acbba649fb404043c5e590399b798 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP                                                                        NEWS
   (also fixes bug #36764). (Tony)
 - Removed the E_STRICT deprecation notice from "var". (Ilia)
 - Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
 - FIxed bug #36808 (syslog ident becomes garbage between requests). (Tony)
 - Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
 - Fixed bug #36749 (SOAP: 'Error Fetching http body' when using HTTP Proxy).

diff --git a/main/main.c b/main/main.c
index 3848d501fe41dfe852699adeb65bf87590d39d28..4515e02c69ac7ce958b92f6bce16d33ecfd384ba 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1696,6 +1696,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                        if (expand_filepath(primary_file->filename, realfile TSRMLS_CC)) {
                                realfile_len =  strlen(realfile);
                                zend_hash_add(&EG(included_files), realfile, realfile_len+1, (void *)&dummy, sizeof(int), NULL);
+                               primary_file->opened_path = estrndup(realfile, realfile_len);
                        }
                }