aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-10-22 09:01:48 +0200
committerMarcus Arendt <[email protected]>2014-10-22 09:01:48 +0200
commit8304aeb0114e61e8f694a58cf9e91a00856c3fe5 (patch)
tree09f99dce65ec5e20a32f1ae05d8040c1fda59f14 /lib/inets/src
parent46d93f270b657a546136ed0dca47649e43891d28 (diff)
parent7044e62609df628be6d093264c6cfcfce1a7300e (diff)
downloadotp-8304aeb0114e61e8f694a58cf9e91a00856c3fe5.tar.gz
otp-8304aeb0114e61e8f694a58cf9e91a00856c3fe5.tar.bz2
otp-8304aeb0114e61e8f694a58cf9e91a00856c3fe5.zip
Merge branch 'qrilka/patch-2/typo-fix' into maint
* qrilka/patch-2/typo-fix: Minor misprints correction
Diffstat (limited to 'lib/inets/src')
-rw-r--r--lib/inets/src/http_client/httpc_handler.erl4
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}}};