diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-15 19:46:35 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-15 19:46:35 +0000 |
| commit | 3fe0660216685084435ec28804aebab2d0d3a358 (patch) | |
| tree | add83536eb3628963124e90e451ebad16f729ada /package/uhttpd/files | |
| parent | 6e90698fdca225b7d89292ca5102944bc9c6ac02 (diff) | |
| download | upstream-3fe0660216685084435ec28804aebab2d0d3a358.tar.gz upstream-3fe0660216685084435ec28804aebab2d0d3a358.tar.bz2 upstream-3fe0660216685084435ec28804aebab2d0d3a358.zip | |
[package] 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, ...)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20883 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files')
| -rw-r--r-- | package/uhttpd/files/uhttpd.config | 8 | ||||
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 1 |
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 |