1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Date: Sat, 2 May 2015 10:26:54 +0200
Subject: php-fpm-sysconfdir
---
sapi/fpm/fpm/fpm_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index ac4343b..88c505d 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -1852,7 +1852,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);
}
|
