From 174f0c517d3a018868782301c1a67b64ad283799 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Dec 2018 07:01:23 +0100 Subject: refresh FPM configuration from upstream --- php-fpm-www.conf | 8 ++++++-- php-fpm.conf | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/php-fpm-www.conf b/php-fpm-www.conf index 7647faa..604386c 100644 --- a/php-fpm-www.conf +++ b/php-fpm-www.conf @@ -1,5 +1,5 @@ ; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the +; the variable $pool can be used in any directive and will be replaced by the ; pool name ('www' here) [www] @@ -330,6 +330,10 @@ slowlog = /var/log/php-fpm/www-slow.log ; Default Value: 0 ;request_slowlog_timeout = 0 +; Depth of slow log stack trace. +; Default Value: 20 +;request_slowlog_trace_depth = 20 + ; The timeout for serving a single request after which the worker process will ; be killed. This option should be used when the 'max_execution_time' ini option ; does not stop script execution for some reason. A value of '0' means 'off'. @@ -381,7 +385,7 @@ slowlog = /var/log/php-fpm/www-slow.log ; Limits the extensions of the main script FPM will allow to parse. This can ; prevent configuration mistakes on the web server side. You should only limit ; FPM to .php extensions to prevent malicious users to use other extensions to -; exectute php code. +; execute php code. ; Note: set an empty value to allow all extensions. ; Default Value: .php ;security.limit_extensions = .php .php3 .php4 .php5 .php7 diff --git a/php-fpm.conf b/php-fpm.conf index 29ec0d9..53a07b6 100644 --- a/php-fpm.conf +++ b/php-fpm.conf @@ -43,6 +43,24 @@ error_log = /var/log/php-fpm/error.log ; Default Value: notice ;log_level = notice +; Log limit on number of characters in the single line (log entry). If the +; line is over the limit, it is wrapped on multiple lines. The limit is for +; all logged characters including message prefix and suffix if present. However +; the new line character does not count into it as it is present only when +; logging to a file descriptor. It means the new line character is not present +; when logging to syslog. +; Default Value: 1024 +;log_limit = 4096 + +; Log buffering specifies if the log line is buffered which means that the +; line is written in a single write operation. If the value is false, then the +; data is written directly into the file descriptor. It is an experimental +; option that can potentionaly improve logging performance and memory usage +; for some heavy logging scenarios. This option is ignored if logging to syslog +; as it has to be always buffered. +; Default value: yes +;log_buffering = no + ; If this number of child processes exit with SIGSEGV or SIGBUS within the time ; interval set by emergency_restart_interval then FPM will restart. A value ; of '0' means 'Off'. -- cgit