From c0b590fff66aec8f72ceec9fc76ad2f21f650480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Thu, 11 Oct 2018 11:54:38 +0200 Subject: [PATCH] [PHP-FPM] Move max_execution_time and max_input_time to general PHP config, removed as fixed php_admin_value --- data/conf/phpfpm/php-conf.d/other.ini | 2 ++ data/conf/phpfpm/php-fpm.d/pools.conf | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/conf/phpfpm/php-conf.d/other.ini b/data/conf/phpfpm/php-conf.d/other.ini index 2d05a5b7..4a90901d 100644 --- a/data/conf/phpfpm/php-conf.d/other.ini +++ b/data/conf/phpfpm/php-conf.d/other.ini @@ -1,2 +1,4 @@ session.save_handler = redis session.save_path = "tcp://redis:6379" +max_execution_time = 1200 +max_input_time = 1200 diff --git a/data/conf/phpfpm/php-fpm.d/pools.conf b/data/conf/phpfpm/php-fpm.d/pools.conf index d6520948..c0db1e04 100644 --- a/data/conf/phpfpm/php-fpm.d/pools.conf +++ b/data/conf/phpfpm/php-fpm.d/pools.conf @@ -11,8 +11,6 @@ access.log = /proc/self/fd/2 clear_env = no catch_workers_output = yes php_admin_value[memory_limit] = 256M -php_admin_value[max_execution_time] = 1200 -php_admin_value[max_input_time] = 1200 [web-worker] user = www-data @@ -27,6 +25,3 @@ access.log = /proc/self/fd/2 clear_env = no catch_workers_output = yes php_admin_value[memory_limit] = 512M -php_admin_value[max_execution_time] = 1200 -php_admin_value[max_input_time] = 1200 -