You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2020/09/21 03:35:46 UTC

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

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 3e1e1bd268916c32f5b0fb216a635a8cac39064c
Merge: 382d72a aa870de
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Sun Sep 20 20:35:26 2020 -0700

    Merge 1.3.0 changes back to master.

 src/guacd/proc.c                                   |   3 +
 src/libguac/client.c                               |  68 ++++++++++
 src/libguac/guacamole/client.h                     |  31 +++++
 src/libguac/guacamole/protocol-constants.h         |   2 +-
 src/libguac/guacamole/protocol-types.h             |  34 +++++
 src/libguac/guacamole/protocol.h                   |  43 +++++++
 src/libguac/guacamole/string.h                     |  13 ++
 src/libguac/guacamole/user.h                       |  17 +++
 src/libguac/protocol.c                             | 139 +++++++++++++++++----
 src/libguac/string.c                               |  11 ++
 src/libguac/tests/Makefile.am                      |   2 +
 src/libguac/tests/protocol/guac_protocol_version.c |  69 ++++++++++
 src/libguac/tests/string/strdup.c                  |  49 ++++++++
 src/libguac/user-handshake.c                       |   8 +-
 src/libguac/user.c                                 |   9 ++
 src/protocols/rdp/Makefile.am                      |   2 +
 src/protocols/rdp/argv.c                           |  60 +++++++++
 src/protocols/rdp/argv.h                           |  54 ++++++++
 src/protocols/rdp/rdp.c                            |  76 +++++++++--
 src/protocols/rdp/settings.c                       |  57 +++------
 src/protocols/rdp/user.c                           |   5 +
 src/protocols/vnc/Makefile.am                      |   2 +
 src/protocols/vnc/argv.c                           |  53 ++++++++
 src/protocols/vnc/argv.h                           |  47 +++++++
 src/protocols/vnc/auth.c                           |  75 ++++++++++-
 src/protocols/vnc/client.c                         |   4 +-
 src/protocols/vnc/settings.c                       |  11 +-
 src/protocols/vnc/user.c                           |   5 +
 src/protocols/vnc/vnc.c                            |   3 -
 29 files changed, 867 insertions(+), 85 deletions(-)