diff options
| author | Erlang/OTP <otp@erlang.org> | 2020-02-27 11:54:01 +0100 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2020-02-27 11:54:01 +0100 |
| commit | 828a432d4e6fab9199a074e61f1eeb3eab7a4e1d (patch) | |
| tree | 2bc1323e47a79b6fcefd41548c6f5d78fa4aa615 | |
| parent | 740f55c9a0067ecc77fcedebff701796726cbf98 (diff) | |
| parent | 6ac7eb422524ac8f6659a53975600c24304d5c06 (diff) | |
| download | erlang-828a432d4e6fab9199a074e61f1eeb3eab7a4e1d.tar.gz | |
Merge branch 'hans/ssh/sftp_stop_channel_hang/OTP-16507' into maint-20
* hans/ssh/sftp_stop_channel_hang/OTP-16507:
ssh: Add timeout to sftp channel kill sequence
| -rw-r--r-- | lib/ssh/src/ssh_sftp.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl index 79586141b2..693d638275 100644 --- a/lib/ssh/src/ssh_sftp.erl +++ b/lib/ssh/src/ssh_sftp.erl @@ -180,6 +180,8 @@ stop_channel(Pid) -> receive {'EXIT', Pid, killed} -> ok + after 5000 -> + ok end end, process_flag(trap_exit, OldValue), |