GUACAMOLE-662: Merge correct behavior of nested socket.

Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/bb956071
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/bb956071
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/bb956071

Branch: refs/heads/master
Commit: bb9560716d72dcf582009e26a0d9d2df7e17dcd4
Parents: aba7b98 cc4671d
Author: Nick Couchman <[email protected]>
Authored: Mon Jan 7 06:34:28 2019 -0500
Committer: Nick Couchman <[email protected]>
Committed: Mon Jan 7 06:34:28 2019 -0500

----------------------------------------------------------------------
 src/libguac/socket-nest.c | 295 +++++++++++++++++++++++++++++++++--------
 1 file changed, 243 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


Reply via email to