[nginx] svn commit: r4944 - trunk/src/os/unix

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-11-29 23:15:41 +0000 (Thu, 29 Nov 2012)
New Revision: 4944
URL: http://trac.nginx.org/nginx/changeset/4944/nginx

Log:
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.


Modified:
   trunk/src/os/unix/ngx_files.c

Modified: trunk/src/os/unix/ngx_files.c
===================================================================
--- trunk/src/os/unix/ngx_files.c	2012-11-29 23:13:18 UTC (rev 4943)
+++ trunk/src/os/unix/ngx_files.c	2012-11-29 23:15:41 UTC (rev 4944)
@@ -363,7 +363,7 @@
 {
     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;