summaryrefslogtreecommitdiffstats
path: root/package/uhttpd/files
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-27 00:00:33 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-27 00:00:33 +0000
commit410c95eb98f84c413a839bb2d1d6e9611f3e2d9f (patch)
treeefa53486b6d67774f4641dea35ec97e78744b298 /package/uhttpd/files
parent5823bf90165faee604fbcdc23a53f745009ab763 (diff)
[package] uhttpd:
- make script timeout configurable - catch SIGCHLD to properly interrupt select() - flag listen and client sockets as close-on-exec git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20500 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files')
-rw-r--r--package/uhttpd/files/uhttpd.config20
-rwxr-xr-xpackage/uhttpd/files/uhttpd.init1
2 files changed, 14 insertions, 7 deletions
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config
index 0bca4f516..79b018cf8 100644
--- a/package/uhttpd/files/uhttpd.config
+++ b/package/uhttpd/files/uhttpd.config
@@ -1,6 +1,14 @@
# Server configuration
config uhttpd main
+ # HTTP listen addresses, multiple allowed
+ list listen_http 0.0.0.0:80
+# list listen_http [::]:80
+
+ # HTTPS listen addresses, multiple allowed
+ list listen_https 0.0.0.0:443
+# list listen_https [::]:443
+
# Server document root
option home /www
@@ -19,13 +27,11 @@ config uhttpd main
# option lua_prefix /luci
# option lua_handler /usr/lib/lua/luci/sgi/uhttpd.lua
- # HTTP listen addresses, multiple allowed
- list listen_http 0.0.0.0:80
-# list listen_http [::]:80
-
- # HTTPS listen addresses, multiple allowed
- list listen_https 0.0.0.0:443
-# list listen_https [::]:443
+ # CGI/Lua timeout, if the called script does not
+ # write data within the given amount of seconds,
+ # the server will temrinate the request with
+ # 504 Gateway Timeout response.
+ option script_timeout 60
# 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 a25bf789c..ba7dd49fb 100755
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -65,6 +65,7 @@ start_instance()
append_arg "$cfg" cgi_prefix "-x"
append_arg "$cfg" lua_prefix "-l"
append_arg "$cfg" lua_handler "-L"
+ append_arg "$cfg" script_timeout "-t"
config_list_foreach "$cfg" listen_http \
append_listen_http