Browse Source

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.
PHP-5.4.9
Anatoliy Belsky 14 years ago
parent
commit
24e4af0b8f
  1. 2
      NEWS
  2. 9
      TSRM/tsrm_virtual_cwd.c

2
NEWS

@ -6,6 +6,8 @@ PHP NEWS
. Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
. Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes).
(Tony, Andrew Sitnikov)
. Fixed bug #63241 PHP fails to open Windows deduplicated files.
(daniel dot stelter-gliese at innogames dot de)
- Curl:
. Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST).

9
TSRM/tsrm_virtual_cwd.c

@ -40,6 +40,10 @@
# define IO_REPARSE_TAG_SYMLINK 0xA000000C
# endif
# ifndef IO_REPARSE_TAG_DEDUP
# define IO_REPARSE_TAG_DEDUP 0x80000013
# endif
# ifndef VOLUME_NAME_NT
# define VOLUME_NAME_NT 0x2
# endif
@ -945,6 +949,11 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
return -1;
};
substitutename[substitutename_len] = 0;
}
else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP) {
isabsolute = 1;
memcpy(substitutename, path, len + 1);
substitutename_len = len;
} else {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;

Loading…
Cancel
Save