aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-02-02 10:35:40 +0100
committerIngela Anderton Andin <[email protected]>2017-02-02 10:35:40 +0100
commit2efa6a87b1045b62a831d61e1826522f1a3dd30f (patch)
tree8b6d75d466a75da744139b733db4696f4a29b2e6 /lib
parent59985655957b44336be6d3842b04c2f1a3642885 (diff)
parentbce374269d6900a86fef9c326b23ca4629ea6297 (diff)
downloadotp-2efa6a87b1045b62a831d61e1826522f1a3dd30f.tar.gz
otp-2efa6a87b1045b62a831d61e1826522f1a3dd30f.tar.bz2
otp-2efa6a87b1045b62a831d61e1826522f1a3dd30f.zip
Merge branch 'ingela/inets/maint/httpd-gracefull-shutdown/OTP-14174' into maint
* ingela/inets/maint/httpd-gracefull-shutdown/OTP-14174: inets: httpd - shutdown gracefully on connection or TLS handshake errors
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/src/http_server/httpd_request_handler.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index 7e20a9ba67..82273c8c74 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -241,9 +241,9 @@ handle_info({tcp_closed, _}, State) ->
handle_info({ssl_closed, _}, State) ->
{stop, normal, State};
handle_info({tcp_error, _, _} = Reason, State) ->
- {stop, Reason, State};
+ {stop, {shutdown, Reason}, State};
handle_info({ssl_error, _, _} = Reason, State) ->
- {stop, Reason, State};
+ {stop, {shutdown, Reason}, State};
%% Timeouts
handle_info(timeout, #state{mfa = {_, parse, _}} = State) ->