Fixed yet another realpath cache bug and wrong tests

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index dc9c895adba61b3491858d7349809ca64c627dbe..03ae8a0078a07c8aad0d9a87b04f3aad8aef3ee1 100644 (file)
--- 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 47d3713523fbfcb214439bb7041866d612f5c031..ac28f478d3c70586d274bb04b688d7b01bff7d72 100644 (file)
--- 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 27b9f1db80e92256a5abf72030f25cb02e62d692..da50e044a08a92c3d641838e77998df6b214fcd0 100644 (file)
--- 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