You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by cs...@apache.org on 2025/06/02 07:35:10 UTC

(guacamole-server) branch main updated (558c42e4 -> d80112c9)

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

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


    from 558c42e4 Merge patch branch changes to main.
     add 3349cb2e GUACAMOLE-2075: Ensure guac_display threads are stopped before attempting to free underlying external buffers.
     add 97cd8d63 GUACAMOLE-2075: Merge ensure guac_display threads are stopped before attempting to free underlying external buffers.
     add 8773a1b3 Merge changes from 1.6.0 branch back to patch.
     new d80112c9 Merge changes from patch branch back to main.

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/libguac/display-priv.h      |  8 ++++++
 src/libguac/display.c           | 58 +++++++++++++++++++++++++++++++++++------
 src/libguac/guacamole/display.h | 26 ++++++++++++++++++
 src/protocols/rdp/rdp.c         |  4 +++
 src/protocols/vnc/client.c      |  5 ++++
 5 files changed, 93 insertions(+), 8 deletions(-)

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

Posted by cs...@apache.org.

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

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

commit d80112c993a352c4e366317c0ae12919bfa61011
Merge: 558c42e4 8773a1b3
Author: Corentin SORIANO <cs...@apache.org>
AuthorDate: Mon Jun 2 09:34:50 2025 +0200

    Merge changes from patch branch back to main.

 src/libguac/display-priv.h      |  8 ++++++
 src/libguac/display.c           | 58 +++++++++++++++++++++++++++++++++++------
 src/libguac/guacamole/display.h | 26 ++++++++++++++++++
 src/protocols/rdp/rdp.c         |  4 +++
 src/protocols/vnc/client.c      |  5 ++++
 5 files changed, 93 insertions(+), 8 deletions(-)