From: Florian MARGAINE <florian@margaine.com>
Date: Thu, 20 Nov 2014 17:50:34 +0000 (+0100)
Subject: Fixed bug #68391 Returns the pool config files in order
X-Git-Tag: php-5.5.20RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29d2c13809247dfd21b1f20d1d3771e10590694e;p=php

Fixed bug #68391 Returns the pool config files in order

Fixes https://bugs.php.net/bug.php?id=68391
---

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);