diff options
author | Hans Nilsson <[email protected]> | 2015-11-26 16:55:33 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-11-26 16:55:33 +0100 |
commit | 3ceb66666d35ccd6ff48fc018a3adc17706fd4cc (patch) | |
tree | 0e188f6d79cc591312f00d1c4999f12a3777f8da /lib/ssh/src/ssh_connect.hrl | |
parent | 3343f288354e751cb08ad2161d4f87da06c9f9cc (diff) | |
parent | a89f1cd881396fc6445b7d790ee2f5b7ae5a6031 (diff) | |
download | otp-3ceb66666d35ccd6ff48fc018a3adc17706fd4cc.tar.gz otp-3ceb66666d35ccd6ff48fc018a3adc17706fd4cc.tar.bz2 otp-3ceb66666d35ccd6ff48fc018a3adc17706fd4cc.zip |
Merge branch 'maint'
* maint:
ssh: sftpd callback takes new option 'recv_window_size', defaults to 1000000
ssh: added 'pending' in recv_window handling and limit sending
Diffstat (limited to 'lib/ssh/src/ssh_connect.hrl')
-rw-r--r-- | lib/ssh/src/ssh_connect.hrl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl index 6db89c5d80..9f9f3de8fa 100644 --- a/lib/ssh/src/ssh_connect.hrl +++ b/lib/ssh/src/ssh_connect.hrl @@ -248,6 +248,9 @@ local_id, %% local channel id recv_window_size, + recv_window_pending = 0, %% Sum of window size updates that has not + %% yet been sent. This limits the number + %% of sent update msgs. recv_packet_size, recv_close = false, |