From a4c75689fd87769379878918121370df4de38fca Mon Sep 17 00:00:00 2001 From: Greg Wroblewski Date: Tue, 13 Nov 2012 12:54:54 -0800 Subject: [PATCH] remotestrunk --- standalone/config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/standalone/config.c b/standalone/config.c index 615f0a9eaf..95c363d269 100644 --- a/standalone/config.c +++ b/standalone/config.c @@ -849,7 +849,11 @@ static const char *process_resource_config_fnmatch(const char *path, /* find the first part of the filename */ rest = ap_strchr_c(fname, '/'); - if (rest) { + + if(rest == NULL) + rest = ap_strchr_c(fname, '\\'); + + if (rest) { fname = apr_pstrndup(ptemp, fname, rest - fname); rest++; } @@ -953,7 +957,7 @@ AP_DECLARE(const char *) process_fnmatch_configs(apr_array_header_t *ari, const char *rootpath, *filepath = fname; /* locate the start of the directories proper */ - status = apr_filepath_root(&rootpath, &filepath, APR_FILEPATH_TRUENAME, ptemp); + status = apr_filepath_root(&rootpath, &filepath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, ptemp); /* we allow APR_SUCCESS and APR_EINCOMPLETE */ if (APR_ERELATIVE == status) {