summaryrefslogtreecommitdiff
path: root/TSRM
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-08-26 14:23:17 +0000
committerPierre Joye <pajoye@php.net>2010-08-26 14:23:17 +0000
commita5e51efff87d828dde6634559a8fbc2f89e086ed (patch)
tree38181dca29dca1d6491df2e81a8db797068db2fa /TSRM
parent6338f99d522992bdea264fd774d773e09b4ce585 (diff)
downloadphp-git-a5e51efff87d828dde6634559a8fbc2f89e086ed.tar.gz
- Symlink resolution fails when target is a DFS path
Diffstat (limited to 'TSRM')
-rw-r--r--TSRM/tsrm_virtual_cwd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index d51e01aa3e..947b22c8f4 100644
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -811,8 +811,10 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
\\?\Volume{62d1c3f8-83b9-11de-b108-806e6f6e6963}\foo
*/
if (strncmp(substitutename, "\\??\\Volume{",11) == 0
- || strncmp(substitutename, "\\\\?\\Volume{",11) == 0) {
- isVolume = TRUE;
+ || strncmp(substitutename, "\\\\?\\Volume{",11) == 0
+ || strncmp(substitutename, "\\??\\UNC\\", 8) == 0
+ ) {
+ isVolume = TRUE;
substitutename_off = 0;
} else
/* do not use the \??\ and \\?\ prefix*/