aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-12-20 17:35:48 +0100
committerMicael Karlberg <[email protected]>2012-12-20 17:35:48 +0100
commit9e513ce3356d5afd33cc9e4c73b06838cda08093 (patch)
treea36de5ad204832b1b6a75dd2107adfd80b74075a /lib
parent7b637f6dfec03236b6a4318265944a7ecbd43ec8 (diff)
parent28512aab97941282d24100b23d48eccaa75d7ea1 (diff)
downloadotp-9e513ce3356d5afd33cc9e4c73b06838cda08093.tar.gz
otp-9e513ce3356d5afd33cc9e4c73b06838cda08093.tar.bz2
otp-9e513ce3356d5afd33cc9e4c73b06838cda08093.zip
Merge branch 'master' of super:otp
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_netconfc.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 11c8235040..1ccbc86d8f 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1073,7 +1073,8 @@ handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) ->
SimpleXml = encode_rpc_operation(get,[Filter]),
do_send_rpc(Op, SimpleXml, Timeout, From, State).
-handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) ->
+handle_msg({ssh_cm, CM, {data, Ch, _Type, Data}}, State) ->
+ ssh_connection:adjust_window(CM,Ch,size(Data)),
handle_data(Data, State);
handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) ->
%% _SshCloseMsg can probably be one of
@@ -1805,7 +1806,8 @@ get_tag([]) ->
%%% SSH stuff
ssh_receive_data() ->
receive
- {ssh_cm, _CM, {data, _Ch, _Type, Data}} ->
+ {ssh_cm, CM, {data, Ch, _Type, Data}} ->
+ ssh_connection:adjust_window(CM,Ch,size(Data)),
{ok, Data};
{ssh_cm, _CM, {Closed, _Ch}} = X when Closed == closed; Closed == eof ->
{error,X};