Fixed yet another realpath cache bug and wrong tests

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 859e044198269f4f712f364770aa9553e14003cf..b7d5238a1ca7a43dc842d269fd6847f69bc21cd1 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 96337f8a484d27c64ee0b8600fec27cba218a46c..1b28c19bab702f4a02c9c23054ddb9a9706549f3 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 --
 
@@ -172,11 +172,11 @@ Done
 
 -- Iteration 1 --
 unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
 
 -- Iteration 2 --
 unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
-unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic_link.tmp"
+unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
 
 -- Iteration 3 --
 unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
@@ -184,7 +184,7 @@ unicode(%d) "%s/readlink_realpath_basic/home/test/readlink_realpath_basic.tmp"
 
 -- Iteration 4 --
 unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic.tmp"
-unicode(%d) "%s/readlink_realpath_basic/home/readlink_realpath_basic_link.tmp"
+unicode(%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 c6e52c5df0bbc8b712ead7c77b69834f92d7bd3c..d74fe3d8e2fe51b19c4c62d4ffe193b09a1f99bd 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
 
@@ -224,10 +224,10 @@ Done
 -- Testing readlink() and realpath() with softlink, linkname stored inside an object --
 bool(true)
 unicode(%d) "%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-unicode(%d) "%s/readlink_realpath_variation/home/readlink_realpath_variation_link.tmp"
+unicode(%d) "%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
 bool(true)
 unicode(%d) "%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-unicode(%d) "%s/readlink_realpath_variation_link.tmp"
+unicode(%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)
@@ -246,14 +246,14 @@ unicode(%d) "%s/readlink_realpath_variation_link.tmp"
 -- Testing readlink() and realpath() with softlink, linkname stored inside an array --
 bool(true)
 unicode(%d) "%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation.tmp"
-unicode(%d) "%s/readlink_realpath_variation/home/tests/link/readlink_realpath_variation_link.tmp"
+unicode(%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)
-unicode(%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
 
@@ -269,7 +269,7 @@ bool(false)
 
 Warning: readlink(): No such file or directory in %s on line %d
 bool(false)
-unicode(%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