diff options
| author | Cons T Åhs <cons@erlang.org> | 2022-02-02 07:49:27 +0100 |
|---|---|---|
| committer | Cons T Åhs <cons@erlang.org> | 2022-02-02 07:49:27 +0100 |
| commit | 8337fa8e448dc8f91c9ec073a026a03415800fa4 (patch) | |
| tree | e596fbf7c0827f21a934f903d0fb352655e2f80a | |
| parent | f5b3d8c6af3b399d5b87b23615dde9b557733844 (diff) | |
| parent | 8b00368d02a0eece7feaa86831d04587d6515629 (diff) | |
| download | erlang-8337fa8e448dc8f91c9ec073a026a03415800fa4.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 733283143b..7f4aef60a8 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -811,26 +811,20 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId, request_type = "pty-req", want_reply = WantReply, data = Data}, - Connection, server, SSH) -> + Connection, server, _SSH) -> <<?DEC_BIN(BTermName,_TermLen), ?UINT32(Width),?UINT32(Height), ?UINT32(PixWidth), ?UINT32(PixHeight), Modes/binary>> = Data, TermName = binary_to_list(BTermName), PtyOpts0 = decode_pty_opts(Modes), - PtyOpts = case SSH#ssh.c_version of - "SSH-2.0-PuTTY"++_ -> - %% If - peer client is PuTTY - %% - it asked for pty + PtyOpts = case proplists:get_value(onlcr, PtyOpts0, undefined) of + undefined -> + %% If - peer client asked for pty %% - did not tell if LF->CRLF expansion is wanted %% then %% - do LF->CRLF expansion - case proplists:get_value(onlcr, PtyOpts0, undefined) of - undefined -> - [{onlcr,1} | PtyOpts0]; - _ -> - PtyOpts0 - end; + [{onlcr,1} | PtyOpts0]; _ -> PtyOpts0 end, |