diff options
| author | Erlang/OTP <[email protected]> | 2017-02-01 18:32:30 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-02-01 18:32:30 +0100 |
| commit | d8a2c0b28bb209e575a13d1a7546b8800bee7c8c (patch) | |
| tree | bea422cb99ef7b6c3d71d09f23c53e738ce731a9 | |
| parent | 5ac71f14c657fde3c01d4f15f1509e7fca6c9c96 (diff) | |
| parent | 7020b4667ffe0b3fe16c2754c0f99a2c2a949590 (diff) | |
| download | otp-d8a2c0b28bb209e575a13d1a7546b8800bee7c8c.tar.gz otp-d8a2c0b28bb209e575a13d1a7546b8800bee7c8c.tar.bz2 otp-d8a2c0b28bb209e575a13d1a7546b8800bee7c8c.zip | |
Merge branch 'ingela/inets/httpd-gracefull-shutdown/OTP-14173' into maint-18
* ingela/inets/httpd-gracefull-shutdown/OTP-14173:
inets: Prepare for release
inets: httpd - shutdown gracefully on connection or TLS handshake errors
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 8fae9ac46e..01686b2596 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -240,9 +240,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) -> diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index a9fbb1c3f7..f568efd488 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,14 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"6.2.4">>, [{load_module, httpd_request_handler, + soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"6.2.4">>, [{load_module, httpd_request_handler, + soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 12ac75a4b9..9f1a2c0ee9 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 6.2.4 +INETS_VSN = 6.2.4.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |