diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-05-28 00:52:24 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-05-28 00:52:24 +0000 |
| commit | 6e9f473afab16887ae0f3d455d8649278ba7410a (patch) | |
| tree | 4d207828bf9f50659136b8e931995b9689fc8a4b /package/uhttpd/files | |
| parent | 026245749a40e2d94006df8933b93ade9bfa652e (diff) | |
| download | upstream-6e9f473afab16887ae0f3d455d8649278ba7410a.tar.gz upstream-6e9f473afab16887ae0f3d455d8649278ba7410a.tar.bz2 upstream-6e9f473afab16887ae0f3d455d8649278ba7410a.zip | |
[package] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31931 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files')
| -rw-r--r-- | package/uhttpd/files/uhttpd.config | 7 | ||||
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 1 |
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 |