com php-src: Merge branch 'PHP-7.3' into PHP-7.4: NEWS Zend/zend_virtual_cwd.c ext/standard/tests/file/realpat h_basic4.phpt

Commit: e0ebe56ebfc80bae3875b23eca4cbe0803f41e79 Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 28 Jul 2020 14:00:08 +0200 Parents: 1ba88355d7d117228e4359ff28201b29764db047 c756f82c02a004fb45fed098468644b843a908c2 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e0ebe56ebfc80bae3875b23eca4cbe0803f41e79 Log: Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Fix #79806: realpath() erroneously resolves link to link Bugs: https://bugs.php.net/79806 Changed paths: MM NEWS MM Zend/zend_virtual_cwd.c MM ext/standard/tests/file/realpath_basic4.phpt Diff: diff --cc ext/standard/tests/file/realpath_basic4.phpt index 1af510d34a,5f18dd9841..524dde3056 --- a/ext/standard/tests/file/realpath_basic4.phpt +++ b/ext/standard/tests/file/realpath_basic4.phpt @@@ -1,19 -1,13 +1,13 @@@ --TEST-- Test realpath() with relative paths - --SKIPIF-- - <?php - if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip no symlinks on Windows'); - } - ?> --FILE-- <?php -$file_path = dirname(__FILE__); -@mkdir("$file_path/realpath_basic/home/test", 0777, true); -@symlink("$file_path/realpath_basic/home", "$file_path/realpath_basic/link1"); -@symlink("$file_path/realpath_basic/link1", "$file_path/realpath_basic/link2"); -echo "1. " . realpath("$file_path/realpath_basic/link2") . "\n"; -echo "2. " . realpath("$file_path/realpath_basic/link2/test") . "\n"; +$file_path = __DIR__; +@mkdir("$file_path/realpath_basic4/home/test", 0777, true); +@symlink("$file_path/realpath_basic4/home", "$file_path/realpath_basic4/link1"); +@symlink("$file_path/realpath_basic4/link1", "$file_path/realpath_basic4/link2"); +echo "1. " . realpath("$file_path/realpath_basic4/link2") . "\n"; +echo "2. " . realpath("$file_path/realpath_basic4/link2/test") . "\n"; ?> --CLEAN-- <?php