This commit was manufactured by cvs2git to create branch 'lighttpd-1_3_8'.

Sprout from master 2005-02-04 22:16:17 UTC Elan Ruusamäe <glen@pld-linux.org> '- added pathinfo patch'
Cherrypick from master 2005-03-29 20:39:21 UTC deejay1 <deejay1@pld-linux.org> '- -6 option no longer understood':
    lighttpd.sysconfig -> 1.3
Delete:
    lighttpd-sendfile.patch

diff --git a/lighttpd-sendfile.patch b/lighttpd-sendfile.patch
deleted file mode 100644 (file)
index 18be2f0..0000000
--- a/lighttpd-sendfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lighttpd-1.2.2/src/network_backends.h      2004-06-15 17:21:34.000000000 +0000
-+++ lighttpd-1.2.2.new/src/network_backends.h  2004-06-15 20:35:32.767494640 +0000
-@@ -5,7 +5,7 @@
- 
- /* on linux 2.4.x you get either sendfile or LFS */
- #if defined HAVE_SYS_SENDFILE_H && defined HAVE_SENDFILE && (!defined _LARGEFILE_SOURCE || defined HAVE_SENDFILE64) && defined HAVE_WRITEV && defined(__linux__) && !defined HAVE_SENDFILE_BROKEN
--# define USE_LINUX_SENDFILE
-+/* # define USE_LINUX_SENDFILE */
- # include <sys/sendfile.h>
- # include <sys/uio.h>
- #endif

diff --git a/lighttpd.sysconfig b/lighttpd.sysconfig
index df7a72ab72a01a59f3808dc9b0200c63a80bf2d2..aba318870b19da5e98b75f8a834bf7ea789b74d3 100644 (file)
--- a/lighttpd.sysconfig
+++ b/lighttpd.sysconfig
@@ -6,5 +6,5 @@
 # Give it 4096 fd's.
 #SERVICE_LIMITS="$DEFAULT_SERVICE_LIMITS -n 4096"
 
-# use IPv6
-#HTTPD_OPTS="-6"
+# Daemon options, for IPV6 set server.use-ipv6 config variable!
+#HTTPD_OPTS=""