Skip to content

Commit bbe7f8c

Browse files
victorhoraFelipe Zimmerle
authored and
Felipe Zimmerle
committed
Proposed fix for wildcard op when loading conf files on Nginx / IIS
1 parent b3c3913 commit bbe7f8c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

standalone/config.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,12 +742,12 @@ AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *src1,
742742
return path;
743743
}
744744

745-
static int fname_alphasort(const void *fn1, const void *fn2)
745+
static int fname_reversealphasort(const void *fn1, const void *fn2)
746746
{
747747
const fnames *f1 = fn1;
748748
const fnames *f2 = fn2;
749749

750-
return strcmp(f1->fname,f2->fname);
750+
return strcmp(f2->fname,f1->fname);
751751
}
752752

753753
int fnmatch_test(const char *pattern)
@@ -840,7 +840,7 @@ static const char *process_resource_config_nofnmatch(const char *fname,
840840
apr_dir_close(dirp);
841841
if (candidates->nelts != 0) {
842842
qsort((void *) candidates->elts, candidates->nelts,
843-
sizeof(fnames), fname_alphasort);
843+
sizeof(fnames), fname_reversealphasort);
844844

845845
/*
846846
* Now recurse these... we handle errors and subdirectories
@@ -941,7 +941,7 @@ static const char *process_resource_config_fnmatch(const char *path,
941941
const char *error;
942942

943943
qsort((void *) candidates->elts, candidates->nelts,
944-
sizeof(fnames), fname_alphasort);
944+
sizeof(fnames), fname_reversealphasort);
945945

946946
/*
947947
* Now recurse these... we handle errors and subdirectories
@@ -1201,3 +1201,4 @@ const char *process_command_config(server_rec *s,
12011201

12021202
return errmsg;
12031203
}
1204+

0 commit comments

Comments
 (0)