svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/sapi/fpm/php-fpm.conf.in trunk/sapi/fpm/php-fpm.conf.in

fat Tue, 05 Jul 2011 21:03:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312957 Log: - Implemented FR #54098 (Lowered default value for Process Manager) Bug: https://bugs.php.net/54098 (Assigned) Overly high defaults in config Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in U php/php-src/trunk/sapi/fpm/php-fpm.conf.in Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-07-05 20:42:29 UTC (rev 312956) +++ php/php-src/branches/PHP_5_4/NEWS 2011-07-05 21:03:26 UTC (rev 312957) @@ -134,6 +134,7 @@ - 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 Modified: php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in =================================================================== --- php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in 2011-07-05 20:42:29 UTC (rev 312956) +++ php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in 2011-07-05 21:03:26 UTC (rev 312957) @@ -170,25 +170,26 @@ ; 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 Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in =================================================================== --- php/php-src/trunk/sapi/fpm/php-fpm.conf.in 2011-07-05 20:42:29 UTC (rev 312956) +++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in 2011-07-05 21:03:26 UTC (rev 312957) @@ -170,25 +170,26 @@ ; 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