diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-27 00:00:33 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-27 00:00:33 +0000 |
| commit | 8c9b818a24045c15f40fc415cd1dde78c438555a (patch) | |
| tree | a4f379b54fac4e4d63352eabd506927395f8c19f /package/uhttpd/files | |
| parent | d7195c229316346aae4ba5617c20308863a855c5 (diff) | |
| download | upstream-8c9b818a24045c15f40fc415cd1dde78c438555a.tar.gz upstream-8c9b818a24045c15f40fc415cd1dde78c438555a.tar.bz2 upstream-8c9b818a24045c15f40fc415cd1dde78c438555a.zip | |
uhttpd: - make script timeout configurable - catch SIGCHLD to properly interrupt select() - flag listen and client sockets as close-on-exec
SVN-Revision: 20500
Diffstat (limited to 'package/uhttpd/files')
| -rw-r--r-- | package/uhttpd/files/uhttpd.config | 20 | ||||
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 1 |
2 files changed, 14 insertions, 7 deletions
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config index 0bca4f516b..79b018cf80 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 a25bf789cb..ba7dd49fbd 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 |