php-fpm-sysconfdir

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

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index ac4343bbf889ebba1cc07d1e0a5914ce7cdf5e51..88c505d0ce0866b4046c335ee470c65e412ec9e6 100644 (file)
--- 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);
                }