From: Christoph M. Becker Date: Mon, 26 Oct 2020 10:21:35 +0000 (+0100) Subject: Merge branch 'PHP-7.3' into PHP-7.4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac2e9587fb3007c019c13ea1405cafcc8bc5e7b8;p=php Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Fix #80258: Windows Deduplication Enabled, randon permission errors --- ac2e9587fb3007c019c13ea1405cafcc8bc5e7b8 diff --cc Zend/zend_virtual_cwd.c index 22b92728bc,b74313d3a5..382a40d6ca --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@@ -691,8 -941,9 +692,9 @@@ retry_reparse_tag_cloud CloseHandle(hLink); if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) { + may_retry_reparse_point = 1; reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget; - isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0; + isabsolute = pbuffer->SymbolicLinkReparseBuffer.Flags == 0; #if VIRTUAL_CWD_DEBUG printname = php_win32_ioutil_w_to_any(reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR)); if (!printname) {