This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit bb5ebfdb5fbb872b8583df47321df62c7027ad64 Merge: ac197512 a95e66cd Author: Michael Jumper <[email protected]> AuthorDate: Wed Aug 28 14:37:47 2024 -0700 Merge changes from main branch back to next. configure.ac | 10 +++++----- src/common-ssh/ssh.c | 4 ++-- src/libguac/Makefile.am | 4 ++-- src/libguac/guacamole/{socket-tcp.h => tcp.h} | 22 +++++++++++++++------- src/libguac/{socket-tcp.c => tcp.c} | 7 ++++--- src/libguac/wol.c | 6 +++--- src/protocols/telnet/telnet.c | 4 ++-- src/terminal/buffer.c | 5 +++++ src/terminal/select.c | 22 ++++++++++++++++++---- src/terminal/terminal-handlers.c | 20 +++++++++++++++----- src/terminal/terminal.c | 5 +++-- src/terminal/terminal/buffer.h | 6 ++++++ 12 files changed, 80 insertions(+), 35 deletions(-)
