diff options
| author | Hans Nilsson <[email protected]> | 2014-06-16 11:19:41 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-06-16 11:19:41 +0200 |
| commit | 94f97e8f76bdde01ca18b0e8617c87fd3862ffa4 (patch) | |
| tree | c313f94244d982d22fd6aae0a7fababfadf8fabc | |
| parent | 6c504f08ae5c35d2b86b31a5878d40d7957a3db8 (diff) | |
| parent | 3c37eaa0fe0841d035d99d622c234253aadf7e3d (diff) | |
| download | otp-94f97e8f76bdde01ca18b0e8617c87fd3862ffa4.tar.gz otp-94f97e8f76bdde01ca18b0e8617c87fd3862ffa4.tar.bz2 otp-94f97e8f76bdde01ca18b0e8617c87fd3862ffa4.zip | |
Merge branch 'hans/ssh/decode_encode_fix/OTP-11972' into maint
* hans/ssh/decode_encode_fix/OTP-11972:
ssh: Prepare for release
ssh: Accept disconnect msgs without language tag
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 16 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_message.erl | 9 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
3 files changed, 24 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 42eb2167e0..8269f89e40 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,13 +19,25 @@ {"%VSN%", [ + {"3.0.2", [{load_module, ssh_message, soft_purge, soft_purge, []}, + {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_io, soft_purge, soft_purge, []}]}, {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []}, - {load_module, ssh_acceptor, soft_purge, soft_purge, []}]}, + {load_module, ssh_acceptor, soft_purge, soft_purge, []}, + {load_module, ssh_message, soft_purge, soft_purge, []}, + {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_io, soft_purge, soft_purge, []}]}, {<<".*">>, [{restart_application, ssh}]} ], [ + {"3.0.2", [{load_module, ssh_message, soft_purge, soft_purge, []}, + {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_io, soft_purge, soft_purge, []}]}, {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []}, - {load_module, ssh_acceptor, soft_purge, soft_purge, []}]}, + {load_module, ssh_acceptor, soft_purge, soft_purge, []}, + {load_module, ssh_message, soft_purge, soft_purge, []}, + {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_io, soft_purge, soft_purge, []}]}, {<<".*">>, [{restart_application, ssh}]} ] }. diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl index 8d6c77c0ed..e855f3cb08 100644 --- a/lib/ssh/src/ssh_message.erl +++ b/lib/ssh/src/ssh_message.erl @@ -461,6 +461,15 @@ decode(<<?BYTE(?SSH_MSG_DISCONNECT), ?UINT32(Code), language = Lang }; +%% Accept bad disconnects from ancient openssh clients that doesn't send language tag. Use english as a work-around. +decode(<<?BYTE(?SSH_MSG_DISCONNECT), ?UINT32(Code), + ?UINT32(Len0), Desc:Len0/binary>>) -> + #ssh_msg_disconnect{ + code = Code, + description = unicode:characters_to_list(Desc), + language = <<"en">> + }; + decode(<<?SSH_MSG_NEWKEYS>>) -> #ssh_msg_newkeys{}; diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 40ed27d8f5..8d1a7ae54f 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 3.0.2 +SSH_VSN = 3.0.3 APP_VSN = "ssh-$(SSH_VSN)" |