This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch patch
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
from e099f466 Merge 1.6.0 changes back to patch.
add ca0fc75f GUACAMOLE-600: Add support for setting the FreeRDP
TcpAckTimeout setting.
add e42def82 GUACAMOLE-600: Merge RDP support for configuring the TCP
timeout.
add 1cdda6dd GUACAMOLE-600: Add support for setting SSH and SFTP timeouts.
add 7d0b76be GUACAMOLE-600: Update telnet protocol to send timeout to
common socket code.
add f50ccf64 GUACAMOLE-600: Merge support for setting SSH and SFTP
timeouts.
add 049f5f7c GUACAMOLE-600: Name RDP timeout setting consistent with other
protocols.
add 902346a8 GUACAMOLE-600: Merge rename of RDP timeout setting to
"timeout" (consistent with other protocols).
add 9f6958ac GUACAMOLE-1290: Add public key parameter for SFTP connections
in RDP and VNC protocols.
add 5e0ce1db GUACAMOLE-1290: Move public key import in SSH connection code.
add 68f11819 GUACAMOLE-1290: Merge SFTP support for public keys and
corresponding SSH correction.
add 565d794a Merge 1.6.0 changes back to patch.
No new revisions were added by this update.
Summary of changes:
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 | 34 +++++++++++++++++++++---
src/protocols/rdp/settings.c | 39 +++++++++++++++++++++++++++-
src/protocols/rdp/settings.h | 26 +++++++++++++++++++
src/protocols/ssh/settings.c | 11 ++++++++
src/protocols/ssh/settings.h | 12 +++++++++
src/protocols/ssh/ssh.c | 49 +++++++++++++++++++----------------
src/protocols/telnet/telnet.c | 5 ++--
src/protocols/vnc/settings.c | 25 ++++++++++++++++++
src/protocols/vnc/settings.h | 16 ++++++++++++
src/protocols/vnc/vnc.c | 34 +++++++++++++++++++++---
17 files changed, 274 insertions(+), 46 deletions(-)
