]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 26 Oct 2020 10:21:35 +0000 (11:21 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 26 Oct 2020 10:21:52 +0000 (11:21 +0100)
* PHP-7.3:
  Fix #80258: Windows Deduplication Enabled, randon permission errors

1  2 
NEWS
Zend/zend_virtual_cwd.c

diff --cc NEWS
Simple merge
index 22b92728bc6ae1f3c8198ede2174917279f4757a,b74313d3a576cb8747b248d97ecc213cb9713af5..382a40d6ca399b3121e4fc4ae53e56d187aa928a
@@@ -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) {