From 658ac96cfaedc254df22e0179a53bd570346df08 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 21 Mar 2006 08:49:42 +0000 Subject: [PATCH] Fixed bug #36809 (__FILE__ behavior changed) --- NEWS | 1 + main/main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 84b9e8346a..2ca68d2639 100644 --- 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 3848d501fe..4515e02c69 100644 --- 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); } } -- 2.50.1