[nginx] svn commit: r5037 - in branches/stable-1.2: . src/os/unix

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-09 21:27:37 +0000 (Sat, 09 Feb 2013)
New Revision: 5037
URL: http://trac.nginx.org/nginx/changeset/5037/nginx

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


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/os/unix/ngx_files.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-09 21:07:06 UTC (rev 5036)
+++ branches/stable-1.2	2013-02-09 21:27:37 UTC (rev 5037)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944
\ No newline at end of property
Modified: branches/stable-1.2/src/os/unix/ngx_files.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_files.c	2013-02-09 21:07:06 UTC (rev 5036)
+++ branches/stable-1.2/src/os/unix/ngx_files.c	2013-02-09 21:27:37 UTC (rev 5037)
@@ -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;