From 16e6bb82f344caa6dd88e6ad8d9cbd78c626a799 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Thu, 29 Nov 2012 23:15:41 +0000 Subject: [PATCH] Core: 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. --- src/os/unix/ngx_files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;