diff options
| author | Remi Collet <remi@php.net> | 2014-11-21 07:35:10 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-21 07:35:10 +0100 |
| commit | 61f6cd0da56e36de9d682159d0f58894d950b6f8 (patch) | |
| tree | 436fdeaa0cc242b6281e2d084a3080145c359f89 /sapi | |
| parent | 245d01892a517f9e4600d2db1cdae1dc3213c4e3 (diff) | |
| parent | cf3a90228644455f93ff96eddf2e27e9e5a8c812 (diff) | |
| download | php-git-61f6cd0da56e36de9d682159d0f58894d950b6f8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #68391 Returns the pool config files in order
Diffstat (limited to 'sapi')
| -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 26a9fd1c7a..dab4c8bf6b 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1257,7 +1257,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); |