GUACAMOLE-559: Merge fix race condition in receipt of clipboard data by terminal.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/427c4c8b Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/427c4c8b Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/427c4c8b Branch: refs/heads/staging/1.0.0 Commit: 427c4c8b44b0ee218c605ff9da409bcae56f6744 Parents: 71f993b 4f25410 Author: Nick Couchman <vn...@apache.org> Authored: Tue Jul 31 08:10:47 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Tue Jul 31 08:10:47 2018 -0400 ---------------------------------------------------------------------- src/common/clipboard.c | 28 ++++++++++++++++++++++++++-- src/common/common/clipboard.h | 8 ++++++++ src/protocols/ssh/client.c | 5 +++++ src/protocols/ssh/client.h | 5 +++++ src/protocols/ssh/clipboard.c | 5 +++-- src/protocols/ssh/ssh.c | 2 +- src/protocols/ssh/ssh.h | 6 ++++++ src/protocols/telnet/client.c | 4 ++++ src/protocols/telnet/client.h | 5 +++++ src/protocols/telnet/clipboard.c | 5 +++-- src/protocols/telnet/telnet.c | 1 + src/protocols/telnet/telnet.h | 6 ++++++ src/terminal/terminal.c | 16 ++-------------- src/terminal/terminal/terminal.h | 29 ++++++++++++----------------- 14 files changed, 87 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
