Mercurial > hg > nginx
comparison src/os/unix/ngx_files.c @ 5036:6e374742043e stable-1.2
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 09 Feb 2013 21:27:37 +0000 |
| parents | 2e4e4084b562 |
| children |
comparison
equal
deleted
inserted
replaced
| 5035:11b6590c7460 | 5036:6e374742043e |
|---|---|
| 361 ngx_int_t | 361 ngx_int_t |
| 362 ngx_open_glob(ngx_glob_t *gl) | 362 ngx_open_glob(ngx_glob_t *gl) |
| 363 { | 363 { |
| 364 int n; | 364 int n; |
| 365 | 365 |
| 366 n = glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob); | 366 n = glob((char *) gl->pattern, 0, NULL, &gl->pglob); |
| 367 | 367 |
| 368 if (n == 0) { | 368 if (n == 0) { |
| 369 return NGX_OK; | 369 return NGX_OK; |
| 370 } | 370 } |
| 371 | 371 |