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 ef9b35a9994aaf5b2b7debeab9683de10972416c..c0fa83d1c81dd76625ff311017475e56bd9db392 100644 (file)
--- 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);
                }