X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-fpm-config.patch;h=03a9a7bac3bb3b4dcb937e17d3231fb71fc09dcf;hb=refs%2Fheads%2FPHP_5_4;hp=19aa0a50b5defb4818101ef903307fba5ed45d2f;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf;p=packages%2Fphp.git diff --git a/php-fpm-config.patch b/php-fpm-config.patch index 19aa0a5..03a9a7b 100644 --- a/php-fpm-config.patch +++ b/php-fpm-config.patch @@ -1,11 +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 @@ +--- php-5.4.7/sapi/fpm/php-fpm.conf.in 2012-10-05 22:16:44.895998479 +0300 ++++ php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-12 12:35:47.601602945 +0300 +@@ -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) ; - @prefix@ otherwise @@ -14,7 +9,7 @@ ;;;;;;;;;;;;;;;;;; ; Global Options ; -@@ -22,14 +23,14 @@ +@@ -22,14 +22,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none @@ -31,7 +26,7 @@ ; 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 @@ +@@ -93,7 +93,7 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -40,49 +35,16 @@ ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -161,7 +162,7 @@ +@@ -105,7 +105,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 @@ + ; Set permissions for unix socket, if one is used. In Linux, read/write + ; permissions must be set in order to allow connections from a web server. Many +@@ -277,7 +277,7 @@ ; the current environment. ; Default Value: clean env ;env[HOSTNAME] = $HOSTNAME @@ -91,25 +53,3 @@ ;env[TMP] = /tmp ;env[TMPDIR] = /tmp ;env[TEMP] = /tmp ---- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300 -+++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200 -@@ -96,7 +96,7 @@ - var sort_index; - var sort_order; - -- doc_url.value = location.protocol + '//' + location.host + "/status?json&full"; -+ doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full"; - - ths = document.getElementsByTagName("th"); - for (var i=0; i