aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Weißl <[email protected]>2013-07-18 22:04:34 +0200
committerIngela Anderton Andin <[email protected]>2014-02-05 10:32:28 +0100
commit3ec3fcf098df6d0c2895eb11eaeb45d041cbf605 (patch)
tree54e5895e5f5f0b91ac5042b6d838eaadaef6ab7e
parentd6577a26c9c2f2dd7bd26e585f3c9c22314ce1fb (diff)
downloadotp-3ec3fcf098df6d0c2895eb11eaeb45d041cbf605.tar.gz
otp-3ec3fcf098df6d0c2895eb11eaeb45d041cbf605.tar.bz2
otp-3ec3fcf098df6d0c2895eb11eaeb45d041cbf605.zip
Fix httpd config option 'keep_alive_timeout'
The documentation states that the value is in seconds, which was true when using the Apache like configuration file, but not true when using the proplist style configuration.
-rw-r--r--lib/inets/src/http_server/httpd_conf.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index b3ca13e2fe..27446ca7fe 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -798,6 +798,8 @@ store({log_format, LogFormat}, _ConfigList)
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}};
store(ConfigListEntry, _ConfigList) ->
{ok, ConfigListEntry}.