Skip to content

Commit 2f7a1ac

Browse files
committed
Merge pull request #12 from gwroblew/remotes/trunk
remotestrunk
2 parents 0265607 + a4c7568 commit 2f7a1ac

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

standalone/config.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,11 @@ static const char *process_resource_config_fnmatch(const char *path,
849849

850850
/* find the first part of the filename */
851851
rest = ap_strchr_c(fname, '/');
852-
if (rest) {
852+
853+
if(rest == NULL)
854+
rest = ap_strchr_c(fname, '\\');
855+
856+
if (rest) {
853857
fname = apr_pstrndup(ptemp, fname, rest - fname);
854858
rest++;
855859
}
@@ -953,7 +957,7 @@ AP_DECLARE(const char *) process_fnmatch_configs(apr_array_header_t *ari,
953957
const char *rootpath, *filepath = fname;
954958

955959
/* locate the start of the directories proper */
956-
status = apr_filepath_root(&rootpath, &filepath, APR_FILEPATH_TRUENAME, ptemp);
960+
status = apr_filepath_root(&rootpath, &filepath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, ptemp);
957961

958962
/* we allow APR_SUCCESS and APR_EINCOMPLETE */
959963
if (APR_ERELATIVE == status) {

0 commit comments

Comments
 (0)