diff options
| author | Florian MARGAINE <florian@margaine.com> | 2014-11-20 18:50:34 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-21 07:33:15 +0100 |
| commit | 29d2c13809247dfd21b1f20d1d3771e10590694e (patch) | |
| tree | 85a5ed40a4102f89ef79062384d8078849492f87 | |
| parent | 73cb5ca777660c0226431f709829a07bf6796120 (diff) | |
| download | php-git-29d2c13809247dfd21b1f20d1d3771e10590694e.tar.gz | |
Fixed bug #68391 Returns the pool config files in order
Fixes https://bugs.php.net/bug.php?id=68391
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 103a830389..65a51f11c6 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1250,7 +1250,7 @@ static void fpm_conf_ini_parser_include(char *inc, void *arg TSRMLS_DC) /* {{{ * #ifdef HAVE_GLOB { g.gl_offs = 0; - if ((i = glob(inc, GLOB_ERR | GLOB_MARK | GLOB_NOSORT, NULL, &g)) != 0) { + if ((i = glob(inc, GLOB_ERR | GLOB_MARK, NULL, &g)) != 0) { #ifdef GLOB_NOMATCH if (i == GLOB_NOMATCH) { zlog(ZLOG_WARNING, "Nothing matches the include pattern '%s' from %s at line %d.", inc, filename, ini_lineno); |