diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-06-18 09:50:40 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-06-18 09:50:40 +0000 |
| commit | 738ff1277a02e7aba4efdcee18eae10ce1f489f7 (patch) | |
| tree | 5b30d181d097562fcdb341384e478f2b8ab9ad2b | |
| parent | 74474a1ef89efcf841868c5e0fba6322dad1646b (diff) | |
| download | php-git-738ff1277a02e7aba4efdcee18eae10ce1f489f7.tar.gz | |
Fixed yet another realpath cache bug and wrong tests
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/readlink_realpath_basic.phpt | 6 | ||||
| -rw-r--r-- | ext/standard/tests/file/readlink_realpath_variation.phpt | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index dc9c895adb..03ae8a0078 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -708,7 +708,7 @@ no_realpath: } } - if (use_cache) { + if (use_cache && (use_realpath == CWD_REALPATH)) { realpath_cache_add(path, path_length, state->cwd, state->cwd_length, t TSRMLS_CC); } diff --git a/ext/standard/tests/file/readlink_realpath_basic.phpt b/ext/standard/tests/file/readlink_realpath_basic.phpt index 47d3713523..ac28f478d3 100644 --- a/ext/standard/tests/file/readlink_realpath_basic.phpt +++ b/ext/standard/tests/file/readlink_realpath_basic.phpt @@ -103,11 +103,11 @@ rmdir("$name_prefix/"); -- 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 @@ string(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp" -- 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 -- diff --git a/ext/standard/tests/file/readlink_realpath_variation.phpt b/ext/standard/tests/file/readlink_realpath_variation.phpt index 27b9f1db80..da50e044a0 100644 --- a/ext/standard/tests/file/readlink_realpath_variation.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation.phpt @@ -135,10 +135,10 @@ rmdir("$name_prefix/"); -- 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 @@ string(%d) "%s/readlink_realpath_variation_link.tmp" -- 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 @@ 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 |