You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/11/12 00:12:20 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-117: Close
socket file descriptor if SSL/TLS handshake fails.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master a46ce4cc3 -> 6436996eb
GUACAMOLE-117: Close socket file descriptor if SSL/TLS handshake fails.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/ca2b4262
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/ca2b4262
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/ca2b4262
Branch: refs/heads/master
Commit: ca2b4262520cc8adaef69af101c9858a18c138cb
Parents: a46ce4c
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Nov 11 12:25:28 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 11 12:25:28 2016 -0800
----------------------------------------------------------------------
src/guacd/connection.c | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/ca2b4262/src/guacd/connection.c
----------------------------------------------------------------------
diff --git a/src/guacd/connection.c b/src/guacd/connection.c
index 6c9e06c..3ad8eae 100644
--- a/src/guacd/connection.c
+++ b/src/guacd/connection.c
@@ -377,6 +377,7 @@ void* guacd_connection_thread(void* data) {
socket = guac_socket_open_secure(ssl_context, connected_socket_fd);
if (socket == NULL) {
guacd_log_guac_error(GUAC_LOG_ERROR, "Unable to set up SSL/TLS");
+ close(connected_socket_fd);
free(params);
return NULL;
}
[2/2] incubator-guacamole-server git commit: GUACAMOLE-117: Merge fix
for closing socket upon failed handshake.
Posted by jm...@apache.org.
GUACAMOLE-117: Merge fix for closing socket upon failed handshake.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6436996e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6436996e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6436996e
Branch: refs/heads/master
Commit: 6436996eb7b4d725fd7ee502e12b64be19caafdd
Parents: a46ce4c ca2b426
Author: James Muehlner <ja...@guac-dev.org>
Authored: Fri Nov 11 16:11:37 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Fri Nov 11 16:11:37 2016 -0800
----------------------------------------------------------------------
src/guacd/connection.c | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------