From c2e806f683c5cde7de659c655e20c6fb72e68ef8 Mon Sep 17 00:00:00 2001
From: Hans Rakers <hans@shoq.com>
Date: Fri, 10 Jul 2020 16:49:11 +0200
Subject: [PATCH] Remove GLOB_NOSORT from fpm config file include glob call, to
 return the files in order

This makes sure the pool configuration is loaded in the correct order (See https://bugs.php.net/bug.php?id=68391)
---
 Dockerfile        | 6 +++---
 docker-php-source | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 204241a..26b0ddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -168,6 +168,9 @@ RUN set -eux; \
       dpkg -i libmysqlclient-dev_5.7.30-1ubuntu18.04_amd64.deb libmysqlclient20_5.7.30-1ubuntu18.04_amd64.deb mysql-common_5.7.30-1ubuntu18.04_amd64.deb; \
       curl -SL "http://nl.php.net/get/php-$PHP_VERSION.tar.xz/from/this/mirror" -o php.tar.xz; \
       curl -SL "http://nl.php.net/get/php-$PHP_VERSION.tar.xz.asc/from/this/mirror" -o php.tar.xz.asc; \
+      # This patch removes the GLOB_NOSORT flag from the glob() call in sapi/fpm/fpm/fpm_conf.c
+      # Without this, the read order of fpm config files is completely random. See https://bugs.php.net/bug.php?id=68391
+      curl -SL "https://github.com/php/php-src/commit/29d2c13809247dfd21b1f20d1d3771e10590694e.diff" -o fpm_conf_glob_sort.patch; \
       gpg --verify php.tar.xz.asc; \
       docker-php-source extract; \
       cd /usr/src/php; \
@@ -317,9 +320,6 @@ RUN set -eux; \
     echo 'listen = 9000'; \
   } | tee php-fpm.d/zz-docker.conf
 
-# fix some weird corruption in this file
-RUN sed -i -e "" /usr/local/etc/php-fpm.d/www.conf
-
 # Override stop signal to stop process gracefully
 # https://github.com/php/php-src/blob/17baa87faddc2550def3ae7314236826bc1b1398/sapi/fpm/php-fpm.8.in#L163
 STOPSIGNAL SIGQUIT
diff --git a/docker-php-source b/docker-php-source
index 9033d24..f0a582f 100755
--- a/docker-php-source
+++ b/docker-php-source
@@ -19,6 +19,7 @@ case "$1" in
 		mkdir -p "$dir"
 		if [ ! -f "$dir/.docker-extracted" ]; then
 			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
+			patch -d "$dir" -p1 -i /usr/src/fpm_conf_glob_sort.patch
 			touch "$dir/.docker-extracted"
 		fi
 		;;