diff options
author | Hans Nilsson <hans@erlang.org> | 2019-09-11 11:28:37 +0200 |
---|---|---|
committer | Hans Nilsson <hans@erlang.org> | 2019-09-11 11:28:37 +0200 |
commit | 415c4818fd4b34c8f2a5fd5728862227ee5e433d (patch) | |
tree | b0178575bfb2c80825afebc9e43c118a52c2acd6 | |
parent | c5fdd8050651756077ae87a02776caf562ed651c (diff) | |
parent | 61764a2c20e8f981ae5797cc167f0eb6a4780080 (diff) | |
download | erlang-415c4818fd4b34c8f2a5fd5728862227ee5e433d.tar.gz |
Merge branch 'maint'
* maint:
ftp: Break loop
-rw-r--r-- | lib/ftp/src/ftp.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ftp/src/ftp.erl b/lib/ftp/src/ftp.erl index 18cd8c7524..e9be7b8ff7 100644 --- a/lib/ftp/src/ftp.erl +++ b/lib/ftp/src/ftp.erl @@ -1399,10 +1399,13 @@ handle_info({Transport, Socket, Data}, #state{csock = {Transport, Socket}, ctrl_data = {NextMsgData, [], start}}) end; - {continue, NewCtrlData} -> + {continue, NewCtrlData} when NewCtrlData =/= CtrlData -> ?DBG(' ...Continue... ctrl_data=~p~n',[NewCtrlData]), State = activate_ctrl_connection(State0), - {noreply, State#state{ctrl_data = NewCtrlData}} + {noreply, State#state{ctrl_data = NewCtrlData}}; + {continue, NewCtrlData} when NewCtrlData == CtrlData -> + ?DBG(' ...Continue... ctrl_data=~p~n',[NewCtrlData]), + {noreply, State0} end; %% If the server closes the control channel it is |