aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-11-23 18:08:30 +0100
committerHans Nilsson <[email protected]>2016-11-23 18:08:30 +0100
commitc1d02a053c884b27ed40c21465fe5e4a97cfb43b (patch)
treec7ac110ecc97808a633239a1d9b0010ed61f94aa /lib/ssh/src
parentbdf77bb94906b34a9afd4dc9c2161e77512ac9e7 (diff)
parent3a519b7b74ae07f4d66989313a0c065c96bcad8c (diff)
downloadotp-c1d02a053c884b27ed40c21465fe5e4a97cfb43b.tar.gz
otp-c1d02a053c884b27ed40c21465fe5e4a97cfb43b.tar.bz2
otp-c1d02a053c884b27ed40c21465fe5e4a97cfb43b.zip
Merge branch 'hans/ssh/max_packetsize_sftp/OTP-13857' into 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}),