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

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

commit 6dad6cd91933a19bc18095854e93354b6764d763
Merge: dc71987 dd4c396
Author: James Muehlner <james.muehl...@guac-dev.org>
AuthorDate: Tue Apr 9 21:52:28 2019 -0700

    Merge 1.1.0 changes back to master.

 .gitignore                                      |   4 +
 README-unit-testing.md                          |   2 +-
 configure.ac                                    |  17 ++
 src/{common => common-ssh}/.gitignore           |   6 +-
 src/common-ssh/Makefile.am                      |   1 +
 src/common-ssh/common-ssh/sftp.h                |  25 +++
 src/common-ssh/sftp.c                           | 211 +++++++------------
 src/{common => common-ssh}/tests/Makefile.am    |  34 ++-
 src/common-ssh/tests/sftp/normalize_path.c      | 263 ++++++++++++++++++++++++
 src/common/.gitignore                           |   4 -
 src/common/clipboard.c                          |   4 +-
 src/common/tests/Makefile.am                    |   2 +-
 src/guacd/.gitignore                            |  35 ----
 src/libguac/.gitignore                          |   4 -
 src/libguac/Makefile.am                         |   4 +-
 src/libguac/audio.c                             |  11 +-
 src/libguac/client.c                            |  30 +--
 src/libguac/encode-jpeg.c                       |   6 +-
 src/libguac/encode-jpeg.h                       |   4 +-
 src/libguac/encode-png.c                        |   6 +-
 src/libguac/encode-png.h                        |   4 +-
 src/libguac/encode-webp.c                       |   6 +-
 src/libguac/encode-webp.h                       |   4 +-
 src/libguac/error.c                             |   2 +-
 src/libguac/guacamole/string.h                  | 161 +++++++++++++++
 src/libguac/id.c                                |   2 +-
 src/libguac/parser.c                            |   8 +-
 src/libguac/pool.c                              |   2 +-
 src/libguac/protocol.c                          |  14 +-
 src/libguac/raw_encoder.c                       |  12 +-
 src/libguac/raw_encoder.h                       |   2 +-
 src/libguac/socket-broadcast.c                  |   8 +-
 src/libguac/socket-fd.c                         |   4 +-
 src/libguac/socket-nest.c                       |   6 +-
 src/libguac/socket-ssl.c                        |   6 +-
 src/libguac/socket-tee.c                        |   2 +-
 src/libguac/socket-wsa.c                        |   4 +-
 src/libguac/socket.c                            |   8 +-
 src/libguac/string.c                            | 107 ++++++++++
 src/libguac/tests/Makefile.am                   |   5 +-
 src/libguac/tests/string/strlcat.c              | 153 ++++++++++++++
 src/libguac/tests/string/strlcpy.c              | 102 +++++++++
 src/libguac/tests/string/strljoin.c             | 148 +++++++++++++
 src/libguac/timestamp.c                         |   2 +-
 src/libguac/unicode.c                           |   2 +-
 src/libguac/user-handlers.c                     |  12 +-
 src/libguac/user-handlers.h                     |   4 +-
 src/libguac/user-handshake.c                    |  12 +-
 src/libguac/user.c                              |  16 +-
 src/protocols/rdp/.gitignore                    |  37 +---
 src/protocols/rdp/Makefile.am                   |   1 +
 src/protocols/rdp/guac_svc/svc_service.c        |   3 +-
 src/protocols/rdp/keymaps/generate.pl           |   2 +-
 src/protocols/rdp/rdp_fs.c                      |  98 ++++-----
 src/protocols/rdp/rdp_fs.h                      |   5 +
 src/protocols/rdp/rdp_settings.c                |   9 +-
 src/protocols/rdp/rdp_stream.c                  |   5 +-
 src/protocols/rdp/rdp_svc.c                     |  14 +-
 src/protocols/rdp/rdp_svc.h                     |   7 +-
 src/{common => protocols/rdp}/tests/Makefile.am |  34 ++-
 src/protocols/rdp/tests/fs/normalize_path.c     | 256 +++++++++++++++++++++++
 src/protocols/ssh/.gitignore                    |  36 ----
 src/protocols/telnet/.gitignore                 |  36 ----
 src/protocols/vnc/.gitignore                    |  36 ----
 util/generate-test-runner.pl                    |   2 +-
 65 files changed, 1521 insertions(+), 551 deletions(-)


Reply via email to