diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-01-28 10:23:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-01-30 10:57:32 +0100 |
| commit | a0a7d8d312ca1ce329bce1432638096a13a9c52f (patch) | |
| tree | 6009f89882310a22c224313987445ada8fea912d /lib/inets/src/http_server | |
| parent | 5c7e03e0b34d73aa35f882ffb3e02176282274c4 (diff) | |
| download | otp-a0a7d8d312ca1ce329bce1432638096a13a9c52f.tar.gz otp-a0a7d8d312ca1ce329bce1432638096a13a9c52f.tar.bz2 otp-a0a7d8d312ca1ce329bce1432638096a13a9c52f.zip | |
inets: Consistent view of configuration parameter keep_alive_timeout
Diffstat (limited to 'lib/inets/src/http_server')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index fa639b0a1c..55698d5c78 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -337,7 +337,7 @@ load("MaxKeepAliveRequest " ++ MaxRequests, []) -> load("KeepAliveTimeout " ++ Timeout, []) -> case make_integer(Timeout) of {ok, Integer} -> - {ok, [], {keep_alive_timeout, Integer*1000}}; + {ok, [], {keep_alive_timeout, Integer}}; {error, _} -> {error, ?NICE(clean(Timeout)++" is an invalid KeepAliveTimeout")} end; @@ -805,7 +805,7 @@ store({server_tokens, ServerTokens} = Entry, _ConfigList) -> Server = server(ServerTokens), {ok, [Entry, {server, Server}]}; store({keep_alive_timeout, KeepAliveTimeout}, _ConfigList) -> - {ok, {keep_alive_timeout, KeepAliveTimeout * 1000}}; + {ok, {keep_alive_timeout, KeepAliveTimeout}}; store(ConfigListEntry, _ConfigList) -> {ok, ConfigListEntry}. diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 89ccec52cc..f7a9fe5d49 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -96,8 +96,9 @@ init([Manager, ConfigDB, AcceptTimeout]) -> proc_lib:init_ack({ok, self()}), {SocketType, Socket} = await_socket_ownership_transfer(AcceptTimeout), - - KeepAliveTimeOut = httpd_util:lookup(ConfigDB, keep_alive_timeout, 150000), + + %%Timeout value is in seconds we want it in milliseconds + KeepAliveTimeOut = 1000 * httpd_util:lookup(ConfigDB, keep_alive_timeout, 150), case http_transport:negotiate(SocketType, Socket, ?HANDSHAKE_TIMEOUT) of {error, _Error} -> |