This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit a575af63ef5b4c8b1804999f211ebeb270992b5a Merge: c9664bc4 688cb12b Author: Virtually Nick <[email protected]> AuthorDate: Mon Jan 22 12:17:29 2024 -0500 Merge 1.5.5 changes back to master. src/common-ssh/common-ssh/key.h | 2 +- src/common-ssh/ssh.c | 2 +- src/common/common/cursor.h | 2 +- src/common/common/dot_cursor.h | 2 +- src/common/common/surface.h | 2 +- src/common/display.c | 2 +- src/common/iconv.c | 4 ++-- src/guacd/daemon.c | 4 ++-- src/guacd/man/guacd.8.in | 2 +- src/guacd/man/guacd.conf.5.in | 2 +- src/guacd/proc.c | 4 ++-- src/guacd/proc.h | 2 +- src/guacenc/cursor.h | 2 +- src/guacenc/display-flatten.c | 2 +- src/guacenc/ffmpeg-compat.h | 2 +- src/guacenc/video.c | 2 +- src/libguac/client.c | 4 ++-- src/libguac/encode-jpeg.c | 2 +- src/libguac/guacamole/client-fntypes.h | 4 ++-- src/libguac/guacamole/client.h | 2 +- src/libguac/guacamole/parser.h | 2 +- src/libguac/guacamole/protocol.h | 4 ++-- src/libguac/guacamole/rwlock.h | 20 ++++++++++---------- src/libguac/guacamole/socket.h | 2 +- src/libguac/guacamole/string.h | 2 +- src/libguac/guacamole/user-fntypes.h | 2 +- src/libguac/hash.c | 2 +- src/libguac/rwlock.c | 4 ++-- src/libguac/socket-broadcast.c | 2 +- src/libguac/socket-fd.c | 2 +- src/libguac/socket-tee.c | 2 +- src/libguac/tests/id/generate.c | 2 +- src/libguac/user.c | 2 +- src/protocols/kubernetes/kubernetes.c | 4 ++-- src/protocols/kubernetes/pipe.h | 2 +- src/protocols/rdp/beep.c | 4 ++-- .../rdp/channels/audio-input/audio-buffer.h | 2 +- src/protocols/rdp/channels/cliprdr.c | 2 +- src/protocols/rdp/channels/disp.h | 4 ++-- src/protocols/rdp/channels/pipe-svc.h | 2 +- src/protocols/rdp/doc/svc-example/README.md | 2 +- src/protocols/rdp/fs.h | 2 +- src/protocols/rdp/plugins/guacai/guacai.c | 2 +- src/protocols/rdp/settings.c | 2 +- src/protocols/ssh/pipe.h | 2 +- src/protocols/telnet/pipe.h | 2 +- src/protocols/telnet/telnet.c | 2 +- src/protocols/vnc/settings.c | 2 +- src/terminal/common.c | 2 +- src/terminal/display.c | 2 +- src/terminal/select.c | 2 +- src/terminal/terminal-handlers.c | 2 +- src/terminal/terminal/palette.h | 4 ++-- src/terminal/terminal/scrollbar.h | 2 +- src/terminal/terminal/terminal-priv.h | 2 +- src/terminal/terminal/typescript.h | 2 +- 56 files changed, 76 insertions(+), 76 deletions(-)
