Skip to content

Proposed fix for wildcard operator when loading conf files on Nginx / IIS #1486

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

Closed
wants to merge 1 commit into from
Closed

Proposed fix for wildcard operator when loading conf files on Nginx / IIS #1486

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
9 changes: 5 additions & 4 deletions standalone/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,12 +742,12 @@ AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *src1,
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 *f2 = fn2;

return strcmp(f1->fname,f2->fname);
return strcmp(f2->fname,f1->fname);
}

int fnmatch_test(const char *pattern)
Expand Down Expand Up @@ -840,7 +840,7 @@ static const char *process_resource_config_nofnmatch(const char *fname,
apr_dir_close(dirp);
if (candidates->nelts != 0) {
qsort((void *) candidates->elts, candidates->nelts,
sizeof(fnames), fname_alphasort);
sizeof(fnames), fname_reversealphasort);

/*
* Now recurse these... we handle errors and subdirectories
Expand Down Expand Up @@ -941,7 +941,7 @@ static const char *process_resource_config_fnmatch(const char *path,
const char *error;

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

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

return errmsg;
}