dmitry Mon Jun 18 09:50:40 2007 UTC
Modified files: (Branch: PHP_5_2)
/TSRM tsrm_virtual_cwd.c
/php-src/ext/standard/tests/file readlink_realpath_basic.phpt
readlink_realpath_variation.phpt
Log:
Fixed yet another realpath cache bug and wrong tests
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.29&r2=1.74.2.9.2.30&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.29
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.30
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.29 Wed May 30 10:50:47 2007
+++ TSRM/tsrm_virtual_cwd.c Mon Jun 18 09:50:39 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.29 2007/05/30 10:50:47 tony2001 Exp $
*/
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.30 2007/06/18 09:50:39 dmitry Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -708,7 +708,7 @@
}
}
- if (use_cache) {
+ if (use_cache && (use_realpath == CWD_REALPATH)) {
realpath_cache_add(path, path_length, state->cwd,
state->cwd_length, t TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_basic.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_basic.phpt:1.1.2.1
Mon Jun 11 16:14:59 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_basic.phpt Mon Jun
18 09:50:40 2007
@@ -103,11 +103,11 @@
-- Iteration 1 --
string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 2 --
string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-string(%d)
"%s/readlink_realpath_basic/home/test/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-- Iteration 3 --
string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
@@ -115,7 +115,7 @@
-- Iteration 4 --
string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+string(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-- Iteration 5 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation.phpt
diff -u
php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_variation.phpt:1.1.2.1
Mon Jun 11 16:14:59 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation.phpt Mon Jun
18 09:50:40 2007
@@ -135,10 +135,10 @@
-- Testing readlink() and realpath() with softlink, linkname stored inside an
object --
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d)
"%s/readlink_realpath_variation/home/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d) "%s/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-- Testing readlink() and realpath() with hardlink, linkname stored inside an
object --
bool(true)
@@ -157,14 +157,14 @@
-- Testing readlink() and realpath() with softlink, linkname stored inside an
array --
bool(true)
string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation_link.tmp"
+string(%d)
"%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
Warning: symlink(): No such file or directory in %s on line %d
bool(false)
Warning: readlink(): No such file or directory in %s on line %d
bool(false)
-string(%d) "%s/home/readlink_realpath_variation_link.tmp"
+bool(false)
Warning:
unlink(%s/./readlink_realpath_variation/home/../home//tests//..//..//..//home//readlink_realpath_variation_link.tmp/):
No such file or directory in %s on line %d
@@ -180,7 +180,7 @@
Warning: readlink(): No such file or directory in %s on line %d
bool(false)
-string(%d) "%s/home/readlink_realpath_variation_link.tmp"
+bool(false)
Warning:
unlink(%s/./readlink_realpath_variation/home/../home//tests//..//..//..//home//readlink_realpath_variation_link.tmp/):
No such file or directory in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
