X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-fpm-config.patch;h=8dd9d97e5d469bf5cc2820c2913fd1f181e13d0f;hb=361a916521974f4afb6af725b0efb3f703740cbf;hp=3ab8f694b99a132ee95a3d14d08f3015e9d9a17a;hpb=530d4aa0a355d3a2809d2d5c3a49ee1e78a243ae;p=packages%2Fphp.git

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 3ab8f69..8dd9d97 100644
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,24 +1,53 @@
---- php-5.2.6/sapi/cgi/fpm/conf/php-fpm.conf.in~	2008-11-16 17:28:21.256858344 +0200
-+++ php-5.2.6/sapi/cgi/fpm/conf/php-fpm.conf.in	2008-11-16 17:30:12.321010353 +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:9000</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
  
-@@ -60,10 +60,10 @@
- 			</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
  
- 			Unix user of processes
--		<!--	<value name="user">nobody</value>				-->
-+			<value name="user">http</value>
- 
- 			Unix group of processes
--		<!--	<value name="group">@php_fpm_group@</value>		-->
-+			<value name="group">http</value>
- 
- 			Process manager settings
- 			<value name="pm">
+ ; 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