diff options
| author | Marcus Arendt <[email protected]> | 2014-10-22 09:04:31 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-10-22 09:04:31 +0200 |
| commit | 5a05b11bdbd3434482e10a4c7c18ec6cb80dc01e (patch) | |
| tree | be45a8314f9579237b3d1605a6aa3ace88028da9 /lib | |
| parent | fc56fca051e443afe0274591072dedd09e7a0231 (diff) | |
| parent | 8304aeb0114e61e8f694a58cf9e91a00856c3fe5 (diff) | |
| download | otp-5a05b11bdbd3434482e10a4c7c18ec6cb80dc01e.tar.gz otp-5a05b11bdbd3434482e10a4c7c18ec6cb80dc01e.tar.bz2 otp-5a05b11bdbd3434482e10a4c7c18ec6cb80dc01e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index d152d9f0be..0bbd40d656 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -350,7 +350,7 @@ handle_call(#request{address = Addr} = Request, _, {reply, ok, State0#state{keep_alive = NewKeepAlive, session = NewSession}}; undefined -> - %% Note: tcp-message reciving has already been + %% Note: tcp-message receiving has already been %% activated by handle_pipeline/2. ?hcrd("no current request", []), cancel_timer(Timers#timers.queue_timer, @@ -632,7 +632,7 @@ handle_info({timeout, RequestId}, handle_info(timeout_queue, State = #state{request = undefined}) -> {stop, normal, State}; -%% Timing was such as the pipeline_timout was not canceled! +%% Timing was such as the queue_timeout was not canceled! handle_info(timeout_queue, #state{timers = Timers} = State) -> {noreply, State#state{timers = Timers#timers{queue_timer = undefined}}}; |