dmitry Tue Mar 21 08:49:42 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main main.c
Log:
Fixed bug #36809 (__FILE__ behavior changed)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.473&r2=1.2027.2.474&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.473 php-src/NEWS:1.2027.2.474
--- php-src/NEWS:1.2027.2.473 Tue Mar 21 07:22:59 2006
+++ php-src/NEWS Tue Mar 21 08:49:42 2006
@@ -10,6 +10,7 @@
(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).
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.20&r2=1.640.2.21&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.20 php-src/main/main.c:1.640.2.21
--- php-src/main/main.c:1.640.2.20 Tue Mar 14 15:16:07 2006
+++ php-src/main/main.c Tue Mar 21 08:49:42 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.20 2006/03/14 15:16:07 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.21 2006/03/21 08:49:42 dmitry Exp $ */
/* {{{ includes
*/
@@ -1696,6 +1696,7 @@
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);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
