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

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 7a476ea14a..523cf9d38c 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -34,7 +34,8 @@ all() ->
     [
      uri_too_long_414, 
      header_too_long_413, 
-     escaped_url_in_error_body
+     escaped_url_in_error_body,
+     slowdose
     ].
 
 groups() -> 
@@ -278,7 +279,18 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
     inets:stop(httpd, Pid),
     tsp("escaped_url_in_error_body -> done"),    
     ok.
-
+slowdose(doc) ->
+    ["Testing minimum bytes per second option"];
+slowdose(Config) when is_list(Config) ->
+    HttpdConf =   ?config(httpd_conf, Config),
+    {ok, Pid} = inets:start(httpd, [{port, 0}, {minimum_bytes_per_second, 200}|HttpdConf]),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    {ok, Socket} = gen_tcp:connect("localhost", Port, []),
+    receive
+    after 6000 ->
+	    {error, closed} = gen_tcp:send(Socket, "Hey")
+    end.
 find_URL_path([]) ->
     "";
 find_URL_path(["URL", URL | _]) ->