aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJohannes Weißl <[email protected]>2013-07-18 22:04:34 +0200
committerJohannes Weißl <[email protected]>2013-09-05 09:29:10 +0200
commit3d893f4b170a43e746d65496e254afd8c4571f14 (patch)
tree2295b2ffddad1835f40de4dc8b24fd076aa35c0f /lib
parent13713794c52e0273dd312823af7a0427d9295574 (diff)
downloadotp-3d893f4b170a43e746d65496e254afd8c4571f14.tar.gz
otp-3d893f4b170a43e746d65496e254afd8c4571f14.tar.bz2
otp-3d893f4b170a43e746d65496e254afd8c4571f14.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.
Diffstat (limited to 'lib')
-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}.