diff options
| author | Péter Dimitrov <[email protected]> | 2019-03-08 13:29:30 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-03-08 14:47:32 +0100 |
| commit | bf48c2a3d49f06ecd670ba6b298f5910055aa5aa (patch) | |
| tree | 4f3d8fbb66831c826a6b229df479bd71378eb0be /lib/inets/src | |
| parent | 0ec68a93247ca0ea1d44a2465767dffa4450411a (diff) | |
| download | otp-bf48c2a3d49f06ecd670ba6b298f5910055aa5aa.tar.gz otp-bf48c2a3d49f06ecd670ba6b298f5910055aa5aa.tar.bz2 otp-bf48c2a3d49f06ecd670ba6b298f5910055aa5aa.zip | |
inets: Fix handling of erl_script_timeout
When httpd was started with 'erl_script_timeout', the value of the
option was converted to milliseconds before storage. Subsequent
calls to httpd:info/1 returned the input value multiplied by 1000.
This change fixes the handing of erl_script_timeout by storing the
timeout in seconds and converting it to milliseconds before usage.
Change-Id: Ic308d83b59ad0884e053f096f995754c89adcbf4
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_server/mod_esi.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl index 443b7ee564..f495f12f03 100644 --- a/lib/inets/src/http_server/mod_esi.erl +++ b/lib/inets/src/http_server/mod_esi.erl @@ -33,7 +33,7 @@ -include("httpd_internal.hrl"). -define(VMODULE,"ESI"). --define(DEFAULT_ERL_TIMEOUT,15000). +-define(DEFAULT_ERL_TIMEOUT,15). %%%========================================================================= @@ -174,7 +174,7 @@ store({erl_script_alias, Value}, _) -> {error, {wrong_type, {erl_script_alias, Value}}}; store({erl_script_timeout, TimeoutSec}, _) when is_integer(TimeoutSec) andalso (TimeoutSec >= 0) -> - {ok, {erl_script_timeout, TimeoutSec * 1000}}; + {ok, {erl_script_timeout, TimeoutSec}}; store({erl_script_timeout, Value}, _) -> {error, {wrong_type, {erl_script_timeout, Value}}}; store({erl_script_nocache, Value} = Conf, _) @@ -500,7 +500,7 @@ kill_esi_delivery_process(Pid) -> erl_script_timeout(Db) -> - httpd_util:lookup(Db, erl_script_timeout, ?DEFAULT_ERL_TIMEOUT). + httpd_util:lookup(Db, erl_script_timeout, ?DEFAULT_ERL_TIMEOUT * 1000). script_elements(FuncAndInput, Input) -> case input_type(FuncAndInput) of |