diff options
| author | Péter Dimitrov <[email protected]> | 2018-02-19 16:36:04 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-02-19 16:36:04 +0100 |
| commit | 6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06 (patch) | |
| tree | 00e710bef18144c88479215b603c7e10bbc7c6d6 /lib/inets/src | |
| parent | 65c9c50714d45d8dba31f3e897862b6e2b389d60 (diff) | |
| parent | 91dcab3cf054d43626164a626274f69280792c79 (diff) | |
| download | otp-6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06.tar.gz otp-6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06.tar.bz2 otp-6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06.zip | |
Merge branch 'maint'
* maint:
inets: Prepare for release
inets: Fix httpc crash on keep-alive connections
Change-Id: If066f788c3fcb8b5c5a943892d3c03c201590e40
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 1d569bd2ff..e398b4f0aa 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -711,9 +711,9 @@ do_handle_info({'EXIT', _, _}, State = #state{request = undefined}) -> %% can retry requests in the pipeline. do_handle_info({'EXIT', _, _}, State) -> {noreply, State#state{status = close}}. - + call(Msg, Pid) -> - try gen_server:call(Pid, Msg) + try gen_server:call(Pid, Msg, infinity) catch exit:{noproc, _} -> {error, closed}; diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index fdf4cc6e07..e24a4a8694 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,13 +18,13 @@ %% %CopyrightEnd% {"%VSN%", [ - {<<"6.4.3">>, [{load_module, httpd_esi, + {<<"6.4.5">>, [{load_module, httpc_handler, soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ - {<<"6.4.3">>, [{load_module, httpd_esi, + {<<"6.4.5">>, [{load_module, httpc_handler, soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} |