From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 27 Jul 2020 13:10:11 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85a26fef11ace24ba0d8a70fe850109cf66bdbe5;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79806: realpath() erroneously resolves link to link
---

85a26fef11ace24ba0d8a70fe850109cf66bdbe5
diff --cc NEWS
index 09eca0b1c8,ffb7d830cb..94f7c4b62d
--- a/NEWS
+++ b/NEWS
@@@ -5,8 -5,9 +5,9 @@@ PH
  - Core:
    . Fixed bug #79884 (PHP_CONFIG_FILE_PATH is meaningless). (cmb)
    . Fixed bug #77932 (File extensions are case-sensitive). (cmb)
+   . Fixed bug #79806 (realpath() erroneously resolves link to link). (cmb)
  
 -?? ??? ????, PHP 7.3.21
 +06 Aug 2020, PHP 7.4.9
  
  - Apache:
    . Fixed bug #79030 (Upgrade apache2handler's php_apache_sapi_get_request_time
diff --cc ext/standard/tests/file/realpath_basic4.phpt
index 47fd8040c7,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 not for 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