Version=4862

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

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 5f5081f185068c5f420bc57d203fdbdef79429b5..8dd9d97e5d469bf5cc2820c2913fd1f181e13d0f 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,36 +1,53 @@
---- php-5.3.1/sapi/fpm/conf/php-fpm.conf.in~   2009-11-26 23:48:35.000000000 +0200
-+++ php-5.3.1/sapi/fpm/conf/php-fpm.conf.in    2009-11-26 23:49:50.761930204 +0200
-@@ -38,7 +38,7 @@
+--- php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:16:07.304822817 +0300
++++ php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:19:46.991588712 +0300
+@@ -22,7 +22,7 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++pid = /var/run/php/fpm.pid
  
-                       Address to accept fastcgi requests on.
-                       Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
--                      <value name="listen_address">127.0.0.1:@php_fpm_port@</value>
-+                      <value name="listen_address">/var/run/php/fpm.sock</value>
+ ; Error log file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+@@ -93,7 +93,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
  
-                       <value name="listen_options">
+ ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+@@ -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
  
-@@ -129,7 +129,7 @@
-                       Useful to work around memory leaks in 3rd party libraries.
-                       For endless request processing please specify 0
-                       Equivalent to PHP_FCGI_MAX_REQUESTS
--                      <value name="max_requests">500</value>
-+                      <value name="max_requests">100000</value>
+ ; 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
+@@ -159,12 +159,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 = 5
++pm.min_spare_servers = 5
  
-                       Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
-                       Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
-@@ -139,14 +139,7 @@
-                       Pass environment variables like LD_LIBRARY_PATH
-                       All $VARIABLEs are taken from current environment
-                       <value name="environment">
--                              <value name="HOSTNAME">$HOSTNAME</value>
--                              <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
--                              <value name="TMP">/tmp</value>
--                              <value name="TMPDIR">/tmp</value>
--                              <value name="TEMP">/tmp</value>
--                              <value name="OSTYPE">$OSTYPE</value>
--                              <value name="MACHTYPE">$MACHTYPE</value>
--                              <value name="MALLOC_CHECK_">2</value>
-+                              <value name="PATH">$PATH</value>
-                       </value>
- 
-               </section>
+ ; 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 = 35
++pm.max_spare_servers = 35
+  
+ ; The number of requests each child process should execute before respawning.
+ ; This can be useful to work around memory leaks in 3rd party libraries. For
+@@ -277,7 +277,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