This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.6.0 in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit f50ccf64d3d1b2b65d7b846b3fb013b99f1818a1 Merge: e42def82 7d0b76be Author: Mike Jumper <[email protected]> AuthorDate: Mon Aug 26 00:17:53 2024 -0700 GUACAMOLE-600: Merge support for setting SSH and SFTP timeouts. src/common-ssh/common-ssh/ssh.h | 6 +++++- src/common-ssh/ssh.c | 10 ++++++++-- src/libguac/guacamole/socket-tcp.h | 5 ++++- src/libguac/guacamole/wol-constants.h | 6 ++++++ src/libguac/guacamole/wol.h | 6 +++++- src/libguac/socket-tcp.c | 30 ++++++++++++++++++++++++------ src/libguac/wol.c | 6 +++--- src/protocols/rdp/rdp.c | 7 ++++--- src/protocols/rdp/settings.c | 12 ++++++++++++ src/protocols/rdp/settings.h | 11 +++++++++++ src/protocols/ssh/settings.c | 11 +++++++++++ src/protocols/ssh/settings.h | 12 ++++++++++++ src/protocols/ssh/ssh.c | 10 ++++++---- src/protocols/telnet/telnet.c | 5 +++-- src/protocols/vnc/settings.c | 12 ++++++++++++ src/protocols/vnc/settings.h | 10 ++++++++++ src/protocols/vnc/vnc.c | 7 ++++--- 17 files changed, 140 insertions(+), 26 deletions(-)
