diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-10 14:53:35 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-10 14:53:35 +0200 |
| commit | 5e1f01cea37a483327d68a76ef4b01af4a78f359 (patch) | |
| tree | c69e798917cc736ae97c1c55d0f0e4009b00f62b /lib/inets/src/http_server/httpd_conf.erl | |
| parent | f166e4e4e6ae34e5760c572cd22ecfca80e22724 (diff) | |
| parent | 02743d4f8df0ddb6ef7f9dc93097e5f62655483b (diff) | |
| download | otp-5e1f01cea37a483327d68a76ef4b01af4a78f359.tar.gz otp-5e1f01cea37a483327d68a76ef4b01af4a78f359.tar.bz2 otp-5e1f01cea37a483327d68a76ef4b01af4a78f359.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/inets/src/http_server/httpd_conf.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 2 |
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}. |