[guacamole-server] branch master updated (df25aa9 -> 44145f6)

[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 df25aa9  GUACAMOLE-1276: Merge correction for 32-bit truncation regression affecting RDP uploads.
     add 0182de6  GUACAMOLE-1215: Add backslash to list of JSON-escaped characters.
     new 44145f6  GUACAMOLE-1215: Merge correction for escaping of backslashes in JSON strings.

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/json.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[guacamole-server] 01/01: GUACAMOLE-1215: Merge correction for escaping of backslashes in JSON strings.

[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 44145f681aa3cf08e9cf01e99a68096c77bcab39
Merge: df25aa9 0182de6
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Mon May 17 12:25:23 2021 -0700

    GUACAMOLE-1215: Merge correction for escaping of backslashes in JSON strings.

 src/common/json.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)