Skip to content

Commit a2ed731

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #79470: PHP incompatible with 3rd party file system on demand
2 parents 3151676 + 29968d8 commit a2ed731

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ PHP NEWS
88
. Fixed bug #79477 (casting object into array creates references). (Nikita)
99
. Fixed bug #79514 (Memory leaks while including unexistent file). (cmb,
1010
Nikita)
11+
. Fixed bug #79470 (PHP incompatible with 3rd party file system on demand).
12+
(cmb)
13+
. Fixed bug #78784 (Unable to interact with files inside a VFS for Git
14+
repository). (cmb)
1115

1216
- DOM:
1317
. Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes).

Zend/zend_virtual_cwd.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@
5555
#define IO_REPARSE_TAG_ONEDRIVE (0x80000021L)
5656
#endif
5757

58+
# ifndef IO_REPARSE_TAG_ACTIVISION_HSM
59+
# define IO_REPARSE_TAG_ACTIVISION_HSM (0x00000047L)
60+
# endif
61+
62+
# ifndef IO_REPARSE_TAG_PROJFS
63+
# define IO_REPARSE_TAG_PROJFS (0x9000001CL)
64+
# endif
65+
5866
# ifndef VOLUME_NAME_NT
5967
# define VOLUME_NAME_NT 0x2
6068
# endif
@@ -753,7 +761,9 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
753761
else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP ||
754762
/* Starting with 1709. */
755763
(pbuffer->ReparseTag & ~IO_REPARSE_TAG_CLOUD_MASK) == IO_REPARSE_TAG_CLOUD ||
756-
IO_REPARSE_TAG_ONEDRIVE == pbuffer->ReparseTag) {
764+
IO_REPARSE_TAG_ONEDRIVE == pbuffer->ReparseTag ||
765+
IO_REPARSE_TAG_ACTIVISION_HSM == pbuffer->ReparseTag ||
766+
IO_REPARSE_TAG_PROJFS == pbuffer->ReparseTag) {
757767
isabsolute = 1;
758768
substitutename = malloc((len + 1) * sizeof(char));
759769
if (!substitutename) {

0 commit comments

Comments
 (0)