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:18 UTC
(guacamole-server) branch next updated (8f7c9212 -> f0647951)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
from 8f7c9212 Merge main branch changes to next.
add 6cdf21b3 GUACAMOLE-2118: Recheck guac_flag flags after pthread_cond_t timeout (per POSIX manual).
add e9276653 GUACAMOLE-2118: Move internal struct out of public "socket-ssl.h" header.
add 7b41a8ee GUACAMOLE-2118: Ensure socket I/O cannot block indefinitely.
add a8e3547b GUACAMOLE-2118: Monitor all operations which must not block with watchdog.
add c6884bcc GUACAMOLE-2118: Migrate to re-exec after fork(), harden against unexpected behavior.
add 56a7a88c GUACAMOLE-2118: Merge ensure connection processes are always torn down, even if malfunctioning/blocking.
add bd2d3b3a Merge 1.6.1 changes to patch branch.
add ecca029b Merge patch branch changes to main.
new f0647951 Merge main branch changes 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:
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(-)
create mode 100644 src/guacd/proc-child.c
create mode 100644 src/guacd/proc-child.h
create mode 100644 src/libguac/client-watchdog.c
(guacamole-server) 01/01: Merge main branch changes to next.
Posted by vn...@apache.org.
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(-)