Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8E141200C2B for ; Thu, 16 Feb 2017 05:54:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8CB78160B70; Thu, 16 Feb 2017 04:54:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D6E23160B5E for ; Thu, 16 Feb 2017 05:54:42 +0100 (CET) Received: (qmail 80810 invoked by uid 500); 16 Feb 2017 04:54:42 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 80801 invoked by uid 99); 16 Feb 2017 04:54:42 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2017 04:54:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id A3D001865E5 for ; Thu, 16 Feb 2017 04:54:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id t7Smyjb98OXh for ; Thu, 16 Feb 2017 04:54:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 5120E5F370 for ; Thu, 16 Feb 2017 04:54:40 +0000 (UTC) Received: (qmail 80287 invoked by uid 99); 16 Feb 2017 04:54:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2017 04:54:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1443ADFC31; Thu, 16 Feb 2017 04:54:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmuehlner@apache.org To: commits@guacamole.incubator.apache.org Date: Thu, 16 Feb 2017 04:54:11 -0000 Message-Id: In-Reply-To: <13729a425ff6439bbc0d51fbb931332c@git.apache.org> References: <13729a425ff6439bbc0d51fbb931332c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] incubator-guacamole-server git commit: Merge 0.9.12-incubating changes back to master. archived-at: Thu, 16 Feb 2017 04:54:43 -0000 Merge 0.9.12-incubating changes back to master. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/cd8646b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/cd8646b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/cd8646b3 Branch: refs/heads/master Commit: cd8646b38f77feb3f829c7caa10dead8be41ee41 Parents: 0ea9582 a7ee5ed Author: James Muehlner Authored: Wed Feb 15 20:53:17 2017 -0800 Committer: James Muehlner Committed: Wed Feb 15 20:53:17 2017 -0800 ---------------------------------------------------------------------- src/protocols/rdp/Makefile.am | 3 + src/protocols/rdp/client.c | 1 + src/protocols/rdp/guac_rdpdr/rdpdr_printer.c | 368 ++---------- src/protocols/rdp/guac_rdpdr/rdpdr_printer.h | 31 -- src/protocols/rdp/rdp.c | 7 + src/protocols/rdp/rdp.h | 6 + src/protocols/rdp/rdp_print_job.c | 651 ++++++++++++++++++++++ src/protocols/rdp/rdp_print_job.h | 235 ++++++++ 8 files changed, 947 insertions(+), 355 deletions(-) ----------------------------------------------------------------------