]> granicus.if.org Git - php/commitdiff
Fixed bug #68391 Returns the pool config files in order
authorFlorian MARGAINE <florian@margaine.com>
Thu, 20 Nov 2014 17:50:34 +0000 (18:50 +0100)
committerRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:33:15 +0000 (07:33 +0100)
Fixes https://bugs.php.net/bug.php?id=68391

sapi/fpm/fpm/fpm_conf.c

index 103a830389c88f7ed91cdeae18f64206ae84d3b7..65a51f11c693a2c6acc55096440b6139935daa3e 100644 (file)
@@ -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);