diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-09 21:27:37 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-09 21:27:37 +0000 |
| commit | 4f535b103e7621678274201aa1b74ef7a92e0577 (patch) | |
| tree | f5b74900e562fcf0603351b57cebf78a20b3869b | |
| parent | 5abb6ff1f0500bfdfe10753e3521d779a18959ba (diff) | |
| download | nginx-4f535b103e7621678274201aa1b74ef7a92e0577.tar.gz nginx-4f535b103e7621678274201aa1b74ef7a92e0577.tar.bz2 | |
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.
| -rw-r--r-- | src/os/unix/ngx_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index 4fdf884fc..c3ae47fdb 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -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; |