This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch patch in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit d35ed8f76c64357b4cda9e898cfaa96be4de9487 Merge: 1154900d 7ca6234a Author: Virtually Nick <[email protected]> AuthorDate: Tue May 5 13:42:20 2026 -0400 Merge 1.6.1 changes to patch branch. Dockerfile | 2 +- src/common/common/defaults.h | 8 +- src/common/common/iconv.h | 24 ++ src/common/iconv.c | 514 +++++++++++++++++++++++++++-- src/common/tests/iconv/convert-test-data.c | 40 +++ src/common/tests/iconv/convert-test-data.h | 2 +- src/common/tests/iconv/convert.c | 124 ++++++- src/protocols/vnc/clipboard.c | 44 ++- src/protocols/vnc/clipboard.h | 2 +- src/protocols/vnc/settings.c | 10 +- 10 files changed, 728 insertions(+), 42 deletions(-)
