aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-06-05 14:38:57 +0200
committerZandra Hird <[email protected]>2015-06-05 14:38:57 +0200
commitdf9965c331a173045658d5a00f0349170262bd5f (patch)
tree14443fb136ab65fbec34df298b03c5589101a5d7
parentd541405a28878ad94b8e92d8cc32f6376a9cd058 (diff)
parentf2bd95331c0e116f54429094af4d3fe24764b474 (diff)
downloadotp-df9965c331a173045658d5a00f0349170262bd5f.tar.gz
otp-df9965c331a173045658d5a00f0349170262bd5f.tar.bz2
otp-df9965c331a173045658d5a00f0349170262bd5f.zip
Merge branch 'scrapinghub/proper_stop_on_handling_keepalive_queue'
* scrapinghub/proper_stop_on_handling_keepalive_queue: inets: proper stop for httpc_handler K-A queue failure OTP-12803
-rw-r--r--lib/inets/src/http_client/httpc_handler.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index f4f0c37570..9d832ef18b 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1330,7 +1330,7 @@ handle_keep_alive_queue(#state{status = keep_alive,
Session, <<>>,
State#state{keep_alive = KeepAlive});
{error, Reason} ->
- {stop, shutdown, {keepalive_failed, Reason}, State}
+ {stop, {shutdown, {keepalive_failed, Reason}}, State}
end
end
end.