Revision bump; added a sleu of upstream patches to fix various issues.

(Portage version: 2.1_pre4-r1)

19 files changed, 582 insertions, 20 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index a90f7f3d503f..50d1555d38a9 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.58 2006/02/13 15:24:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.59 2006/02/26 01:07:37 ka0ttic Exp $
+
+*lighttpd-1.4.10-r1 (26 Feb 2006)
+
+  26 Feb 2006; Aaron Walker <ka0ttic@gentoo.org>
+  +files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff,
+  +files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff,
+  +files/1.4.10/07_all_r998_sendfile_fixes.diff,
+  +files/1.4.10/02_all_r991_posix_fadvise.diff,
+  +files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff,
+  +files/1.4.10/05_all_r996_fallback_to_madvise.diff,
+  +files/1.4.10/06_all_r997_fastcgi_fixes.diff,
+  +files/1.4.10/08_all_r999_mod_cgi_terminate.diff,
+  +files/1.4.10/09_all_r1000_sendfile_compile_fix.diff,
+  +files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff,
+  +files/1.4.10/11_all_r1002_var_and_env_docs.diff,
+  +files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff,
+  +files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff,
+  +files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff,
+  -lighttpd-1.4.10.ebuild, +lighttpd-1.4.10-r1.ebuild:
+  Revision bump; added a sleu of upstream patches to fix various issues.
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   lighttpd-1.4.7.ebuild, lighttpd-1.4.8.ebuild, lighttpd-1.4.10.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a7b18d90482c..fd905231312d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,38 +1,126 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6b263b9b0e04a2198606453bad840ff0 ChangeLog 17593
+MD5 720eaf60bb999a80154752fe7d6804bf ChangeLog 18596
+RMD160 53a5c18a4d896755945284c0a7ccf1b1fdd06cb0 ChangeLog 18596
+SHA256 c73cdecf2f67775aadfbfe0bf32b6f3e092198ff3b24496e0711f635b97cc161 ChangeLog 18596
+MD5 24669453e8f69faf4212dfa43e90e3dd files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
+RMD160 b0e9a693102fb2ea4e6cf750cd4559f9c25a7834 files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
+SHA256 9f3d49f04b3b8423b06f0ddf35cce855c2187d3f0a84f22479aa5df871901144 files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
+MD5 8c00894c801011ca682400a243aa49cb files/1.4.10/02_all_r991_posix_fadvise.diff 805
+RMD160 6f2ba5d23afdfa278a6ec4c029854f364ce4fcf6 files/1.4.10/02_all_r991_posix_fadvise.diff 805
+SHA256 9caad21c610639f126c254889385082ee6a29a2e7a18984c28a6e071c320743d files/1.4.10/02_all_r991_posix_fadvise.diff 805
+MD5 f9b6a2f0c377777945de48d3e7bdda40 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
+RMD160 d2e6a53db17fd7c8cdafb663b393b89f2ecb1c58 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
+SHA256 638d717b103b310210c8b877659b9a56342b2270e34c8942fb305c1a2d273f08 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
+MD5 1ce159021271dc6c03e84e21032d15c9 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
+RMD160 8e422d379c6ba14db1be2a49683b83bdd4c3e7d6 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
+SHA256 1482946f20939f617755ec027e289c911bc5d60fb3831dd2890a55bda181f7c0 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
+MD5 ef9e93d6cc81bf924c310a13ad50b502 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
+RMD160 6e331a668217b8ed5d8172e24f1ecc9bb969fd45 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
+SHA256 16d790a26eb45f77ef133ae4531b272b019dd43151e6286e9271dfbdb54705c0 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
+MD5 7560c24162dd46b8230920a083e9f0f6 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
+RMD160 226f8cada01629b34757cd37c5f42c7600afb093 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
+SHA256 5160cfafb11ad3eb64d3187cd8910b3fc17543b9543d84fc7dc80f9b09f53053 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
+MD5 120f0a70f526ae2194d51230616e1f25 files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
+RMD160 db1fe250c625318ace5a261d33192708ca30f0dd files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
+SHA256 3fb53ae049e299bfe949349c9ef4e0d45d0d9c3fe5073d978b6f76ed157256da files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
+MD5 b415f237f75a8ccb090c9c574ede05fd files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
+RMD160 b33973b8be7040f40e01b0a58ff79dc80c3e3517 files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
+SHA256 344f2b835952d7387d75d8ff73bb5f5478749201b546503d0ba0f3ef8fe12957 files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
+MD5 335e847b375359b7fbc01bfbeddcdd87 files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
+RMD160 988329fcc0b05447c31082becdc8f5c2c4e2597f files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
+SHA256 dbc0710c111e5274300ed0ef3217324eb281c1433c9b70c8a1fec3737dcd5b9e files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
+MD5 c41a7ca766ed3228360da359d913d137 files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
+RMD160 d47c60dea227f037bc03ea0579fef2898cb77c3a files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
+SHA256 29c7cc730123d8959761fcc08b53dd542e22d3e09b203512ad4af63ab98c3af0 files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
+MD5 1df4960f248d3a9bdf8c0df9e870cf83 files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
+RMD160 b0f26a7495ad602606da0e6f2b4cf07601679866 files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
+SHA256 2b3169d46d2793061ce0451e18bd55e46c429f951b26d93a6ac973c2deb4f87f files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
+MD5 35434778a8946f35db7f1de508e9d671 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
+RMD160 9e592ae9127f61bd2d379463b846b12d41e48c87 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
+SHA256 203ef9efa0ae11226c871962eb0f7fc6b16d3789c1714accdda8197b8b9d39c6 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
+MD5 3ee9e11b239661b01e45c56381c49d7d files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
+RMD160 fa2e223ef49682a3c881e794e88169d416798dae files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
+SHA256 996efc5821728c7d9da0f47fef64189bb1638f4ebac57e6f004e54dfbabab25d files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
+MD5 60758dff6ef226aeaf6673361e62a097 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
+RMD160 1fb2b16fd8c37849ef24c0ae6510b20508cf79f6 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
+SHA256 3285c1e6c948e7b01c14d4f17d7ad7641a016493299cef8c24489ac1057c4b20 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
 MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182
+RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 files/conf/lighttpd.conf 8182
+SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd files/conf/lighttpd.conf 8182
 MD5 fef397e7bcf1b741dea211a555e1803c files/conf/mime-types.conf 3291
+RMD160 157c9a6f7d00e52c7d4118edcce8d1eb1e0a3c20 files/conf/mime-types.conf 3291
+SHA256 575231104d51fa1882c47021ab0aa00d615401059a6748d64453cb39aafba537 files/conf/mime-types.conf 3291
 MD5 9c1407e95f62ed22da66c4ef5f69c3b5 files/conf/mod_cgi.conf 869
+RMD160 1d447bad36822657d014990128891cbdb6169468 files/conf/mod_cgi.conf 869
+SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf files/conf/mod_cgi.conf 869
 MD5 b4c80dba9c626d5f89d3c3797ac6670c files/conf/mod_fastcgi.conf 661
+RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b files/conf/mod_fastcgi.conf 661
+SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06 files/conf/mod_fastcgi.conf 661
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
+RMD160 326221d3cb81ea0d7214db0ce968142abea2f78f files/digest-lighttpd-1.3.13-r3 67
+SHA256 455ca66be0f20c44a6966f6724ca82a7198e791c4e5631f333d397ded79a0dce files/digest-lighttpd-1.3.13-r3 67
 MD5 c54a6d92e91493bbb27e8f346f6ac342 files/digest-lighttpd-1.3.16 67
-MD5 fbb756d6c64761e56f0c676a996ef9b4 files/digest-lighttpd-1.4.10 67
+RMD160 225bb2c6bbc9f6064dc695384d3d964b7bc73d8c files/digest-lighttpd-1.3.16 67
+SHA256 0ea2d4682dbdb6965b5b66b1ef395eb36569ef1260f5077af08ae07096d8cb04 files/digest-lighttpd-1.3.16 67
+MD5 03f615e79bba7ff75a6ba9a3e486fec4 files/digest-lighttpd-1.4.10-r1 247
+RMD160 29eb75dc48a62eaaebe7eaa6552e779f19386b1f files/digest-lighttpd-1.4.10-r1 247
+SHA256 0363ec995df0e4b7ffbfa4c4625cb9753311c6f9f7f831925600b0b33dd6df18 files/digest-lighttpd-1.4.10-r1 247
 MD5 422bbab47d465847a64bdb2c2ebcc02d files/digest-lighttpd-1.4.7 66
+RMD160 b8174cc2d8579513075a36fa4124a55e66e186bc files/digest-lighttpd-1.4.7 66
+SHA256 e8cb8cfff25a4c72a24a0077958a2e96da192f0f1f359a09009c9c3b436860b1 files/digest-lighttpd-1.4.7 66
 MD5 b56de1ec97859b70fc860de8468e3984 files/digest-lighttpd-1.4.8 66
+RMD160 9287301206003247c2925e8b52fe576592a1bb0a files/digest-lighttpd-1.4.8 66
+SHA256 6b700175f7ca1b1bea1c1af312b2a7c1ddb8d7731ba3df54ee3118b86aa970f4 files/digest-lighttpd-1.4.8 66
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
+RMD160 b665f80ae5b58bd0c8d42793d28bc40443923605 files/lighttpd-1.3.10.initd 666
+SHA256 f4a3170795681ec8101d8048df1e5d23b690b6ca1a1e702722fa1f6c58c59731 files/lighttpd-1.3.10.initd 666
 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
+RMD160 562fa1c98657afebbdededa9071aabbbc7ce973e files/lighttpd-1.3.11-gentoo.diff 1784
+SHA256 e383430afcd4bc2b055a395664e78428320d2b2d8069f0e5f65c1bef1034417f files/lighttpd-1.3.11-gentoo.diff 1784
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
+RMD160 622033a88ca606872d68bfedb31a251b8655e7e1 files/lighttpd-1.3.13-ldap-binddn.diff 3863
+SHA256 bce55b1d770f1f9002019257a941bd6dabf1f1fb002d9e686b1bbecffaaf2066 files/lighttpd-1.3.13-ldap-binddn.diff 3863
 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
+RMD160 976b9081a6eae177cf5db7f2856d589100bb2206 files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
+SHA256 d3930366baef28f58907aced7568e795e0ac89d6da0311dbb090b9c80da046ca files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
 MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
+RMD160 7a6fcef66f998299ffaedc07a3f21bbf34ec11a1 files/lighttpd-1.3.13-pam-name.diff 564
+SHA256 c48a0181245099d7ade669a6abe3f4d3b1397a030778e30ad925c6621ab78b10 files/lighttpd-1.3.13-pam-name.diff 564
 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
+RMD160 521ac2e131f1c68c69e717902ef2f161d4f24f99 files/lighttpd-1.3.13-php.diff 1399
+SHA256 a9914671982a96c098be8d48120e2f85f3db9cd20c6ab3ea567f6b388238a1bb files/lighttpd-1.3.13-php.diff 1399
 MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762
+RMD160 7292b2a76b80e45e7a03e6be3a34e9c7e4a2a4bc files/lighttpd-1.3.13-valid-user.diff 762
+SHA256 f4d7215ed521ac64bb4f9ff38e015ae95a0e7a1b0065016298f19998b03bd386 files/lighttpd-1.3.13-valid-user.diff 762
 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
+RMD160 a5aa32b80a01a8fd84aaf46430c7e9a79e7548cd files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
+SHA256 74922ac4a490b53f362e662f190c6e7338424265d9900e15592a5aabbdfd988c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
 MD5 f7a395058ddefb2432637f782db0f9fe files/lighttpd.initd 1006
+RMD160 f2d092f789de44670911b8947871406d17f2a806 files/lighttpd.initd 1006
+SHA256 db39687cda85b95b5c01702b80f6581c011067bed79f7a30d8779ff5571e8375 files/lighttpd.initd 1006
 MD5 210f81ad7867965b19993d0a4d8d54e7 files/lighttpd.logrotate 488
+RMD160 fb98001642263663726609fd863b07a274278e4d files/lighttpd.logrotate 488
+SHA256 a9e82f62b2ba86300cc884a3b18dc5195470ec3e9123684418743ad48b8cc8fd files/lighttpd.logrotate 488
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
+RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 files/spawn-fcgi.confd 1076
+SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768 files/spawn-fcgi.confd 1076
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
+RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 files/spawn-fcgi.initd 1383
+SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6 files/spawn-fcgi.initd 1383
 MD5 49ded22216ffc6092d1a1e04a6e420c1 lighttpd-1.3.13-r3.ebuild 2607
+RMD160 a6e0d913e94cf2ee41c22826a92d0b38c87c319e lighttpd-1.3.13-r3.ebuild 2607
+SHA256 d2d37a8b2a2f7441fdb4975154cd4d0c37e561db26811709160ea155e564cbe7 lighttpd-1.3.13-r3.ebuild 2607
 MD5 21c52e6883435f851e46d8e229eb46ad lighttpd-1.3.16.ebuild 2545
-MD5 27da889c3872f4dd8d1d9607c86b82ab lighttpd-1.4.10.ebuild 5161
+RMD160 b38563e9ea9caec25d88476cf00b4915e34cb8f7 lighttpd-1.3.16.ebuild 2545
+SHA256 bc56e550b1a3691f8c3a3b4f788455317f772ab540bd2017ff48cbed9d1df14d lighttpd-1.3.16.ebuild 2545
+MD5 77bd695f05fc24a16e2620c5805292a3 lighttpd-1.4.10-r1.ebuild 5139
+RMD160 9375eead86208ce2ba658d8ff466f0af8d5674c6 lighttpd-1.4.10-r1.ebuild 5139
+SHA256 60f56ca2ac6b8f172fc031895994e3c021fe2ef5a5cae4ae51bcc9b5f71d45a0 lighttpd-1.4.10-r1.ebuild 5139
 MD5 409c3573899a53281837a5bcb1bb1813 lighttpd-1.4.7.ebuild 5153
+RMD160 605b1403f4d5f6fe1ce708837a81a0a890a79aeb lighttpd-1.4.7.ebuild 5153
+SHA256 e6a228737feaca20eefa06f147d59cea5f9935f54790af3dfe7d09a4264cfdac lighttpd-1.4.7.ebuild 5153
 MD5 b0faa2cea78724fc0910eff8b6823484 lighttpd-1.4.8.ebuild 5160
+RMD160 2723f500312948b71d0aa341070e4e10786ef168 lighttpd-1.4.8.ebuild 5160
+SHA256 959cce5be5a7c371e76b7193d63f9431f384336fa381a7021b90d40c56dfac41 lighttpd-1.4.8.ebuild 5160
 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD8KS3tG5z4I8BtQoRAqDnAKCEKQdpJFuUOPT6hFwDWQRv/8qR9wCdFLQk
-BUagtnn0+cKvaLdjBsMsDFw=
-=wrY+
------END PGP SIGNATURE-----
+RMD160 a4e58899dbe2a328fe699a564a67666809b385fc metadata.xml 726
+SHA256 c99edd41b36c5354a29c2fa2e37fccd83568d306d1531f0ce7bbaebf703f2a56 metadata.xml 726
diff --git a/www-servers/lighttpd/files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff b/www-servers/lighttpd/files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff
new file mode 100644
index 000000000000..4a704d1f7067
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff
@@ -0,0 +1,15 @@
+Modified: branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-08 13:40:25 UTC (rev 989)
++++ branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-08 23:10:03 UTC (rev 990)
+@@ -3425,9 +3425,7 @@
+ 
+ 	fn = uri_path_handler ? con->uri.path : con->physical.path;
+ 
+-	if (fn->used == 0) {
+-		return HANDLER_ERROR;
+-	}
++	if (buffer_is_empty(fn)) return HANDLER_GO_ON;
+ 	
+ 	s_len = fn->used - 1;
+ 	
diff --git a/www-servers/lighttpd/files/1.4.10/02_all_r991_posix_fadvise.diff b/www-servers/lighttpd/files/1.4.10/02_all_r991_posix_fadvise.diff
new file mode 100644
index 000000000000..c0b4c5b6be5c
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/02_all_r991_posix_fadvise.diff
@@ -0,0 +1,17 @@
+Modified: branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-08 23:10:03 UTC (rev 990)
++++ branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-09 14:37:48 UTC (rev 991)
+@@ -159,8 +159,10 @@
+ #ifdef HAVE_POSIX_FADVISE
+ 				/* tell the kernel that we want to stream the file */
+ 				if (-1 == posix_fadvise(c->file.fd, 0, 0, POSIX_FADV_SEQUENTIAL)) {
+-					log_error_write(srv, __FILE__, __LINE__, "ssd", 
+-						"posix_fadvise failed:", strerror(errno), c->file.fd);
++					if (ENOSYS != errno) {
++						log_error_write(srv, __FILE__, __LINE__, "ssd", 
++							"posix_fadvise failed:", strerror(errno), c->file.fd);
++					}
+ 				}
+ #endif
+ 			}
diff --git a/www-servers/lighttpd/files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff b/www-servers/lighttpd/files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff
new file mode 100644
index 000000000000..66474c3df269
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff
@@ -0,0 +1,14 @@
+Modified: branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-09 14:37:48 UTC (rev 991)
++++ branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-13 19:22:00 UTC (rev 992)
+@@ -23,6 +23,9 @@
+ #include "log.h"
+ #include "stat_cache.h"
+ 
++/* on linux 2.4.29 + debian/ubuntu we have crashes if this is enabled */
++#undef HAVE_POSIX_FADVISE
++
+ int network_write_chunkqueue_linuxsendfile(server *srv, connection *con, int fd, chunkqueue *cq) {
+ 	chunk *c;
+ 	size_t chunks_written = 0;
diff --git a/www-servers/lighttpd/files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff b/www-servers/lighttpd/files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff
new file mode 100644
index 000000000000..91716734aba8
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff
@@ -0,0 +1,14 @@
+Modified: branches/lighttpd-merge-1.4.x/configure.in
+===================================================================
+--- branches/lighttpd-merge-1.4.x/configure.in	2006-02-14 16:09:23 UTC (rev 993)
++++ branches/lighttpd-merge-1.4.x/configure.in	2006-02-14 16:10:14 UTC (rev 994)
+@@ -439,9 +439,6 @@
+         * ) ;;
+ esac
+ 
+-dnl posix_* needs _XOPEN_SOURCE=600
+-CFLAGS="${CFLAGS} -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
+-
+ AC_CHECK_FUNCS([dup2 getcwd inet_ntoa inet_ntop memset mmap munmap strchr \
+ 		  strdup strerror strstr strtol sendfile  getopt socket \
+ 		  gethostbyname poll sigtimedwait epoll_ctl getrlimit chroot \
diff --git a/www-servers/lighttpd/files/1.4.10/05_all_r996_fallback_to_madvise.diff b/www-servers/lighttpd/files/1.4.10/05_all_r996_fallback_to_madvise.diff
new file mode 100644
index 000000000000..de347aa6e2e7
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/05_all_r996_fallback_to_madvise.diff
@@ -0,0 +1,21 @@
+Modified: branches/lighttpd-merge-1.4.x/src/network_writev.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/network_writev.c	2006-02-14 16:10:54 UTC (rev 995)
++++ branches/lighttpd-merge-1.4.x/src/network_writev.c	2006-02-14 23:49:38 UTC (rev 996)
+@@ -255,14 +255,14 @@
+ #ifdef LOCAL_BUFFERING
+ 				buffer_copy_string_len(c->mem, c->file.mmap.start, c->file.mmap.length);
+ #else
+-#ifdef HAVE_POSIX_MADVISE
++#ifdef HAVE_MADVISE
+ 				/* don't advise files < 64Kb */
+ 				if (c->file.mmap.length > (64 KByte)) {
+ 					/* darwin 7 is returning EINVAL all the time and I don't know how to 
+ 					 * detect this at runtime.i
+ 					 *
+ 					 * ignore the return value for now */
+-					posix_madvise(c->file.mmap.start, c->file.mmap.length, POSIX_MADV_WILLNEED);
++					madvise(c->file.mmap.start, c->file.mmap.length, MADV_WILLNEED);
+ 				}
+ #endif
+ #endif
diff --git a/www-servers/lighttpd/files/1.4.10/06_all_r997_fastcgi_fixes.diff b/www-servers/lighttpd/files/1.4.10/06_all_r997_fastcgi_fixes.diff
new file mode 100644
index 000000000000..9031600ba5cc
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/06_all_r997_fastcgi_fixes.diff
@@ -0,0 +1,71 @@
+Modified: branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-14 23:49:38 UTC (rev 996)
++++ branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-14 23:51:52 UTC (rev 997)
+@@ -406,8 +406,10 @@
+ int fastcgi_status_copy_procname(buffer *b, fcgi_extension_host *host, fcgi_proc *proc) {
+ 	buffer_copy_string(b, "fastcgi.backend.");
+ 	buffer_append_string_buffer(b, host->id);
+-	buffer_append_string(b, ".");
+-	buffer_append_long(b, proc->id);
++	if (proc) {
++		buffer_append_string(b, ".");
++		buffer_append_long(b, proc->id);
++	}
+ 
+ 	return 0;
+ }
+@@ -426,6 +428,15 @@
+ 
+ #undef CLEAN	
+ 
++#define CLEAN(x) \
++	fastcgi_status_copy_procname(b, host, NULL); \
++	buffer_append_string(b, x); \
++	status_counter_set(srv, CONST_BUF_LEN(b), 0);
++
++	CLEAN(".load");
++
++#undef CLEAN	
++
+ 	return 0;
+ }
+ 
+@@ -872,7 +883,8 @@
+ 		pid_t child;
+ 		int val;
+ 		
+-		if (!buffer_is_empty(proc->socket)) {
++		if (errno != ENOENT && 
++		    !buffer_is_empty(proc->socket)) {
+ 			unlink(proc->socket->ptr);
+ 		}
+ 		
+@@ -1535,7 +1547,7 @@
+ 				hctx->proc->pid, hctx->proc->socket);
+ 	}
+ 
+-	if (hctx->proc) {	
++	if (hctx->proc && hctx->got_proc) {	
+ 		hctx->proc->load--;
+ 		fcgi_proclist_sort_down(srv, hctx->host, hctx->proc);
+ 	}
+@@ -2919,11 +2931,18 @@
+ 
+ 		status_counter_inc(srv, CONST_BUF_LEN(p->statuskey));
+ 
++		/* the proc-load */
+ 		fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc);
+ 		buffer_append_string(p->statuskey, ".load");
+ 
+ 		status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->proc->load);
+ 
++		/* the host-load */
++		fastcgi_status_copy_procname(p->statuskey, hctx->host, NULL);
++		buffer_append_string(p->statuskey, ".load");
++
++		status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->host->load);
++
+ 		if (p->conf.debug) {
+ 			log_error_write(srv, __FILE__, __LINE__, "sddbdd",
+ 					"got proc:", 
diff --git a/www-servers/lighttpd/files/1.4.10/07_all_r998_sendfile_fixes.diff b/www-servers/lighttpd/files/1.4.10/07_all_r998_sendfile_fixes.diff
new file mode 100644
index 000000000000..625fd8e331c8
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/07_all_r998_sendfile_fixes.diff
@@ -0,0 +1,59 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.4.10.orig/src/network_linux_sendfile.c lighttpd-1.4.10/src/network_linux_sendfile.c
+--- lighttpd-1.4.10.orig/src/network_linux_sendfile.c	2006-02-25 01:07:01.000000000 -0500
++++ lighttpd-1.4.10/src/network_linux_sendfile.c	2006-02-25 01:08:55.000000000 -0500
+@@ -132,23 +132,11 @@
+ 			size_t toSend;
+ 			stat_cache_entry *sce = NULL;
+ 			
+-			if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
+-				log_error_write(srv, __FILE__, __LINE__, "sb",
+-						strerror(errno), c->file.name);
+-				return -1;
+-			}
+-			
+ 			offset = c->file.start + c->offset;
+ 			/* limit the toSend to 2^31-1 bytes in a chunk */
+ 			toSend = c->file.length - c->offset > ((1 << 30) - 1) ? 
+ 				((1 << 30) - 1) : c->file.length - c->offset;
+ 				
+-			if (offset > sce->st.st_size) {
+-				log_error_write(srv, __FILE__, __LINE__, "sb", "file was shrinked:", c->file.name);
+-				
+-				return -1;
+-			}
+-		
+ 			/* open file if not already opened */	
+ 			if (-1 == c->file.fd) {
+ 				if (-1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
+@@ -170,8 +158,6 @@
+ #endif
+ 			}
+ 
+-			
+-			/* Linux sendfile() */
+ 			if (-1 == (r = sendfile(fd, c->file.fd, &offset, toSend))) {
+ 				switch (errno) {
+ 				case EAGAIN:
+@@ -189,7 +175,21 @@
+ 			}
+ 
+ 			if (r == 0) {
+-				/* we got a event to write put we couldn't. remote side closed ? */
++				/* We got an event to write but we wrote nothing
++				 *
++				 * - the file shrinked -> error
++				 * - the remote side closed inbetween -> remote-close */
++	
++				if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
++					/* file is gone ? */
++					return -1;
++				}
++
++				if (abs_offset > sce->st.st_size) {
++					/* file shrinked, close the connection */
++					return -1;
++				}
++
+ 				return -2;
+ 			}
+ 
diff --git a/www-servers/lighttpd/files/1.4.10/08_all_r999_mod_cgi_terminate.diff b/www-servers/lighttpd/files/1.4.10/08_all_r999_mod_cgi_terminate.diff
new file mode 100644
index 000000000000..efd42dbe7f70
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/08_all_r999_mod_cgi_terminate.diff
@@ -0,0 +1,13 @@
+Modified: branches/lighttpd-merge-1.4.x/src/mod_cgi.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-15 10:46:17 UTC (rev 998)
++++ branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-15 15:19:10 UTC (rev 999)
+@@ -1128,7 +1128,7 @@
+ 	plugin_data *p = p_d;
+ 	buffer *fn = con->physical.path;
+ 	
+-	if (fn->used == 0) return HANDLER_ERROR;
++	if (fn->used == 0) return HANDLER_GO_ON;
+ 	
+ 	mod_cgi_patch_connection(srv, con, p);
+ 	
diff --git a/www-servers/lighttpd/files/1.4.10/09_all_r1000_sendfile_compile_fix.diff b/www-servers/lighttpd/files/1.4.10/09_all_r1000_sendfile_compile_fix.diff
new file mode 100644
index 000000000000..c4437947aa8f
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/09_all_r1000_sendfile_compile_fix.diff
@@ -0,0 +1,13 @@
+Modified: branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-15 15:19:10 UTC (rev 999)
++++ branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-15 18:09:01 UTC (rev 1000)
+@@ -185,7 +185,7 @@
+ 					return -1;
+ 				}
+ 
+-				if (abs_offset > sce->st.st_size) {
++				if (offset > sce->st.st_size) {
+ 					/* file shrinked, close the connection */
+ 					return -1;
+ 				}
diff --git a/www-servers/lighttpd/files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff b/www-servers/lighttpd/files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff
new file mode 100644
index 000000000000..5a129519830c
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff
@@ -0,0 +1,75 @@
+Modified: branches/lighttpd-merge-1.4.x/src/mod_auth.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/mod_auth.c	2006-02-15 18:09:01 UTC (rev 1000)
++++ branches/lighttpd-merge-1.4.x/src/mod_auth.c	2006-02-15 18:10:05 UTC (rev 1001)
+@@ -399,9 +399,10 @@
+ 			const char *method, *realm, *require;
+ 			
+ 			if (da->value->data[n]->type != TYPE_ARRAY) {
+-				log_error_write(srv, __FILE__, __LINE__, "sssbs", 
+-						"unexpected type for key: ", "auth.require", "[", da->value->data[n]->key, "](string)");
+-				
++				log_error_write(srv, __FILE__, __LINE__, "ss", 
++						"auth.require should contain an array as in:", 
++						"auth.require = ( \"...\" => ( ..., ...) )");
++
+ 				return HANDLER_ERROR;
+ 			}
+ 					
+@@ -416,34 +417,51 @@
+ 					} else if (0 == strcmp(da_file->value->data[m]->key->ptr, "require")) {
+ 						require = ((data_string *)(da_file->value->data[m]))->value->ptr;
+ 					} else {
+-						log_error_write(srv, __FILE__, __LINE__, "sssbs", "unexpected type for key: ", "auth.require", "[", da_file->value->data[m]->key, "](string)");
++						log_error_write(srv, __FILE__, __LINE__, "ssbs", 
++							"the field is unknown in:", 
++							"auth.require = ( \"...\" => ( ..., -> \"",
++							da_file->value->data[m]->key,
++							"\" <- => \"...\" ) )");
++
+ 						return HANDLER_ERROR;
+ 					}
+ 				} else {
+-					log_error_write(srv, __FILE__, __LINE__, "sssbs", "unexpected type for key: ", "auth.require", "[", da_file->value->data[m]->key, "](string)");
++					log_error_write(srv, __FILE__, __LINE__, "ssbs", 
++						"a string was expected for:", 
++						"auth.require = ( \"...\" => ( ..., -> \"",
++						da_file->value->data[m]->key,
++						"\" <- => \"...\" ) )");
+ 					
+ 					return HANDLER_ERROR;
+ 				}
+ 			}
+ 					
+ 			if (method == NULL) {
+-				log_error_write(srv, __FILE__, __LINE__, "sssss", "missing entry for key: ", "auth.require", "[", "method", "](string)");
++				log_error_write(srv, __FILE__, __LINE__, "ss", 
++						"the require field is missing in:", 
++						"auth.require = ( \"...\" => ( ..., \"method\" => \"...\" ) )");
+ 				return HANDLER_ERROR;
+ 			} else {
+ 				if (0 != strcmp(method, "basic") &&
+ 				    0 != strcmp(method, "digest")) {
+-					log_error_write(srv, __FILE__, __LINE__, "s", "auth.require->method has to be either 'basic' or 'digest'");
++					log_error_write(srv, __FILE__, __LINE__, "ss",
++							"method has to be either \"basic\" or \"digest\" in",
++							"auth.require = ( \"...\" => ( ..., \"method\" => \"...\") )");
+ 					return HANDLER_ERROR;
+ 				}
+ 			}
+ 			
+ 			if (realm == NULL) {
+-				log_error_write(srv, __FILE__, __LINE__, "sssss", "missing entry for key: ", "auth.require", "[", "realm", "](string)");
++				log_error_write(srv, __FILE__, __LINE__, "ss", 
++						"the require field is missing in:", 
++						"auth.require = ( \"...\" => ( ..., \"realm\" => \"...\" ) )");
+ 				return HANDLER_ERROR;
+ 			}
+ 			
+ 			if (require == NULL) {
+-				log_error_write(srv, __FILE__, __LINE__, "sssss", "missing entry for key: ", "auth.require", "[", "require", "](string)");
++				log_error_write(srv, __FILE__, __LINE__, "ss", 
++						"the require field is missing in:", 
++						"auth.require = ( \"...\" => ( ..., \"require\" => \"...\" ) )");
+ 				return HANDLER_ERROR;
+ 			}
diff --git a/www-servers/lighttpd/files/1.4.10/11_all_r1002_var_and_env_docs.diff b/www-servers/lighttpd/files/1.4.10/11_all_r1002_var_and_env_docs.diff
new file mode 100644
index 000000000000..dba023cf2f49
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/11_all_r1002_var_and_env_docs.diff
@@ -0,0 +1,52 @@
+Modified: branches/lighttpd-merge-1.4.x/doc/configuration.txt
+===================================================================
+--- branches/lighttpd-merge-1.4.x/doc/configuration.txt	2006-02-15 18:10:05 UTC (rev 1001)
++++ branches/lighttpd-merge-1.4.x/doc/configuration.txt	2006-02-16 11:17:39 UTC (rev 1002)
+@@ -162,8 +162,46 @@
+     }
+   }  
+ 
++Using variables
++===============
++
++You can set your own variables in the configuration to simplify your config.
++::
++
++  var.basedir = "/home/www/servers/"
++  $HTTP["host"] == "www.example.org" {
++     server.name = "www.example.org"
++     include "incl-base.conf"
++  }
++
++  in incl-base.conf:
++  server.document-root = basedir + server.name + "/pages/"
++  accesslog.filename   = basedir + server.name + "/logs/access.log"
++   
++You can also use environement variables or the default variables var.PID and
++var.CWD: ::
++
++  var.basedir = env.LIGHTTPDBASE
++
++  $HTTP["host"] == "www.example.org" {
++     server.name = "www.example.org"
++     include "incl-base.conf"
++     include "incl-fastcgi.conf"
++  }
++
++  in incl-fastcgi.conf:
++  fastcgi.server = ( ... => ((
++     "socket" => basedir + server.name + "/tmp/fastcgi-" + PID + ".sock"
++  )) )
++
++Or like the lighttpd script for rails does:
++
++  var.basedir = var.CWD
++
++  server.document-root = basedir + "/public/"
++
+ Global context
+-=========================
++==============
+ 
+ ::
+ 
diff --git a/www-servers/lighttpd/files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff b/www-servers/lighttpd/files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff
new file mode 100644
index 000000000000..790716173c06
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff
@@ -0,0 +1,13 @@
+Modified: branches/lighttpd-merge-1.4.x/doc/fastcgi.txt
+===================================================================
+--- branches/lighttpd-merge-1.4.x/doc/fastcgi.txt	2006-02-16 11:17:39 UTC (rev 1002)
++++ branches/lighttpd-merge-1.4.x/doc/fastcgi.txt	2006-02-16 15:04:09 UTC (rev 1003)
+@@ -77,7 +77,7 @@
+   FastCGI module. Currently only 0 and 1 are used. Use 1 to 
+   enable some debug output, 0 to disable it.
+ 
+-fastcgi.max-extensions 
++fastcgi.map-extensions 
+   map multiple extensions to the same fastcgi server
+ 
+   Example: ::
diff --git a/www-servers/lighttpd/files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff b/www-servers/lighttpd/files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff
new file mode 100644
index 000000000000..f6f397774b23
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff
@@ -0,0 +1,62 @@
+Modified: branches/lighttpd-merge-1.4.x/src/mod_cgi.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-22 12:50:56 UTC (rev 1005)
++++ branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-22 13:16:47 UTC (rev 1006)
+@@ -809,8 +809,12 @@
+ 			cgi_env_add(&env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
+ 		}
+ 		cgi_env_add(&env, CONST_STR_LEN("REDIRECT_STATUS"), CONST_STR_LEN("200"));
+-		cgi_env_add(&env, CONST_STR_LEN("QUERY_STRING"), CONST_BUF_LEN(con->uri.query));
+-		cgi_env_add(&env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri));
++		if (!buffer_is_empty(con->uri.query)) {
++			cgi_env_add(&env, CONST_STR_LEN("QUERY_STRING"), CONST_BUF_LEN(con->uri.query));
++		}
++		if (!buffer_is_empty(con->request.orig_uri)) {
++			cgi_env_add(&env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri));
++		}
+ 		
+ 		
+ #ifdef HAVE_IPV6
+@@ -967,6 +971,9 @@
+ 	default: {
+ 		handler_ctx *hctx;
+ 		/* father */
++
++		close(from_cgi_fds[1]);
++		close(to_cgi_fds[0]);
+ 		
+ 		if (con->request.content_length) {
+ 			chunkqueue *cq = con->request_content_queue;
+@@ -987,6 +994,8 @@
+ 						    -1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
+ 							log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
+ 					
++							close(from_cgi_fds[0]);
++							close(to_cgi_fds[1]);
+ 							return -1;
+ 						}
+ 
+@@ -996,6 +1005,8 @@
+ 							log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ", 
+ 									strerror(errno), c->file.name,  c->file.fd);
+ 
++							close(from_cgi_fds[0]);
++							close(to_cgi_fds[1]);
+ 							return -1;
+ 						}
+ 
+@@ -1043,12 +1054,9 @@
+ 				chunkqueue_remove_finished_chunks(cq);
+ 			}
+ 		}
+-		
+-		close(from_cgi_fds[1]);
+-		
+-		close(to_cgi_fds[0]);
++
+ 		close(to_cgi_fds[1]);
+-		
++				
+ 		/* register PID and wait for them asyncronously */
+ 		con->mode = p->id;
+ 		buffer_reset(con->physical.path);
diff --git a/www-servers/lighttpd/files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff b/www-servers/lighttpd/files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff
new file mode 100644
index 000000000000..3faa2765ac89
--- /dev/null
+++ b/www-servers/lighttpd/files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff
@@ -0,0 +1,15 @@
+Modified: branches/lighttpd-merge-1.4.x/src/mod_alias.c
+===================================================================
+--- branches/lighttpd-merge-1.4.x/src/mod_alias.c	2006-02-22 13:16:47 UTC (rev 1006)
++++ branches/lighttpd-merge-1.4.x/src/mod_alias.c	2006-02-24 11:57:26 UTC (rev 1007)
+@@ -166,7 +166,9 @@
+ 		if (alias_len > uri_len) continue;
+ 		if (ds->key->used == 0) continue;
+ 		
+-		if (0 == strncmp(uri_ptr, ds->key->ptr, alias_len)) {
++		if (0 == (con->conf.force_lowercase_filenames ?
++					strncastcmp(uri_ptr, ds->key->ptr, alias_len) :
++					strncmp(uri_ptr, ds->key->ptr, alias_len))) {
+ 			/* matched */
+ 			
+ 			buffer_copy_string_buffer(con->physical.basedir, ds->value);
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.10 b/www-servers/lighttpd/files/digest-lighttpd-1.4.10
deleted file mode 100644
index a7ff2258d4ba..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51e42c2cc98a1f9986b9f232ff5a01f2 lighttpd-1.4.10.tar.gz 777853
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
new file mode 100644
index 000000000000..a30cb8a2393a
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
@@ -0,0 +1,3 @@
+MD5 51e42c2cc98a1f9986b9f232ff5a01f2 lighttpd-1.4.10.tar.gz 777853
+RMD160 e7d1eeab33a0cb47eeed7f9499c894fd2aea5445 lighttpd-1.4.10.tar.gz 777853
+SHA256 fdde0c08d3e1883c04ddc97a22916b063b2679f5fcfbda81436ff4e85db18160 lighttpd-1.4.10.tar.gz 777853
diff --git a/www-servers/lighttpd/lighttpd-1.4.10.ebuild b/www-servers/lighttpd/lighttpd-1.4.10-r1.ebuild
index 5d4563915f4b..718367a14688 100644
--- a/www-servers/lighttpd/lighttpd-1.4.10.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.10.ebuild,v 1.2 2006/02/13 15:24:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.10-r1.ebuild,v 1.1 2006/02/26 01:07:37 ka0ttic Exp $
 
 inherit eutils depend.php
 
@@ -95,7 +95,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-#    EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
+	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
 
 #    einfo "Regenerating autoconf/automake files"
 #    libtoolize --copy --force || die "libtoolize failed"
@@ -171,13 +171,11 @@ src_install() {
 	use minimal && remove_non_essential
 }
 
-pkg_preinst() {
+pkg_postinst () {
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-}
 
-pkg_postinst () {
 	echo
 	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
 		einfo "spawn-fcgi is now included with lighttpd"