diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-17 09:36:14 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-17 09:36:14 +0100 |
| commit | 1037acb9cba3f88d9dbd318e6f7f75866b5a5fca (patch) | |
| tree | 22d739a2649ecd6895c8876384d890569dbadcb4 /lib | |
| parent | 4c736d27d32b5334d8ba978c100a591caf0ac604 (diff) | |
| parent | 6eba2a32f2585bfd1d94fa1066167901213d0408 (diff) | |
| download | otp-1037acb9cba3f88d9dbd318e6f7f75866b5a5fca.tar.gz otp-1037acb9cba3f88d9dbd318e6f7f75866b5a5fca.tar.bz2 otp-1037acb9cba3f88d9dbd318e6f7f75866b5a5fca.zip | |
Merge branch 'ingela/inets/httpc/ERL-473/OTP-14783' into maint
* ingela/inets/httpc/ERL-473/OTP-14783:
inets: Eliminate race condition
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 16 | ||||
| -rw-r--r-- | lib/inets/src/http_client/httpc_manager.erl | 4 | ||||
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 3 |
3 files changed, 13 insertions, 10 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 6907bf5262..1482f4f922 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -109,7 +109,7 @@ start_link(Parent, Request, Options, ProfileName) -> %% to be called by the httpc manager process. %%-------------------------------------------------------------------- send(Request, Pid) -> - call(Request, Pid, 5000). + call(Request, Pid). %%-------------------------------------------------------------------- @@ -712,12 +712,16 @@ do_handle_info({'EXIT', _, _}, State = #state{request = undefined}) -> do_handle_info({'EXIT', _, _}, State) -> {noreply, State#state{status = close}}. - call(Msg, Pid) -> - call(Msg, Pid, infinity). - -call(Msg, Pid, Timeout) -> - gen_server:call(Pid, Msg, Timeout). + try gen_server:call(Pid, Msg) + catch + exit:{noproc, _} -> + {error, closed}; + exit:{normal, _} -> + {error, closed}; + exit:{{shutdown, _},_} -> + {error, closed} + end. cast(Msg, Pid) -> gen_server:cast(Pid, Msg). diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl index a63864493f..ffdf1603b3 100644 --- a/lib/inets/src/http_client/httpc_manager.erl +++ b/lib/inets/src/http_client/httpc_manager.erl @@ -849,11 +849,11 @@ pipeline_or_keep_alive(#request{id = Id, from = From} = Request, HandlerPid, #state{handler_db = HandlerDb} = State) -> - case (catch httpc_handler:send(Request, HandlerPid)) of + case httpc_handler:send(Request, HandlerPid) of ok -> HandlerInfo = {Id, HandlerPid, From}, ets:insert(HandlerDb, HandlerInfo); - _ -> % timeout pipelining failed + {error, closed} -> % timeout pipelining failed start_handler(Request, State) end. diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index cc166d522e..75b50f3420 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -58,7 +58,7 @@ all() -> groups() -> [ {http, [], real_requests()}, - {sim_http, [], only_simulated()}, + {sim_http, [], only_simulated() ++ [process_leak_on_keepalive]}, {https, [], real_requests()}, {sim_https, [], only_simulated()}, {misc, [], misc()} @@ -119,7 +119,6 @@ only_simulated() -> empty_response_header, remote_socket_close, remote_socket_close_async, - process_leak_on_keepalive, transfer_encoding, transfer_encoding_identity, redirect_loop, |