diff options
Diffstat (limited to 'extra/php/php-fpm.conf.in.patch')
| -rw-r--r-- | extra/php/php-fpm.conf.in.patch | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch index b4dd32f96..b923edb38 100644 --- a/extra/php/php-fpm.conf.in.patch +++ b/extra/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p arguement) @@ -17,8 +17,8 @@ +pid = run/php-fpm/php-fpm.pid ; Error log file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ -@@ -102,7 +102,8 @@ + ; If it's set to "syslog", log is sent to syslogd instead of being written +@@ -140,7 +140,8 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -28,7 +28,7 @@ ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -121,9 +122,9 @@ +@@ -151,9 +152,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0666 @@ -38,38 +38,10 @@ +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ +listen.mode = 0660 - - ; Unix user/group of processes - ; Note: The user is mandatory. If the group is not set, the default user's group -@@ -163,23 +164,23 @@ - ; 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 = 20 - - ; 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 = 5 - - ; 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 = 35 - ; 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 - ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. - ; Default Value: 0 --;pm.max_requests = 500 -+pm.max_requests = 500 - - ; The URI to view the FPM status page. If this value is not set, no URI will be - ; recognized as a status page. By default, the status page shows the following -@@ -333,7 +334,7 @@ + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -442,7 +443,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot |