diff options
| author | Péter Dimitrov <[email protected]> | 2019-04-14 16:33:10 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-04-14 16:33:10 +0200 |
| commit | bd4a1417316ae6e313dd1a8a50e34f89f0410a4b (patch) | |
| tree | d902690de30b95afe4c49f1cd0ed467169a74249 /lib/inets | |
| parent | 7ad05d6dd4230061e8120ae8c0dec2535f47e294 (diff) | |
| download | otp-bd4a1417316ae6e313dd1a8a50e34f89f0410a4b.tar.gz otp-bd4a1417316ae6e313dd1a8a50e34f89f0410a4b.tar.bz2 otp-bd4a1417316ae6e313dd1a8a50e34f89f0410a4b.zip | |
inets: Fix erl_script_timeout handling in mod_esi
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/src/http_server/mod_esi.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl index f495f12f03..8cbd9798e6 100644 --- a/lib/inets/src/http_server/mod_esi.erl +++ b/lib/inets/src/http_server/mod_esi.erl @@ -119,7 +119,7 @@ load("EvalScriptAlias " ++ EvalScriptAlias, []) -> load("ErlScriptTimeout " ++ Timeout, [])-> case catch list_to_integer(string:strip(Timeout)) of TimeoutSec when is_integer(TimeoutSec) -> - {ok, [], {erl_script_timeout, TimeoutSec * 1000}}; + {ok, [], {erl_script_timeout, TimeoutSec}}; _ -> {error, ?NICE(string:strip(Timeout) ++ " is an invalid ErlScriptTimeout")} @@ -500,7 +500,7 @@ kill_esi_delivery_process(Pid) -> erl_script_timeout(Db) -> - httpd_util:lookup(Db, erl_script_timeout, ?DEFAULT_ERL_TIMEOUT * 1000). + httpd_util:lookup(Db, erl_script_timeout, ?DEFAULT_ERL_TIMEOUT) * 1000. script_elements(FuncAndInput, Input) -> case input_type(FuncAndInput) of |