From: Dmitry Stogov Date: Mon, 18 Jun 2007 09:51:03 +0000 (+0000) Subject: Fixed yet another realpath cache bug and wrong tests X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~432 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48012d80e1282f9e5e95cb5c4a3a8ceaf439d468;p=php Fixed yet another realpath cache bug and wrong tests --- diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 859e044198..b7d5238a1c 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 96337f8a48..1b28c19bab 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 -- @@ -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 c6e52c5df0..d74fe3d8e2 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 @@ -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