aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-11-16 11:55:03 +0100
committerFredrik Gustafsson <[email protected]>2012-11-16 11:55:03 +0100
commit8d0a8ed931deec5a52eaf3e63a1e99a9ed0aeba8 (patch)
treebdd0c3ff342d4311d196ef4e4fd243ce72fa575b /lib/inets/src/inets_app
parentd3ceb8f5194ff323971163d7758bcbbde74cd0ee (diff)
parent9c3a39fa8a5edfaea75226579e28aab49506902c (diff)
downloadotp-8d0a8ed931deec5a52eaf3e63a1e99a9ed0aeba8.tar.gz
otp-8d0a8ed931deec5a52eaf3e63a1e99a9ed0aeba8.tar.bz2
otp-8d0a8ed931deec5a52eaf3e63a1e99a9ed0aeba8.zip
Merge branch 'maint'
* maint: Increased waiting time to check if socket is down Fine adjustments of slowdos alg Changes to slowdos testcase Doc for test case slowdose Bumped version nr Added testcases för minimum_bytes_per_second option Reduced checking of bytes per second to every second Documentation for minimum_bytes_per_seconds option Changed property to minimum_bytes_per_second and checking if is integer on start Changed to Bytes Per Second when checking clients rate, new options {byte_limit, integer()} Option {bit_limit, integer()} to close sockets where clients are too slow
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 2adb2a0fc8..ffd0ed622f 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,8 +18,14 @@
{"%VSN%",
[
+ {"5.9.1",
+ [
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []}
+ ]
+ },
{"5.9",
[
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []},
{load_module, tftp, soft_purge, soft_purge, [inets_service]},
{load_module, inets_service, soft_purge, soft_purge, []},
{load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
@@ -29,6 +35,7 @@
},
{"5.8.1",
[
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []},
{load_module, tftp, soft_purge, soft_purge, [inets_service]},
{load_module, inets_service, soft_purge, soft_purge, []},
@@ -64,8 +71,14 @@
}
],
[
+ {"5.9.1",
+ [
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []}
+ ]
+ },
{"5.9",
[
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []},
{load_module, tftp, soft_purge, soft_purge, [inets_service]},
{load_module, inets_service, soft_purge, soft_purge, []},
{load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
@@ -75,6 +88,7 @@
},
{"5.8.1",
[
+ {load_module, httpd_request_handler, soft_purge, soft_purge, []},
{load_module, tftp, soft_purge, soft_purge, [inets_service]},
{load_module, inets_service, soft_purge, soft_purge, []},