You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2020/06/25 21:57:05 UTC

[guacamole-server] branch master updated (45a0cd9 -> 79c6e57)

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

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


    from 45a0cd9  Merge staging/1.2.0 changes back to master.
     add d8c32b1  GUACAMOLE-474: Enforce download disable option at low level, warning if not blocked at higher level as expected.
     add f4ff5f3  GUACAMOLE-474: Enforce upload disable option at low level, warning if not blocked at higher level as expected.
     add 6307985  GUACAMOLE-474: Ensure RDPDR "Download" folder behaves as a normal folder if downloads are disabled.
     add 7de6ba7  GUACAMOLE-474: Do not allow RDPDR file downloads via "get" instructions if downloads are disabled.
     add 6042222  GUACAMOLE-474: Merge properly enforce file new upload/download restrictions.
     new 79c6e57  Merge staging/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/common-ssh/sftp.c                              | 33 ++++++++++++++++++++++
 .../channels/rdpdr/rdpdr-fs-messages-file-info.c   |  3 +-
 src/protocols/rdp/download.c                       | 17 +++++++++--
 src/protocols/rdp/upload.c                         | 24 ++++++++++++++++
 4 files changed, 74 insertions(+), 3 deletions(-)

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

Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 79c6e5787d38a2e793fe7d63c4c187d813855806
Merge: 45a0cd9 6042222
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Thu Jun 25 17:56:43 2020 -0400

    Merge staging/1.2.0 changes back to master.

 src/common-ssh/sftp.c                              | 33 ++++++++++++++++++++++
 .../channels/rdpdr/rdpdr-fs-messages-file-info.c   |  3 +-
 src/protocols/rdp/download.c                       | 17 +++++++++--
 src/protocols/rdp/upload.c                         | 24 ++++++++++++++++
 4 files changed, 74 insertions(+), 3 deletions(-)