summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Loyet <fat@php.net>2011-07-05 21:03:26 +0000
committerJérôme Loyet <fat@php.net>2011-07-05 21:03:26 +0000
commit505537274d24243430d29fda15fb7bcf339d972a (patch)
tree73a14c9f303a7da2d3661b3c4e2d65cb2d553999
parente77b49bfd367fb8e39bafc3f26c22d926eaba6f1 (diff)
downloadphp-git-505537274d24243430d29fda15fb7bcf339d972a.tar.gz
- Implemented FR #54098 (Lowered default value for Process Manager)
-rw-r--r--NEWS1
-rw-r--r--sapi/fpm/php-fpm.conf.in11
2 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index d77ebd10f6..ef8f2481fb 100644
--- a/NEWS
+++ b/NEWS
@@ -134,6 +134,7 @@ PHP NEWS
- Improved PHP-FPM SAPI:
. Added partial syslog support (on error_log only). FR #52052. (fat)
+ . Lowered default value for Process Manager. FR #54098. (fat)
- Improved core functions:
. number_format() no longer truncates multibyte decimal points and thousand
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 00db9e340e..b3151c0a99 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -170,25 +170,26 @@ pm = dynamic
; This value sets the limit on the number of simultaneous requests that will be
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI.
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
; Note: Used when pm is set to either 'static' or 'dynamic'
; Note: This value is mandatory.
-pm.max_children = 50
+pm.max_children = 5
; The number of child processes created on startup.
; Note: Used only when pm is set to 'dynamic'
; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-;pm.start_servers = 20
+pm.start_servers = 2
; The desired minimum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
-;pm.min_spare_servers = 5
+pm.min_spare_servers = 1
; The desired maximum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
-;pm.max_spare_servers = 35
+pm.max_spare_servers = 3
; The number of requests each child process should execute before respawning.
; This can be useful to work around memory leaks in 3rd party libraries. For