diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-10 14:53:23 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-10 14:53:23 +0200 |
| commit | 02743d4f8df0ddb6ef7f9dc93097e5f62655483b (patch) | |
| tree | ad45b6c0ad322839b41fe53b082c86b0e88db476 /lib/inets/src | |
| parent | ad0e13a4e535a22db786c5f4ae24dfe220b959e4 (diff) | |
| parent | ffc5b4a516aa517bc4ccbb387c612a6bbea52ad4 (diff) | |
| download | otp-02743d4f8df0ddb6ef7f9dc93097e5f62655483b.tar.gz otp-02743d4f8df0ddb6ef7f9dc93097e5f62655483b.tar.bz2 otp-02743d4f8df0ddb6ef7f9dc93097e5f62655483b.zip | |
Merge branch 'weisslj/fix-httpd-timeout-options/OTP-11276' into maint
* weisslj/fix-httpd-timeout-options/OTP-11276:
inets: added testcase for keep_alive_timeout
Add test for httpd config option 'script_timeout'
Fix httpd config option 'script_timeout'
Fix httpd config option 'keep_alive_timeout'
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_server/mod_cgi.erl | 10 |
2 files changed, 7 insertions, 5 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}. diff --git a/lib/inets/src/http_server/mod_cgi.erl b/lib/inets/src/http_server/mod_cgi.erl index f1b73810e6..d933b0a4ba 100644 --- a/lib/inets/src/http_server/mod_cgi.erl +++ b/lib/inets/src/http_server/mod_cgi.erl @@ -131,9 +131,9 @@ store({script_nocache, Value} = Conf, _) {ok, Conf}; store({script_nocache, Value}, _) -> {error, {wrong_type, {script_nocache, Value}}}; -store({script_timeout, Value} = Conf, _) +store({script_timeout, Value}, _) when is_integer(Value), Value >= 0 -> - {ok, Conf}; + {ok, {script_timeout, Value * 1000}}; store({script_timeout, Value}, _) -> {error, {wrong_type, {script_timeout, Value}}}. @@ -238,7 +238,7 @@ send_request_body_to_script(ModData, Port) -> end. deliver_webpage(#mod{config_db = Db} = ModData, Port) -> - Timeout = cgi_timeout(Db), + Timeout = script_timeout(Db), case receive_headers(Port, httpd_cgi, parse_headers, [<<>>, [], []], Timeout) of {Headers, Body} -> @@ -341,8 +341,8 @@ script_elements(#mod{method = "PUT", entity_body = Body}, _) -> script_elements(_, _) -> []. -cgi_timeout(Db) -> - httpd_util:lookup(Db, cgi_timeout, ?DEFAULT_CGI_TIMEOUT). +script_timeout(Db) -> + httpd_util:lookup(Db, script_timeout, ?DEFAULT_CGI_TIMEOUT). %% Convert error to printable string %% |