github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Proposed fix for wildcard op when loading conf files on Nginx / IIS

Browse Source
This commit is contained in:
Victor Hora 2017-06-29 01:37:23 -04:00 committed by Felipe Zimmerle
parent b3c39136c1
commit bbe7f8c389
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
standalone/config.c
View File

@ -742,12 +742,12 @@ AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *src1,
return path; return path;
} }
static int fname_alphasort(const void *fn1, const void *fn2) static int fname_reversealphasort(const void *fn1, const void *fn2)
{ {
const fnames *f1 = fn1; const fnames *f1 = fn1;
const fnames *f2 = fn2; const fnames *f2 = fn2;
return strcmp(f1->fname,f2->fname); return strcmp(f2->fname,f1->fname);
} }
int fnmatch_test(const char *pattern) int fnmatch_test(const char *pattern)
@ -840,7 +840,7 @@ static const char *process_resource_config_nofnmatch(const char *fname,
apr_dir_close(dirp); apr_dir_close(dirp);
if (candidates->nelts != 0) { if (candidates->nelts != 0) {
qsort((void *) candidates->elts, candidates->nelts, qsort((void *) candidates->elts, candidates->nelts,
sizeof(fnames), fname_alphasort); sizeof(fnames), fname_reversealphasort);
/* /*
* Now recurse these... we handle errors and subdirectories * Now recurse these... we handle errors and subdirectories
@ -941,7 +941,7 @@ static const char *process_resource_config_fnmatch(const char *path,
const char *error; const char *error;
qsort((void *) candidates->elts, candidates->nelts, qsort((void *) candidates->elts, candidates->nelts,
sizeof(fnames), fname_alphasort); sizeof(fnames), fname_reversealphasort);
/* /*
* Now recurse these... we handle errors and subdirectories * Now recurse these... we handle errors and subdirectories
@ -1201,3 +1201,4 @@ Exit:
return errmsg; return errmsg;
} }