You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2026/10/13 11:38:19 UTC
(guacamole-server) 01/01: Merge main branch changes to next.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit f0647951a3881f67dfe20457ba2bc0ad2860b0bd
Merge: 8f7c9212 ecca029b
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Tue Oct 13 07:37:53 2026 -0400
Merge main branch changes to next.
configure.ac | 29 +-
src/guacd/Makefile.am | 2 +
src/guacd/conf-file.c | 2 +-
src/guacd/connection.c | 183 +++++---
src/guacd/connection.h | 16 +-
src/guacd/daemon.c | 199 +++++++--
src/guacd/move-fd.c | 28 +-
src/guacd/proc-child.c | 296 +++++++++++++
src/guacd/proc-child.h | 132 ++++++
src/guacd/proc-map.c | 69 ++-
src/guacd/proc-map.h | 43 +-
src/guacd/proc.c | 757 +++++++++++++++++++--------------
src/guacd/proc.h | 116 ++++-
src/libguac/Makefile.am | 1 +
src/libguac/client-watchdog.c | 374 ++++++++++++++++
src/libguac/client.c | 41 +-
src/libguac/flag.c | 40 +-
src/libguac/guacamole/client-types.h | 8 +
src/libguac/guacamole/client.h | 153 +++++++
src/libguac/guacamole/socket-fntypes.h | 15 +-
src/libguac/guacamole/socket-ssl.h | 31 --
src/libguac/guacamole/socket.h | 19 +
src/libguac/recording.c | 35 +-
src/libguac/socket-broadcast.c | 46 +-
src/libguac/socket-fd.c | 87 +++-
src/libguac/socket-ssl.c | 115 ++++-
src/libguac/socket-tee.c | 39 +-
src/libguac/socket-wsa.c | 69 ++-
src/libguac/socket.c | 33 +-
src/libguac/user-handshake.c | 53 ++-
30 files changed, 2455 insertions(+), 576 deletions(-)