(guacamole-server) branch next updated (0035340d -> 3c7e8fe6)

[mj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mike-jumper pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git


    from 0035340d Merge main branch changes to next.
     add 820dd05a GUACAMOLE-2220: Fix terminal source issues caused by patch branch merge.
     add d790c1a1 GUACAMOLE-2220: Merge fix for terminal issues caused by patch branch merge.
     add 9e1ee380 GUACAMOLE-2295: Check setsockopt and lseek return values.
     add 2a4e793f GUACAMOLE-2295: Merge proper checking of setsockopt() and lseek() return values.
     add 0dfd36f4 Merge 1.6.1 changes back to patch.
     add 8925e510 Merge changes from patch branch back to main.
     new 3c7e8fe6 Merge changes from main branch back to next.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/guacd/daemon.c      |  5 +++--
 src/protocols/rdp/fs.c  | 10 ++++++++--
 src/terminal/terminal.c | 19 ++++++++-----------
 3 files changed, 19 insertions(+), 15 deletions(-)

(guacamole-server) 01/01: Merge changes from main branch back to next.

[mj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mike-jumper pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 3c7e8fe6968f9625e76b887e3ce054139d3f6cc6
Merge: 0035340d 8925e510
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu Jul 9 00:32:41 2026 -0700

    Merge changes from main branch back to next.

 src/guacd/daemon.c      |  5 +++--
 src/protocols/rdp/fs.c  | 10 ++++++++--
 src/terminal/terminal.c | 19 ++++++++-----------
 3 files changed, 19 insertions(+), 15 deletions(-)