aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-04-15 19:46:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-04-15 19:46:35 +0000
commit20ef055c2f698618142a280d5cbc010acacfd651 (patch)
tree3df03f974bf03b35e3f32dbbfed7385272c2d975 /package/uhttpd/files
parenta8e20318c5fdb6809892e31cd658d2eda4a9ee2d (diff)
downloadupstream-20ef055c2f698618142a280d5cbc010acacfd651.tar.gz
upstream-20ef055c2f698618142a280d5cbc010acacfd651.tar.bz2
upstream-20ef055c2f698618142a280d5cbc010acacfd651.zip
uhttpd: - make network timeout configurable, increase default to 30 seconds (#7067) - follow symlinks in docroot and add option to disable that - fix mimetype detection for files with combined extensions (.tar.gz, ...)
SVN-Revision: 20883
Diffstat (limited to 'package/uhttpd/files')
-rw-r--r--package/uhttpd/files/uhttpd.config8
-rwxr-xr-xpackage/uhttpd/files/uhttpd.init1
2 files changed, 8 insertions, 1 deletions
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config
index 79b018cf80..acdd62ea4e 100644
--- a/package/uhttpd/files/uhttpd.config
+++ b/package/uhttpd/files/uhttpd.config
@@ -29,10 +29,16 @@ config uhttpd main
# CGI/Lua timeout, if the called script does not
# write data within the given amount of seconds,
- # the server will temrinate the request with
+ # the server will terminate the request with
# 504 Gateway Timeout response.
option script_timeout 60
+ # Network timeout, if the current connection is
+ # blocked for the specified amount of seconds,
+ # the server will terminate the associated
+ # request process.
+ option network_timeout 30
+
# Basic auth realm, defaults to local hostname
# option realm OpenWrt
diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init
index 4b747a0da1..14f8fc4c46 100755
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -58,6 +58,7 @@ start_instance()
append_arg "$cfg" lua_prefix "-l"
append_arg "$cfg" lua_handler "-L"
append_arg "$cfg" script_timeout "-t"
+ append_arg "$cfg" network_timeout "-T"
config_get http "$cfg" listen_http
for listen in $http; do