com php-src: Fixed bug #68391 Returns the pool config files in order: sapi/fpm/fpm/fpm_conf.c
| From: | Remi Collet | Date: | Fri, 21 Nov 2014 06:33:15 +0000 |
| Subject: | com php-src: Fixed bug #68391 Returns the pool config files in order: sapi/fpm/fpm/fpm_conf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83209@lists.php.net to get a copy of this message | ||
Commit: 29d2c13809247dfd21b1f20d1d3771e10590694e
Author: Florian MARGAINE <florian@margaine.com> Thu, 20 Nov 2014 18:50:34 +0100
Committer: Remi Collet <remi@php.net> Fri, 21 Nov 2014 07:33:15 +0100
Parents: 73cb5ca777660c0226431f709829a07bf6796120
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29d2c13809247dfd21b1f20d1d3771e10590694e
Log:
Fixed bug #68391 Returns the pool config files in order
Fixes https://bugs.php.net/bug.php?id=68391
Bugs:
https://bugs.php.net/68391
Changed paths:
M sapi/fpm/fpm/fpm_conf.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 103a830..65a51f1 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);