Commit bd2d3b3a for guacamole.apache.org

commit bd2d3b3ad63458bf6634e22eff38bf2cb20e3a94
Merge: d292bdec 56a7a88c
Author: Virtually Nick <vnick@apache.org>
Date:   Tue Oct 13 07:35:46 2026 -0400

    Merge 1.6.1 changes to patch branch.

diff --cc src/libguac/guacamole/socket.h
index 75d5432e,774a8a98..5a8f1d34
--- a/src/libguac/guacamole/socket.h
+++ b/src/libguac/guacamole/socket.h
@@@ -127,8 -133,21 +133,21 @@@ struct guac_socket
   * @returns A newly-allocated guac_socket, or NULL if the guac_socket could
   *          not be allocated.
   */
 -guac_socket* guac_socket_alloc();
 +guac_socket* guac_socket_alloc(void);

+ /**
+  * Cancels all pending, active, and future operations on the given guac_socket.
+  * All such operations will cease blocking and fail immediately. The socket
+  * itself remains allocated and must still be freed with guac_socket_free().
+  *
+  * This function may be safely called more than once.
+  *
+  * @param socket
+  *     The guac_socket whose pending, active, and future operations should be
+  *     canceled.
+  */
+ void guac_socket_shutdown(guac_socket* socket);
+
  /**
   * Frees the given guac_socket and all associated resources.
   *