Skip to content

remotestrunk #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2012
Merged

remotestrunk #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions standalone/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
Expand Down Expand Up @@ -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) {
Expand Down