diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-17 15:03:14 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-27 16:21:32 +0100 |
| commit | 7096f9228af1cdf98843660560a0d84b48cf766b (patch) | |
| tree | 1cc6f66235c88c5cd0cbe103d5d76c8ba53e55e3 | |
| parent | 0bb72a96b95e856b4d4e12f6fb7ae73118259aba (diff) | |
| download | otp-7096f9228af1cdf98843660560a0d84b48cf766b.tar.gz otp-7096f9228af1cdf98843660560a0d84b48cf766b.tar.bz2 otp-7096f9228af1cdf98843660560a0d84b48cf766b.zip | |
inets: Remove exit that generates an incorrect internal server error
| -rw-r--r-- | lib/inets/src/http_server/mod_esi.erl | 5 |
1 files changed, 2 insertions, 3 deletions
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) -> |