File 0632-inets-Fix-erl_script_timeout-handling-in-m... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0632-inets-Fix-erl_script_timeout-handling-in-mod_esi.patch of Package erlang (Revision ef2f13a3fd79ccee295941d812fb0579)

Currently displaying revision ef2f13a3fd79ccee295941d812fb0579 , Show latest

From bd4a1417316ae6e313dd1a8a50e34f89f0410a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@users.noreply.github.com>
Date: Sun, 14 Apr 2019 16:33:10 +0200
Subject: [PATCH 1/2] inets: Fix erl_script_timeout handling in mod_esi

---
 lib/inets/src/http_server/mod_esi.erl | 4 ++--
 1 file 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
-- 
2.16.4

Places

File 0632-inets-Fix-erl_script_timeout-handling-in-mod_esi.patch of Package erlang (Revision ef2f13a3fd79ccee295941d812fb0579)

Places