make user screwup less likely - bug #259007

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 16 insertions, 9 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 4f7b5ecfe9a3..15e26577ff16 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/lighttpd
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.197 2009/04/03 20:59:34 bangert Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.198 2009/05/12 09:54:13 bangert Exp $
+
+  12 May 2009; Thilo Bangert <bangert@gentoo.org> files/conf/lighttpd.conf:
+  make user screwup less likely - bug #259007
 
   03 Apr 2009; Thilo Bangert <bangert@gentoo.org>
   files/conf/mod_fastcgi.conf, files/lighttpd.initd:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 497ec19e678e..e60c36b80b6c 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -3,7 +3,7 @@ AUX 1.4.19-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a
 AUX 1.4.19-r2/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff 465 RMD160 570e27715c359c75459d7c967b67ca8c7c15972d SHA1 65558d8eb54e1a722c9e1983e1ab126a8466497a SHA256 81051f76e57f54ab6158300799be0351b68c4fa86d632b423268f35f41bbd0c1
 AUX 1.4.19-r2/07_all_lighttpd-1.4.19-closing_foreign_ssl_connections-dos-taketwo.diff 2948 RMD160 7cc3d41c227d7eb12204d353eec208fb9456a2b8 SHA1 0475987b269c229400b7e4527fdb98827114ae04 SHA256 3f2edba70fd5fd06e19657c14dc7b314cdec7c54bef96587ee5b50662c26c025
 AUX 1.4.20/03_all_lighttpd-1.4.11-errorlog-pipe.diff 4931 RMD160 7653167b0cd3fde6cb7d3d6fe4ae30a8d2e56ebe SHA1 bd0ff91b5caf447f78bcad66a444fbe3719897fb SHA256 2b1a253dda1dbc688ac072608656121f8c2d346a64be1080c65f2ca1d81f8e2d
-AUX conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 SHA1 16922786a79807fa3233d1af105a99582d3486a5 SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd
+AUX conf/lighttpd.conf 8243 RMD160 0b99dbb49be34521ddda14abd9b06cef141bbfc9 SHA1 8fd27dd9b5aea94ca0d1611c8fb1d9e3cb720d0b SHA256 3c016c663d14bf1cb8bf1c7d87dc0ecc1fb4f189ebd4fb05e90ed23f20439ed5
 AUX conf/mime-types.conf 3350 RMD160 ca82154e69af26b1d9de9757d5bcbe69eb428dcb SHA1 f7b7c19a90629b6598a1c4769592628fa582dd34 SHA256 8bbab2136c71878fbca5ad8d45838a99fd278037406049a3cca5f47d81309100
 AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
 AUX conf/mod_fastcgi.conf 677 RMD160 4403ca232cfcfc51d1d71529be9903bf4123451e SHA1 2b4a3d35215ba8824b5eca943156b373479f1a45 SHA256 954bf2a030e268e7cd880d4cd7d6c13317c09e0ec4e87a8d7d887fb4e7dc83bd
@@ -18,5 +18,5 @@ DIST lighttpd-1.4.19.tar.bz2 610347 RMD160 8731ba3efc95659a16dbb11b7298e3b539ab3
 DIST lighttpd-1.4.20.tar.bz2 618018 RMD160 0fcc71d6063574da86b610c9bdc16b7e44f9d2e7 SHA1 e5944a40579e0f37c6a0eeb0ad751344b2d6006c SHA256 3cda2ce779f24948062f765f2630b5865e483f5fab7149681a2a25422fd61176
 EBUILD lighttpd-1.4.19-r2.ebuild 5839 RMD160 0947b4c115cc5ecbc0ec67aa4b077b70c1714d09 SHA1 9ccbbb41364d162b09e52134cbc47c72f731ffdc SHA256 373f9b64c41abce5d09af55a16218ab34ac44bedc4cc6019d034d20865db4ac4
 EBUILD lighttpd-1.4.20.ebuild 5960 RMD160 19f74751b53e92f9876c0015b0fc850733c20021 SHA1 4de12f3cba5ef21bf55a16e4b5a9ca2ab64d1816 SHA256 45c275d895a00370c905b0aa37ebdba46872930034843bb0375fdfa1c0f78f72
-MISC ChangeLog 45775 RMD160 debfb492054058ddfbc73250fa4fc14fb87b7174 SHA1 26252a2642ec0a319947f3b1dcf179ea8e290b2f SHA256 2b5960f02cbd823b8fcd271ca5e4e15b4495ef22c7be6d662c780cae50ff0c07
+MISC ChangeLog 45898 RMD160 139d1fec19955ab3fecfc7c2641a860aa312a625 SHA1 6d02ab86099de0a6869fc07ca57123fd16b74d9f SHA256 2a6bf00c63c6d61422922402be432ad408770778f461e7daf7184f8be77aacfb
 MISC metadata.xml 927 RMD160 3d969f099d1bb8df70ec5f8ed78a83ad27d2b10d SHA1 1e564c4fc4edb8a4b2dc41f731071ec38e917027 SHA256 479db26201c5c934fd5fb5deccd8712a637114d5cde6e75da8ce9ad4872ec070
diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf
index 778a4062b6f7..b56fa4d00a80 100644
--- a/www-servers/lighttpd/files/conf/lighttpd.conf
+++ b/www-servers/lighttpd/files/conf/lighttpd.conf
@@ -1,6 +1,6 @@
 ###############################################################################
 # Default lighttpd.conf for Gentoo.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/lighttpd.conf,v 1.3 2005/09/01 14:22:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/lighttpd.conf,v 1.4 2009/05/12 09:54:12 bangert Exp $
 ###############################################################################
 
 # {{{ variables
@@ -40,10 +40,7 @@ server.modules = (
 
 # {{{ includes
 include "mime-types.conf"
-# uncomment for cgi support
-#   include "mod_cgi.conf"
-# uncomment for php/fastcgi support
-#   include "mod_fastcgi.conf"
+# fcgi and cgi are included below 
 # }}}
 
 # {{{ server settings
@@ -318,4 +315,11 @@ url.access-deny = ("~", ".inc")
 # debug.log-file-not-found   = "enable"
 # }}}
 
+# {{{ cgi includes
+# uncomment for cgi support
+#   include "mod_cgi.conf"
+# uncomment for php/fastcgi support
+#   include "mod_fastcgi.conf"
+# }}}
+
 # vim: set ft=conf foldmethod=marker et :