--- 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 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid +pid = /var/run/@processname@.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written ; in a local file. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: log/php-fpm.log -;error_log = log/php-fpm.log +error_log = /var/log/php/@processname@.log ; 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 @@ ; 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 @@ ; 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 @@ ; the current environment. ; Default Value: clean env ;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin +env[PATH] = $PATH ;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