Author: glen Date: Thu Nov 26 21:59:11 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- adjust php-fpm config from 5.2 branch
---- Files affected:
packages/php:
php-fpm-config.patch (1.5 -> 1.6) , php.spec (1.825 -> 1.826)
---- Diffs:
================================================================
Index: packages/php/php-fpm-config.patch
diff -u packages/php/php-fpm-config.patch:1.5
packages/php/php-fpm-config.patch:1.6
--- packages/php/php-fpm-config.patch:1.5 Thu Nov 26 22:45:42 2009
+++ packages/php/php-fpm-config.patch Thu Nov 26 22:59:05 2009
@@ -1,27 +1,14 @@
---- php-5.2.6/sapi/cgi/fpm/conf/php-fpm.conf.in 2008-11-16
17:30:12.321010353 +0200
-+++ php-5.2.9/sapi/cgi/fpm/conf/php-fpm.conf.in 2009-06-12
10:24:54.843655130 +0300
+--- 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 @@
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">127.0.0.1:@php_fpm_port@</value>
+ <value
name="listen_address">/var/run/php/fpm.sock</value>
<value name="listen_options">
-@@ -60,10 +60,10 @@
- </value>
-
- 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">
@@ -129,7 +129,7 @@
Useful to work around memory leaks in 3rd party
libraries.
For endless request processing please specify 0
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.825 packages/php/php.spec:1.826
--- packages/php/php.spec:1.825 Thu Nov 26 21:44:57 2009
+++ packages/php/php.spec Thu Nov 26 22:59:05 2009
@@ -136,10 +136,9 @@
Patch38: %{name}-tds.patch
Patch39: %{name}-stupidapache_version.patch
Patch40: %{name}-fpm.patch
-#Patch41: %{name}-fpm-config.patch
-#Patch42: %{name}-fpm-initdir.patch
+Patch41: %{name}-fpm-config.patch
+Patch42: %{name}-fpm-shared.patch
Patch43: %{name}-use-prog_sendmail.patch
-Patch44: %{name}-fpm-shared.patch
Patch47: suhosin.patch
%if %{with type_hints}
Patch50: http://ilia.ws/patch/type_hint_53_v2.txt
@@ -1662,11 +1661,9 @@
%patch39 -p1
%if %{with fpm}
%patch40 -p1
-#%patch41 -p1
-#%patch42 -p1
-%patch44 -p1
+%patch41 -p1
+%patch42 -p1
%endif
-
%patch43 -p1
%if %{with suhosin}
@@ -1886,7 +1883,7 @@
--with-zlib-dir=shared,/usr \
--enable-zip=shared,/usr \
- # safe for debug
+ # save for debug
cp -f Makefile Makefile.$sapi
cp -f main/php_config.h php_config.h.$sapi
cp -f config.log config.log.$sapi
@@ -2831,6 +2828,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.826 2009/11/26 21:59:05 glen
+- adjust php-fpm config from 5.2 branch
+
Revision 1.825 2009/11/26 20:44:57 glen
- fpm patch added
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm-config.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.825&r2=1.826&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
