X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-fpm-config.patch;h=cb2b91d853abf8d54a949a632d60fe3b88f1cc00;hb=9a574c326ccb9321e53d50ff39c9a140520d8787;hp=19aa0a50b5defb4818101ef903307fba5ed45d2f;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf;p=packages%2Fphp.git diff --git a/php-fpm-config.patch b/php-fpm-config.patch index 19aa0a5..cb2b91d 100644 --- a/php-fpm-config.patch +++ b/php-fpm-config.patch @@ -1,20 +1,6 @@ ---- php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-12 12:35:47.601602945 +0300 -+++ php-5.3.18/sapi/fpm/php-fpm.conf.in 2012-11-28 15:31:00.486871136 +0200 -@@ -1,3 +1,4 @@ -+; vim:ft=dosini - ;;;;;;;;;;;;;;;;;;;;; - ; FPM Configuration ; - ;;;;;;;;;;;;;;;;;;;;; -@@ -12,7 +13,7 @@ - ; Relative path can also be used. They will be prefixed by: - ; - the global prefix if it's been set (-p arguement) - ; - @prefix@ otherwise --;include=etc/fpm.d/*.conf -+;include=/etc/php/fpm.d/*.conf - - ;;;;;;;;;;;;;;;;;; - ; Global Options ; -@@ -22,14 +23,14 @@ +--- php-5.6.2/sapi/fpm/php-fpm.conf.in 2014-10-27 08:20:34.963718145 +0200 ++++ php-5.6.2.old/sapi/fpm/php-fpm.conf.in 2014-10-27 08:07:47.762117299 +0200 +@@ -14,14 +14,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none @@ -31,58 +17,52 @@ ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities -@@ -148,7 +149,7 @@ +@@ -115,3 +115,11 @@ + ; ports and different management options. The name of the pool will be + ; used in logs and stats. There is no limitation on the number of pools which + ; FPM can handle. Your system will tell you anyway :) ++ ++; Include one or more files. If glob(3) exists, it is used to include a bunch of ++; files from a glob(3) pattern. This directive can be used everywhere in the ++; file. ++; Relative path can also be used. They will be prefixed by: ++; - the global prefix if it's been set (-p argument) ++; - @prefix@ otherwise ++include=/etc/php/fpm.d/*.conf +--- php-5.6.2.old/sapi/fpm/php-fpm.conf-d.in 2014-10-27 08:07:47.762117299 +0200 ++++ php-5.6.2/sapi/fpm/php-fpm.conf-d.in 2014-10-27 08:23:41.232196777 +0200 +@@ -32,7 +32,7 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = 127.0.0.1:9000 +listen = /var/run/php/@processname@.sock - ; Set listen(2) backlog. A value of '-1' means unlimited. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -161,7 +162,7 @@ + ; Set listen(2) backlog. + ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) +@@ -41,9 +41,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0660 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0660 ++listen.owner = root ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -53,7 +53,7 @@ ; must be separated by a comma. If this value is left blank, connections will be ; accepted from any ip address. ; Default Value: any -;listen.allowed_clients = 127.0.0.1 +listen.allowed_clients = 127.0.0.1 - ; Choose how the process manager will control the number of child processes. - ; Possible Values: -@@ -208,12 +209,12 @@ - ; 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 = 1 -+pm.min_spare_servers = 2 - - ; 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 = 3 -+pm.max_spare_servers = 5 - - ; The number of seconds after which an idle process will be killed. - ; Note: Used only when pm is set to 'ondemand' -@@ -323,7 +324,7 @@ - ; anything, but it may not be a good idea to use the .php extension or it - ; may conflict with a real PHP file. - ; Default Value: not set --;pm.status_path = /status -+;pm.status_path = /fpm-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 -@@ -449,7 +450,7 @@ - ; Note: on highloaded environement, this can cause some delay in the page - ; process time (several ms). - ; Default Value: no --;catch_workers_output = yes -+catch_workers_output = yes - - ; 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 -@@ -463,7 +464,7 @@ + ; Specify the nice(2) priority to apply to the pool processes (only if set) + ; The value can vary from -19 (highest priority) to 20 (lower priority) +@@ -372,7 +372,7 @@ ; the current environment. ; Default Value: clean env ;env[HOSTNAME] = $HOSTNAME @@ -102,14 +82,16 @@ ths = document.getElementsByTagName("th"); for (var i=0; i