rediff

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index ad3bf69ef21388267cb4cc4e0c67191bbb78433e..9abc6e658409c7e2f32c7a16fabfdfe56f1a9498 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,5 +1,5 @@
---- php-5.3.9/sapi/fpm/php-fpm.conf.in~        2012-01-11 21:38:12.000000000 +0200
-+++ php-5.3.9/sapi/fpm/php-fpm.conf.in 2012-01-11 21:39:02.535951773 +0200
+--- 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 @@
  ; Pid file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
@@ -8,8 +8,8 @@
 +pid = /var/run/php/fpm.pid
  
  ; Error log file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -93,7 +93,7 @@
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+@@ -140,7 +140,7 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -18,15 +18,15 @@
  
  ; Set listen(2) backlog. A value of '-1' means unlimited.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -105,7 +105,7 @@
+@@ -161,7 +161,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
  
- ; 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
+ ; Choose how the process manager will control the number of child processes.
+ ; Possible Values:
 @@ -208,12 +208,12 @@
  ; The desired minimum number of idle server processes.
  ; Note: Used only when pm is set to 'dynamic'
@@ -42,7 +42,7 @@
  
  ; The number of seconds after which an idle process will be killed.
  ; Note: Used only when pm is set to 'ondemand'
-@@ -214,7 +214,7 @@
+@@ -323,7 +323,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 +51,7 @@
   
  ; 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
-@@ -277,7 +277,7 @@
+@@ -463,7 +463,7 @@
  ; the current environment.
  ; Default Value: clean env
  ;env[HOSTNAME] = $HOSTNAME