summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-fpm-www.conf22
-rw-r--r--php-fpm.conf14
2 files changed, 18 insertions, 18 deletions
diff --git a/php-fpm-www.conf b/php-fpm-www.conf
index 3e29ee4..70da573 100644
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@@ -122,7 +122,7 @@ pm.min_spare_servers = 5
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
pm.max_spare_servers = 35
-
+
; The number of seconds after which an idle process will be killed.
; Note: Used only when pm is set to 'ondemand'
; Default Value: 10s
@@ -232,7 +232,7 @@ pm.max_spare_servers = 35
; may conflict with a real PHP file.
; Default Value: not set
;pm.status_path = /status
-
+
; The ping URI to call the monitoring page of FPM. If this value is not set, no
; URI will be recognized as a ping page. This could be used to test from outside
; that FPM is alive and responding, or to
@@ -249,7 +249,7 @@ pm.max_spare_servers = 35
; response is formatted as text/plain with a 200 response code.
; Default Value: pong
;ping.response = pong
-
+
; The access log file
; Default: not set
;access.log = log/$pool.access.log
@@ -330,16 +330,16 @@ slowlog = /var/log/php-fpm/www-slow.log
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
; Default Value: 0
;request_terminate_timeout = 0
-
+
; Set open file descriptor rlimit.
; Default Value: system defined value
;rlimit_files = 1024
-
+
; Set max core size rlimit.
; Possible Values: 'unlimited' or an integer greater or equal to 0
; Default Value: system defined value
;rlimit_core = 0
-
+
; Chroot to this directory at the start. This value must be defined as an
; absolute path. When this value is not set, chroot is not used.
; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
@@ -349,20 +349,20 @@ slowlog = /var/log/php-fpm/www-slow.log
; possible. However, all PHP paths will be relative to the chroot
; (error_log, sessions.save_path, ...).
; Default Value: not set
-;chroot =
-
+;chroot =
+
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
;chdir = /var/www
-
+
; Redirect worker stdout and stderr into main error log. If not set, stdout and
; stderr will be redirected to /dev/null according to FastCGI specs.
; Note: on highloaded environement, this can cause some delay in the page
; process time (several ms).
; Default Value: no
;catch_workers_output = yes
-
+
; Clear environment in FPM workers
; Prevents arbitrary environment variables from reaching FPM worker processes
; by clearing the environment in workers before env vars specified in this
@@ -393,7 +393,7 @@ slowlog = /var/log/php-fpm/www-slow.log
; overwrite the values previously defined in the php.ini. The directives are the
; same as the PHP SAPI:
; php_value/php_flag - you can set classic ini defines which can
-; be overwritten from PHP call 'ini_set'.
+; be overwritten from PHP call 'ini_set'.
; php_admin_value/php_admin_flag - these directives won't be overwritten by
; PHP call 'ini_set'
; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
diff --git a/php-fpm.conf b/php-fpm.conf
index 55dc684..29ec0d9 100644
--- a/php-fpm.conf
+++ b/php-fpm.conf
@@ -49,7 +49,7 @@ error_log = /var/log/php-fpm/error.log
; Default Value: 0
;emergency_restart_threshold = 0
-; Interval of time used by emergency_restart_interval to determine when
+; Interval of time used by emergency_restart_interval to determine when
; a graceful restart will be initiated. This can be useful to work around
; accidental corruptions in an accelerator's shared memory.
; Available Units: s(econds), m(inutes), h(ours), or d(ays)
@@ -63,7 +63,7 @@ error_log = /var/log/php-fpm/error.log
; Default Value: 0
;process_control_timeout = 0
-; The maximum number of processes FPM will fork. This has been design to control
+; The maximum number of processes FPM will fork. This has been designed to control
; the global number of processes when using dynamic PM within a lot of pools.
; Use it with caution.
; Note: A value of 0 indicates no limit
@@ -71,10 +71,10 @@ error_log = /var/log/php-fpm/error.log
;process.max = 128
; Specify the nice(2) priority to apply to the master process (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
+; The value can vary from -19 (highest priority) to 20 (lowest priority)
; Note: - It will only work if the FPM master process is launched as root
; - The pool process will inherit the master process priority
-; unless it specified otherwise
+; unless specified otherwise
; Default Value: no set
;process.priority = -19
@@ -98,8 +98,8 @@ daemonize = yes
; Default Value: not set (auto detection)
;events.mechanism = epoll
-; When FPM is build with systemd integration, specify the interval,
-; in second, between health report notification to systemd.
+; When FPM is built with systemd integration, specify the interval,
+; in seconds, between health report notification to systemd.
; Set to 0 to disable.
; Available Units: s(econds), m(inutes), h(ours)
; Default Unit: seconds
@@ -107,7 +107,7 @@ daemonize = yes
;systemd_interval = 10
;;;;;;;;;;;;;;;;;;;;
-; Pool Definitions ;
+; Pool Definitions ;
;;;;;;;;;;;;;;;;;;;;
; Multiple pools of child processes may be started with different listening