aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-05-28 00:52:24 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-05-28 00:52:24 +0000
commit022fa36b40b02248436584cf0f71bb26d79eb644 (patch)
tree8cb1f4d8f1ab4f1aee4538621684a188101c867c /package/uhttpd/files
parent8039a1bbb2056019458b5179108e399d0fcb0622 (diff)
downloadupstream-022fa36b40b02248436584cf0f71bb26d79eb644.tar.gz
upstream-022fa36b40b02248436584cf0f71bb26d79eb644.tar.bz2
upstream-022fa36b40b02248436584cf0f71bb26d79eb644.zip
uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision
SVN-Revision: 31931
Diffstat (limited to 'package/uhttpd/files')
-rw-r--r--package/uhttpd/files/uhttpd.config7
-rwxr-xr-xpackage/uhttpd/files/uhttpd.init1
2 files changed, 7 insertions, 1 deletions
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config
index 08ca5e5e02..b33411e970 100644
--- a/package/uhttpd/files/uhttpd.config
+++ b/package/uhttpd/files/uhttpd.config
@@ -17,6 +17,12 @@ config uhttpd main
# This is a DNS rebinding countermeasure.
option rfc1918_filter 1
+ # Maximum number of concurrent requests.
+ # If this number is exceeded, further requests are
+ # queued until the number of running requests drops
+ # below the limit again.
+ option max_requests 3
+
# Certificate and private key for HTTPS.
# If no listen_https addresses are given,
# the key options are ignored.
@@ -81,4 +87,3 @@ config cert px5g
# Common name
option commonname OpenWrt
-
diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init
index d4037a1b98..379a9f5b5f 100755
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -72,6 +72,7 @@ start_instance()
append_arg "$cfg" tcp_keepalive "-A"
append_arg "$cfg" error_page "-E"
append_arg "$cfg" index_page "-I"
+ append_arg "$cfg" max_requests "-n" 3
append_bool "$cfg" no_symlinks "-S" 0
append_bool "$cfg" no_dirlists "-D" 0