aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.appup.src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-10-23 10:53:04 +0200
committerErlang/OTP <[email protected]>2014-10-23 10:53:04 +0200
commitc530f3d4f851ab3844b67e4ccfbe724910bed4bd (patch)
tree64cabc24e1492c4efe434f7ef120561bc630dac4 /lib/ssh/src/ssh.appup.src
parent5d49d05c3604f764736b10cfb287818d4b41efda (diff)
parentb7f24722a7346ae48b2d8d7a29dea9d381e669b7 (diff)
downloadotp-c530f3d4f851ab3844b67e4ccfbe724910bed4bd.tar.gz
otp-c530f3d4f851ab3844b67e4ccfbe724910bed4bd.tar.bz2
otp-c530f3d4f851ab3844b67e4ccfbe724910bed4bd.zip
Merge branch 'hans/ssh/scanning/OTP-12247' into maint-17
* hans/ssh/scanning/OTP-12247: ssh: fix ssh.appup.src. ssh: Corrected appup ssh: fix .app and .appup errors ssh: remove supervisors for crashed connection worker ssh: Print supervisor tree (on demand). ssh: prepare for release ssh: avoid terminated but not deleted children to be counted. ssh: simple info function (ssh_info:print/0). ssh: Gracefully handle bad handshake messages ssh: reduce amount of printouts ssh: Fix port scanner problems
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
-rw-r--r--lib/ssh/src/ssh.appup.src34
1 files changed, 32 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 3cafe2d6be..600c01454c 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,15 +19,45 @@
{"%VSN%",
[
+ {"3.0.7", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+ {load_module, ssh_info, soft_purge, soft_purge, []},
+ {load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]}]},
{"3.0.6", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+ {load_module, ssh_info, soft_purge, soft_purge, []},
{load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
{load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
- {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]}]},
- {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]}]},
{<<".*">>, [{restart_application, ssh}]}
],
[
+ {"3.0.7", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+ {load_module, ssh_info, soft_purge, soft_purge, []},
+ {load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]}]},
{"3.0.6", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+ {load_module, ssh_info, soft_purge, soft_purge, []},
{load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
{load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
{load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},