From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 26 Oct 2020 10:22:16 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0abcb9fb695dd14de89eeb76002412556d7757b4;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80258: Windows Deduplication Enabled, randon permission errors
---

0abcb9fb695dd14de89eeb76002412556d7757b4
diff --cc NEWS
index 36da98fe7f,a83f39792e..f0414b2315
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,15 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2020, PHP 7.4.13
 +?? ??? ????, PHP 8.0.0RC3
  
  - Core:
 +  . Fixed bug #8055 (Abstract trait methods returning "self" cannot be
 +    fulfilled by traits). (Nikita)
    . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date).
      (cmb)
+   . Fixed bug #80258 (Windows Deduplication Enabled, randon permission errors).
+     (cmb)
  
  - IMAP:
 -  . Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb)
    . Fixed bug #76618 (segfault on imap_reopen). (girgias)
    . Fixed bug #80239 (imap_rfc822_write_address() leaks memory). (cmb)
    . Fixed minor regression caused by fixing bug #80220. (cmb)
diff --cc Zend/zend_virtual_cwd.c
index 250d1704dc,382a40d6ca..b6f1433584
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@@ -483,10 -489,10 +483,10 @@@ CWD_API realpath_cache_bucket** realpat
  #undef LINK_MAX
  #define LINK_MAX 32
  
 -static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, time_t *t, int use_realpath, int is_dir, int *link_is_dir) /* {{{ */
 +static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, time_t *t, int use_realpath, bool is_dir, int *link_is_dir) /* {{{ */
  {
  	size_t i, j;
- 	int directory = 0, save;
+ 	int directory = 0, save, may_retry_reparse_point;
  #ifdef ZEND_WIN32
  	WIN32_FIND_DATAW dataw;
  	HANDLE hFind = INVALID_HANDLE_VALUE;