From 7096f9228af1cdf98843660560a0d84b48cf766b Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Tue, 17 Nov 2015 15:03:14 +0100 Subject: inets: Remove exit that generates an incorrect internal server error --- lib/inets/src/http_server/mod_esi.erl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/inets/src/http_server/mod_esi.erl') diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl index b9a0797977..6764e2c51e 100644 --- a/lib/inets/src/http_server/mod_esi.erl +++ b/lib/inets/src/http_server/mod_esi.erl @@ -473,13 +473,12 @@ handle_body(Pid, ModData, Body, Timeout, Size, IsDisableChunkedSend) -> {'EXIT', Pid, Reason} when is_pid(Pid) -> ?hdrv("handle_body - exit", [{reason, Reason}]), httpd_response:send_final_chunk(ModData, IsDisableChunkedSend), - exit({mod_esi_linked_process_died, Pid, Reason}) - + done after Timeout -> ?hdrv("handle_body - timeout", []), process_flag(trap_exit,false), httpd_response:send_final_chunk(ModData, IsDisableChunkedSend), - exit({mod_esi_linked_process_timeout, Pid}) + done end. erl_script_timeout(Db) -> -- cgit v1.2.3