Bug #170951, use UNIX sockets for fastcgi processes instead of TCP sockets, to fix...

Package-Manager: portage-2.1.2.2

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 06ef95137c99e9b4ffb4e00a1cb81982817bc1ec..8a78fd0673ee4f1f8ac35265210c357b1c71ebd0 100644 (file)
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.105 2007/04/01 22:55:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.106 2007/04/01 23:22:00 robbat2 Exp $
+
+  01 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/conf/mod_fastcgi.conf-1.4.13-r2, lighttpd-1.4.13-r2.ebuild:
+  Bug #170951, use UNIX sockets for fastcgi processes instead of TCP sockets,
+  to fix the cases where the fastcgi processes are not respawned on graceful.
 
 *lighttpd-1.4.13-r2 (01 Apr 2007)
 

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 187726bd669b975b5be41e5fce8934774c8ab18e..c61d065e8b707af9c58c013586d3a5dfd224719c 100644 (file)
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -50,6 +50,10 @@ AUX conf/mod_fastcgi.conf 661 RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b SH
 MD5 b4c80dba9c626d5f89d3c3797ac6670c files/conf/mod_fastcgi.conf 661
 RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b files/conf/mod_fastcgi.conf 661
 SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06 files/conf/mod_fastcgi.conf 661
+AUX conf/mod_fastcgi.conf-1.4.13-r2 687 RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 SHA1 ebb469944098a91772424a825fdd5a0464cef158 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e
+MD5 f3363e39832f1b6678468b482d121afb files/conf/mod_fastcgi.conf-1.4.13-r2 687
+RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 files/conf/mod_fastcgi.conf-1.4.13-r2 687
+SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e files/conf/mod_fastcgi.conf-1.4.13-r2 687
 AUX lighttpd-1.3.10.initd 666 RMD160 b665f80ae5b58bd0c8d42793d28bc40443923605 SHA1 490cc2486fd68d78c81b0d0abf6ef79f9ee06270 SHA256 f4a3170795681ec8101d8048df1e5d23b690b6ca1a1e702722fa1f6c58c59731
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
 RMD160 b665f80ae5b58bd0c8d42793d28bc40443923605 files/lighttpd-1.3.10.initd 666
@@ -113,18 +117,18 @@ EBUILD lighttpd-1.4.13-r1.ebuild 5519 RMD160 41f3035361744de598c73caa5b651b96371
 MD5 9e1b896e9aa7148fd91551c04a7ab5dd lighttpd-1.4.13-r1.ebuild 5519
 RMD160 41f3035361744de598c73caa5b651b96371d5d9a lighttpd-1.4.13-r1.ebuild 5519
 SHA256 27ed9087e0564da202922dfcbe603608203a73d9ccac81dcf7bdc4d06555c56f lighttpd-1.4.13-r1.ebuild 5519
-EBUILD lighttpd-1.4.13-r2.ebuild 5526 RMD160 cc8557dd1bfa7cc0fc1e12e7855505476e5bea5e SHA1 7f66f0a5eb7f1aa9756f1a4aa70611c75e43c45e SHA256 853f6f64c7ab7fdcecdd6c772ee80bbac8ffa75f632b154231d1f72097a6c4fa
-MD5 3bd8730a59271792a6b700f13c93e92b lighttpd-1.4.13-r2.ebuild 5526
-RMD160 cc8557dd1bfa7cc0fc1e12e7855505476e5bea5e lighttpd-1.4.13-r2.ebuild 5526
-SHA256 853f6f64c7ab7fdcecdd6c772ee80bbac8ffa75f632b154231d1f72097a6c4fa lighttpd-1.4.13-r2.ebuild 5526
+EBUILD lighttpd-1.4.13-r2.ebuild 5825 RMD160 c4176fe3decd1a64e52abe331722399c179a22f1 SHA1 a44a710638bde3ea51f8acadc807c8fb3ba4f77c SHA256 7fb69507aa48f4341df7d107a3f08367a6663601129906671734a759b7da8ed2
+MD5 01e21b5552f488d98900af3761f6610b lighttpd-1.4.13-r2.ebuild 5825
+RMD160 c4176fe3decd1a64e52abe331722399c179a22f1 lighttpd-1.4.13-r2.ebuild 5825
+SHA256 7fb69507aa48f4341df7d107a3f08367a6663601129906671734a759b7da8ed2 lighttpd-1.4.13-r2.ebuild 5825
 EBUILD lighttpd-1.4.13.ebuild 5431 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 SHA1 9b04912b6d61737bff174931d7a0ba8b9ef8ec9b SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5
 MD5 cca2c68140d653460de5c5895f3b6d6e lighttpd-1.4.13.ebuild 5431
 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 lighttpd-1.4.13.ebuild 5431
 SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5 lighttpd-1.4.13.ebuild 5431
-MISC ChangeLog 27881 RMD160 b52c5f97f3444a816d308cc85825000969b78b09 SHA1 ea7d200454c1d13e34151505b2eead2b21d320e2 SHA256 6d83656e30aa81b1b1151c219e2ea4a262cb455aeef17809e8a6ccc6d90017c8
-MD5 a8399820670547540e0d08ad539dd2cd ChangeLog 27881
-RMD160 b52c5f97f3444a816d308cc85825000969b78b09 ChangeLog 27881
-SHA256 6d83656e30aa81b1b1151c219e2ea4a262cb455aeef17809e8a6ccc6d90017c8 ChangeLog 27881
+MISC ChangeLog 28160 RMD160 e739cc1f89b5c64995cffe523200113b6307e94d SHA1 d0f856ce8946f6f4fac398ddc8ef7268e466b064 SHA256 1aadf65dff2dbf72bc7502413f186334354313539d01d594603a5769439cfc64
+MD5 e69b014252abf2fa07a9c7f4eae59990 ChangeLog 28160
+RMD160 e739cc1f89b5c64995cffe523200113b6307e94d ChangeLog 28160
+SHA256 1aadf65dff2dbf72bc7502413f186334354313539d01d594603a5769439cfc64 ChangeLog 28160
 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1
 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725
 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725

diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 b/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
new file mode 100644 (file)
index 0000000..ca1369a
--- /dev/null
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
@@ -0,0 +1,17 @@
+###############################################################################
+# mod_fastcgi.conf
+# include'd by lighttpd.conf.
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2,v 1.1 2007/04/01 23:22:00 robbat2 Exp $
+###############################################################################
+
+server.modules += ("mod_fastcgi")
+fastcgi.server = ( ".php" =>
+                           ( "localhost" =>
+                                   (
+                                           "socket"            =>              "/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
+                                           "bin-path"  =>              "/usr/bin/php-cgi"
+                                   )
+                           )
+                   )
+
+# vim: set ft=conf foldmethod=marker et :

diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild
index 6f3c95c4c6b40baa0195c4c2474ff9a8f93e48eb..e898ce1f5e65507da30ba6518ea7f55d39700848 100644 (file)
--- a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild,v 1.1 2007/04/01 22:55:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild,v 1.2 2007/04/01 23:22:00 robbat2 Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -157,7 +157,14 @@ src_install() {
 
        # configs
        insinto /etc/lighttpd
-       doins ${FILESDIR}/conf/*.conf
+       doins ${FILESDIR}/conf/lighttpd.conf
+       doins ${FILESDIR}/conf/mime-types.conf
+       doins ${FILESDIR}/conf/mod_cgi.conf
+       newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
+       # Secure directory for fastcgi sockets
+       keepdir /var/run/lighttpd/
+       fperms 0750 /var/run/lighttpd/
+       fowners lighttpd:lighttpd /var/run/lighttpd/
 
        # update lighttpd.conf directives based on conditionals
        update_config