diff options
| author | Micael Karlberg <[email protected]> | 2010-04-21 13:20:38 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-21 13:20:38 +0000 |
| commit | 91c89d54d45989a85367f10d5902b9b508754a49 (patch) | |
| tree | e3f3a5183766bb4cd11875fe4cfcca811f418b79 /lib/inets/src/http_client/httpc_handler.erl | |
| parent | 08225797f7ef943d0c82a1d9dd6650d94ca2580d (diff) | |
| download | otp-91c89d54d45989a85367f10d5902b9b508754a49.tar.gz otp-91c89d54d45989a85367f10d5902b9b508754a49.tar.bz2 otp-91c89d54d45989a85367f10d5902b9b508754a49.zip | |
OTP-8542: Merge from dev-branch.
Diffstat (limited to 'lib/inets/src/http_client/httpc_handler.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 695ff9cf82..5e79d874fb 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -1424,14 +1424,16 @@ try_to_enable_pipeline_or_keep_alive( State#state{status = close} end. -answer_request(Request, Msg, #state{timers = Timers} = State) -> +answer_request(#request{id = RequestId, from = From} = Request, Msg, + #state{timers = Timers, profile_name = ProfileName} = State) -> ?hcrt("answer request", [{request, Request}]), - httpc_response:send(Request#request.from, Msg), + httpc_response:send(From, Msg), RequestTimers = Timers#timers.request_timers, TimerRef = - proplists:get_value(Request#request.id, RequestTimers, undefined), - Timer = {Request#request.id, TimerRef}, + proplists:get_value(RequestId, RequestTimers, undefined), + Timer = {RequestId, TimerRef}, cancel_timer(TimerRef, {timeout, Request#request.id}), + httpc_manager:request_done(RequestId, ProfileName), State#state{request = Request#request{from = answer_sent}, timers = Timers#timers{request_timers = |