github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

remotestrunk

Browse Source
This commit is contained in:
Greg Wroblewski 2012-11-13 12:54:54 -08:00
parent 42aa054089
commit a4c75689fd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
standalone/config.c
View File

@ -849,7 +849,11 @@ static const char *process_resource_config_fnmatch(const char *path,
/* find the first part of the filename */ /* find the first part of the filename */
rest = ap_strchr_c(fname, '/'); rest = ap_strchr_c(fname, '/');
if (rest) {
if(rest == NULL)
rest = ap_strchr_c(fname, '\\');
if (rest) {
fname = apr_pstrndup(ptemp, fname, rest - fname); fname = apr_pstrndup(ptemp, fname, rest - fname);
rest++; rest++;
} }
@ -953,7 +957,7 @@ AP_DECLARE(const char *) process_fnmatch_configs(apr_array_header_t *ari,
const char *rootpath, *filepath = fname; const char *rootpath, *filepath = fname;
/* locate the start of the directories proper */ /* 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 */ /* we allow APR_SUCCESS and APR_EINCOMPLETE */
if (APR_ERELATIVE == status) { if (APR_ERELATIVE == status) {