fpm: add configtest support

[packages/php.git] / php-fpm-config.patch

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 9abc6e658409c7e2f32c7a16fabfdfe56f1a9498..19aa0a50b5defb4818101ef903307fba5ed45d2f 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,24 +1,46 @@
---- php-5.3.14/sapi/fpm/php-fpm.conf.in~       2012-06-13 11:18:44.000000000 +0300
-+++ php-5.3.14/sapi/fpm/php-fpm.conf.in        2012-07-12 15:38:49.056368781 +0300
-@@ -22,7 +22,7 @@
+--- 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/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
-@@ -140,7 +140,7 @@
+ ; 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/fpm.sock
++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 +161,7 @@
+@@ -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
@@ -27,7 +49,7 @@
  
  ; Choose how the process manager will control the number of child processes.
  ; Possible Values:
-@@ -208,12 +208,12 @@
+@@ -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'
@@ -42,7 +64,7 @@
  
  ; The number of seconds after which an idle process will be killed.
  ; Note: Used only when pm is set to 'ondemand'
-@@ -323,7 +323,7 @@
+@@ -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 
@@ -51,7 +73,16 @@
   
  ; 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
-@@ -463,7 +463,7 @@
+@@ -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