diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-09-11 15:56:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-09-13 15:14:06 +0200 |
| commit | 7d8397a7c9abdee42a1da57ba6b1bbc4b9f6a5c3 (patch) | |
| tree | c217dc3496f20d1df107c8029a418a9c526d5aa7 /lib/inets/src/http_client/httpc_handler.erl | |
| parent | 89f541f6f9d4b90155c2a3b5e81194327810f693 (diff) | |
| download | otp-7d8397a7c9abdee42a1da57ba6b1bbc4b9f6a5c3.tar.gz otp-7d8397a7c9abdee42a1da57ba6b1bbc4b9f6a5c3.tar.bz2 otp-7d8397a7c9abdee42a1da57ba6b1bbc4b9f6a5c3.zip | |
inets: httpc make httpc_cancel_request/[1,2] asynchronous
Diffstat (limited to 'lib/inets/src/http_client/httpc_handler.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 6f45e82eda..80c8b2439e 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -32,7 +32,7 @@ start_link/4, %% connect_and_send/2, send/2, - cancel/3, + cancel/2, stream_next/1, info/1 ]). @@ -117,8 +117,8 @@ send(Request, Pid) -> %% Description: Cancels a request. Intended to be called by the httpc %% manager process. %%-------------------------------------------------------------------- -cancel(RequestId, Pid, From) -> - cast({cancel, RequestId, From}, Pid). +cancel(RequestId, Pid) -> + cast({cancel, RequestId}, Pid). %%-------------------------------------------------------------------- @@ -400,19 +400,17 @@ handle_call(info, _, State) -> %% handle_keep_alive_queue/2 on the other hand will just skip the %% request as if it was never issued as in this case the request will %% not have been sent. -handle_cast({cancel, RequestId, From}, +handle_cast({cancel, RequestId}, #state{request = #request{id = RequestId} = Request, profile_name = ProfileName, canceled = Canceled} = State) -> ?hcrv("cancel current request", [{request_id, RequestId}, {profile, ProfileName}, {canceled, Canceled}]), - httpc_manager:request_canceled(RequestId, ProfileName, From), - ?hcrv("canceled", []), {stop, normal, State#state{canceled = [RequestId | Canceled], request = Request#request{from = answer_sent}}}; -handle_cast({cancel, RequestId, From}, +handle_cast({cancel, RequestId}, #state{profile_name = ProfileName, request = #request{id = CurrId}, canceled = Canceled} = State) -> @@ -420,8 +418,6 @@ handle_cast({cancel, RequestId, From}, {curr_req_id, CurrId}, {profile, ProfileName}, {canceled, Canceled}]), - httpc_manager:request_canceled(RequestId, ProfileName, From), - ?hcrv("canceled", []), {noreply, State#state{canceled = [RequestId | Canceled]}}; handle_cast(stream_next, #state{session = Session} = State) -> |