[guacamole-server] branch master updated (787ae31 -> 29b055b)

[mj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git.


    from 787ae31  Merge 1.2.0 changes back to master.
     add d76502d  GUACAMOLE-1053: guacd segfaults when user actively presses keys at RDP disconnect time
     add f899fe0  GUACAMOLE-1053: Merge restoration of proper locking on RDP structures.
     new 29b055b  Merge 1.2.0 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/protocols/rdp/client.c |  5 +++++
 src/protocols/rdp/input.c  | 21 +++++++++++++++++----
 src/protocols/rdp/rdp.c    | 21 ++++++++++++++++++---
 src/protocols/rdp/rdp.h    |  8 ++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)

[guacamole-server] 01/01: Merge 1.2.0 changes back to master.

[mj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 29b055b511cdd393808038b2687069027b9dedda
Merge: 787ae31 f899fe0
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu Jun 18 12:52:30 2020 -0700

    Merge 1.2.0 changes back to master.

 src/protocols/rdp/client.c |  5 +++++
 src/protocols/rdp/input.c  | 21 +++++++++++++++++----
 src/protocols/rdp/rdp.c    | 21 ++++++++++++++++++---
 src/protocols/rdp/rdp.h    |  8 ++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)