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 0987F200C19 for ; Sat, 28 Jan 2017 19:53:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 08137160B33; Sat, 28 Jan 2017 18:53:32 +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 50F22160B51 for ; Sat, 28 Jan 2017 19:53:31 +0100 (CET) Received: (qmail 3162 invoked by uid 500); 28 Jan 2017 18:53:30 -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 3152 invoked by uid 99); 28 Jan 2017 18:53:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jan 2017 18:53:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EF2BDC0296 for ; Sat, 28 Jan 2017 18:53:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -5.719 X-Spam-Level: X-Spam-Status: No, score=-5.719 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, RCVD_IN_SORBS_SPAM=0.5, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id f1GvqRwXKh_x for ; Sat, 28 Jan 2017 18:53:29 +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 6FFCD5FC5A for ; Sat, 28 Jan 2017 18:53:28 +0000 (UTC) Received: (qmail 2048 invoked by uid 99); 28 Jan 2017 18:52:12 -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; Sat, 28 Jan 2017 18:52:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C0C7DFF59; Sat, 28 Jan 2017 18:52:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mjumper@apache.org To: commits@guacamole.incubator.apache.org Date: Sat, 28 Jan 2017 18:52:14 -0000 Message-Id: In-Reply-To: <2b01b0a0ac324804b836400896078649@git.apache.org> References: <2b01b0a0ac324804b836400896078649@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/13] incubator-guacamole-client git commit: GUACAMOLE-47: Shorten the token length and change name. archived-at: Sat, 28 Jan 2017 18:53:32 -0000 GUACAMOLE-47: Shorten the token length and change name. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/962bec88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/962bec88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/962bec88 Branch: refs/heads/master Commit: 962bec88068a692a4a94ba1a51a9dbb102b5a5c7 Parents: 3614aff Author: Nick Couchman Authored: Fri Jan 6 19:38:31 2017 -0500 Committer: Nick Couchman Committed: Fri Jan 6 19:38:31 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/guacamole/token/StandardTokens.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/962bec88/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java index 0dd4aed..0902310 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java @@ -45,12 +45,12 @@ public class StandardTokens { /** * The name of the client token added via addStandardTokens(). */ - public static final String CLIENT_HOST_TOKEN = "GUAC_CLIENT_HOST"; + public static final String CLIENT_HOST_TOKEN = "GUAC_REMHOST"; /** * The IP of the client token added via addStandardTokens(). */ - public static final String CLIENT_IP_TOKEN = "GUAC_CLIENT_IP"; + public static final String CLIENT_IP_TOKEN = "GUAC_REMIP"; /** * The name of the date token (server-local time) added via