aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-06-28 16:57:51 +0200
committerHans Nilsson <[email protected]>2016-06-29 12:47:00 +0200
commit50aa639c4c3398c40fdce514e45ce687aa189189 (patch)
tree7c111f6dcd1d939950b40798d2931cb1fb815ba0 /lib
parent698b11ec4a4f9944ea66ace7bacb17535f6cb9ee (diff)
downloadotp-50aa639c4c3398c40fdce514e45ce687aa189189.tar.gz
otp-50aa639c4c3398c40fdce514e45ce687aa189189.tar.bz2
otp-50aa639c4c3398c40fdce514e45ce687aa189189.zip
ssh: Remove possible hanging in TCs when server and client is on the same node
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index f825f0fae2..5e05188e7f 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1206,8 +1206,9 @@ handle_event(internal, prepare_next_packet, _, D) ->
Sz when Sz >= Enough ->
self() ! {D#data.transport_protocol, D#data.socket, <<>>};
_ ->
- inet:setopts(D#data.socket, [{active, once}])
+ ok
end,
+ inet:setopts(D#data.socket, [{active, once}]),
keep_state_and_data;
handle_event(info, {CloseTag,Socket}, StateName,