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/10/30 19:24:16 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-117: Do not
stop connection when the intent is to reconnect (originally broken by commit
a64c3e0).
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master 0c3d89fe1 -> 16a8b9b94
GUACAMOLE-117: Do not stop connection when the intent is to reconnect (originally broken by commit a64c3e0).
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/bed38cec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/bed38cec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/bed38cec
Branch: refs/heads/master
Commit: bed38cec713d2256c87cb324acfa46af9960bb54
Parents: 0c3d89f
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Oct 29 15:00:53 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Oct 29 15:00:53 2016 -0700
----------------------------------------------------------------------
src/protocols/rdp/rdp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/bed38cec/src/protocols/rdp/rdp.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c
index 9dbf714..e82e526 100644
--- a/src/protocols/rdp/rdp.c
+++ b/src/protocols/rdp/rdp.c
@@ -850,10 +850,6 @@ static int guac_rdp_handle_connection(guac_client* client) {
}
- /* Kill client and finish connection */
- guac_client_stop(client);
- guac_client_log(client, GUAC_LOG_INFO, "Internal RDP client disconnected");
-
pthread_mutex_lock(&(rdp_client->rdp_lock));
/* Disconnect client and channels */
@@ -880,6 +876,10 @@ static int guac_rdp_handle_connection(guac_client* client) {
guac_common_display_free(rdp_client->display);
pthread_mutex_unlock(&(rdp_client->rdp_lock));
+
+ /* Client is now disconnected */
+ guac_client_log(client, GUAC_LOG_INFO, "Internal RDP client disconnected");
+
return 0;
}
[2/2] incubator-guacamole-server git commit: GUACAMOLE-117: Merge RDP
disconnect fix.
Posted by jm...@apache.org.
GUACAMOLE-117: Merge RDP disconnect fix.
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/16a8b9b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/16a8b9b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/16a8b9b9
Branch: refs/heads/master
Commit: 16a8b9b94bfe35e5eba0079965856e46533c79c0
Parents: 0c3d89f bed38ce
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Oct 30 12:23:20 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Oct 30 12:23:20 2016 -0700
----------------------------------------------------------------------
src/protocols/rdp/rdp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------