From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Date: Sat, 2 May 2015 08:26:54 +0000 (+0200)
Subject: php-fpm-sysconfdir
X-Git-Tag: archive/raspbian/8.4.11-1+rpi1^2~34
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5691512213250188649273d7ff5316eb23138f40;p=php8.4.git

php-fpm-sysconfdir


Gbp-Pq: Name 0013-php-fpm-sysconfdir.patch
---

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index ef9b35a9..c0fa83d1 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -1823,7 +1823,7 @@ int fpm_conf_init_main(int test_conf, int force_daemon) /* {{{ */
 		char *tmp;
 
 		if (fpm_globals.prefix == NULL) {
-			spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
+			spprintf(&tmp, 0, "%s/php/%d.%d/fpm/php-fpm.conf", PHP_SYSCONFDIR, PHP_MAJOR_VERSION, PHP_MINOR_VERSION);
 		} else {
 			spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix);
 		}