bfrance Fri Mar 10 18:19:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
Log:
MFH:
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.640.2.17&r2=1.640.2.18&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.17 php-src/main/main.c:1.640.2.18
--- php-src/main/main.c:1.640.2.17 Thu Mar 9 20:32:22 2006
+++ php-src/main/main.c Fri Mar 10 18:19:29 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.17 2006/03/09 20:32:22 pollita Exp $ */
+/* $Id: main.c,v 1.640.2.18 2006/03/10 18:19:29 bfrance Exp $ */
/* {{{ includes
*/
@@ -1681,7 +1681,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
