bfrance Fri Mar 10 18:16:24 2006 UTC
Modified files:
/php-src/main main.c
Log:
for the primary file 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
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.671&r2=1.672&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.671 php-src/main/main.c:1.672
--- php-src/main/main.c:1.671 Thu Mar 9 20:31:58 2006
+++ php-src/main/main.c Fri Mar 10 18:16:24 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.671 2006/03/09 20:31:58 pollita Exp $ */
+/* $Id: main.c,v 1.672 2006/03/10 18:16:24 bfrance Exp $ */
/* {{{ includes
*/
@@ -1786,7 +1786,10 @@
VCWD_CHDIR_FILE(primary_file->filename);
}
- if (primary_file->filename) {
+ /* 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) {
int realfile_len;
int dummy = 1;
if (VCWD_REALPATH(primary_file->filename, realfile)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
