Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Simon Dawson <spdawson@gmail.com>
+[Gustavo: update for 1.4.37]
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-diff -Nurp a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf
---- a/doc/config/conf.d/access_log.conf 2010-07-11 18:01:32.000000000 +0100
-+++ b/doc/config/conf.d/access_log.conf 2012-07-21 19:37:58.453207990 +0100
-@@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" )
+diff -Nura lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf lighttpd-1.4.37/doc/config/conf.d/access_log.conf
+--- lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf 2015-09-01 14:38:48.684673663 -0300
++++ lighttpd-1.4.37/doc/config/conf.d/access_log.conf 2015-09-01 14:38:53.975855142 -0300
+@@ -9,7 +9,7 @@
##
## Default access log.
##
##
## The default format produces CLF compatible output.
-diff -Nurp a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
---- a/doc/config/lighttpd.conf 2011-12-18 12:57:25.000000000 +0000
-+++ b/doc/config/lighttpd.conf 2012-07-21 19:40:45.281200552 +0100
+diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/config/lighttpd.conf
+--- lighttpd-1.4.37.orig/doc/config/lighttpd.conf 2015-09-01 14:38:48.684673663 -0300
++++ lighttpd-1.4.37/doc/config/lighttpd.conf 2015-09-01 14:39:40.256442492 -0300
@@ -13,8 +13,8 @@
## if you add a variable here. Add the corresponding variable in the
## chroot example aswell.
var.state_dir = "/var/run"
var.home_dir = "/var/lib/lighttpd"
var.conf_dir = "/etc/lighttpd"
-@@ -90,7 +90,7 @@ server.port = 80
+@@ -90,7 +90,7 @@
##
## Use IPv6?
##
##
## bind to a specific IP
-@@ -101,8 +101,8 @@ server.use-ipv6 = "enable"
+@@ -101,8 +101,8 @@
## Run as a different username/groupname.
## This requires root permissions during startup.
##
##
## enable core files.
-@@ -112,7 +112,7 @@ server.groupname = "lighttpd"
+@@ -112,7 +112,7 @@
##
## Document root
##
##
## The value for the "Server:" response field.
-@@ -138,7 +138,7 @@ server.pid-file = state_dir + "/lighttpd
+@@ -138,7 +138,7 @@
##
## Path to the error log file
##
##
## If you want to log to syslog you have to unset the
-@@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll"
- ## linux-sendfile - is recommended for small files.
+@@ -188,7 +188,7 @@
+ ## sendfile - is recommended for small files.
## writev - is recommended for sending many large files
##
--server.network-backend = "linux-sendfile"
+-server.network-backend = "sendfile"
+server.network-backend = "writev"
##
## As lighttpd is a single-threaded server, its main resource limit is
-@@ -311,9 +311,9 @@ url.access-deny = ( "~", ".i
+@@ -311,9 +311,9 @@
## disable range requests for pdf files
## workaround for a bug in the Acrobat Reader plugin.
##