aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-11-23 18:09:12 +0100
committerHans Nilsson <[email protected]>2016-11-23 18:09:12 +0100
commitd02c181aa786163b76967c3d5daaf03f0f4795bc (patch)
tree104c2ac5ccae1b96860da5d4604d9d0b84e15bb7 /lib/ssh/src
parentcccc9c72c0c8c83e1418ae8c4fc334b5054683aa (diff)
parentc1d02a053c884b27ed40c21465fe5e4a97cfb43b (diff)
downloadotp-d02c181aa786163b76967c3d5daaf03f0f4795bc.tar.gz
otp-d02c181aa786163b76967c3d5daaf03f0f4795bc.tar.bz2
otp-d02c181aa786163b76967c3d5daaf03f0f4795bc.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_connection.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index d0f2d54c06..1153095135 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -287,6 +287,9 @@ handle_msg(#ssh_msg_channel_open_confirmation{recipient_channel = ChannelId,
ssh_channel:cache_update(Cache, Channel#channel{
remote_id = RemoteId,
+ recv_packet_size = max(32768, % rfc4254/5.2
+ min(PacketSz, Channel#channel.recv_packet_size)
+ ),
send_window_size = WindowSz,
send_packet_size = PacketSz}),
{Reply, Connection} = reply_msg(Channel, Connection0, {open, ChannelId}),