summaryrefslogtreecommitdiff
path: root/sapi/fpm/config.m4
diff options
context:
space:
mode:
authorElan Ruusamäe <glen@delfi.ee>2014-11-18 23:15:39 +0200
committerRemi Collet <remi@php.net>2014-12-14 14:21:46 +0100
commit9f189dd29075589aeb3c88c4e2860d6ae0730f27 (patch)
tree3c1ec6ff0579b644168f3b61a5faf136bef6c3e8 /sapi/fpm/config.m4
parent70c141b8f83f0afac9110503f7495ac84e1802e7 (diff)
downloadphp-git-9f189dd29075589aeb3c88c4e2860d6ae0730f27.tar.gz
split fpm config to two parts. PR#903
main config = global options secondary config = pool options makes easier to add new pools: duplicate pool config in fpm.d dir https://bugs.php.net/bug.php?id=67106
Diffstat (limited to 'sapi/fpm/config.m4')
-rw-r--r--sapi/fpm/config.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index f87776aa24..b4a4f4fb33 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -667,7 +667,7 @@ if test "$PHP_FPM" != "no"; then
PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
- PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
+ PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
SAPI_FPM_PATH=sapi/fpm/php-fpm