Merge of r4944: removed GLOB_NOSORT glob option.

This will result in alphabetical sorting of included files if
the "include" directive with wildcards is used.

Note that the behaviour is now different from that on Windows, where
alphabetical sorting is not guaranteed for FindFirsFile()/FindNextFile()
(used to be alphabetical on NTFS, but not on FAT).

Approved by Igor Sysoev, prodded by many.
This commit is contained in:
Maxim Dounin 2013-02-09 21:27:37 +00:00
parent 5abb6ff1f0
commit 4f535b103e

View File

@ -363,7 +363,7 @@ ngx_open_glob(ngx_glob_t *gl)
{
int n;
n = glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob);
n = glob((char *) gl->pattern, 0, NULL, &gl->pglob);
if (n == 0) {
return NGX_OK;