From commits-return-37307-archive-asf-public=cust-asf.ponee.io@ofbiz.apache.org Tue Jan 16 12:03:49 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 4DC1B18065B for ; Tue, 16 Jan 2018 12:03:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3E2E3160C34; Tue, 16 Jan 2018 11:03:49 +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 81B66160C26 for ; Tue, 16 Jan 2018 12:03:48 +0100 (CET) Received: (qmail 43308 invoked by uid 500); 16 Jan 2018 11:03:47 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 43276 invoked by uid 99); 16 Jan 2018 11:03:43 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jan 2018 11:03:43 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B73493A00A1 for ; Tue, 16 Jan 2018 11:03:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1821231 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java Date: Tue, 16 Jan 2018 11:03:42 -0000 To: commits@ofbiz.apache.org From: jleroux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180116110342.B73493A00A1@svn01-us-west.apache.org> Author: jleroux Date: Tue Jan 16 11:03:42 2018 New Revision: 1821231 URL: http://svn.apache.org/viewvc?rev=1821231&view=rev Log: "Applied fix from trunk for revision: 1821230" ------------------------------------------------------------------------ r1821230 | jleroux | 2018-01-16 12:02:17 +0100 (mar., 16 janv. 2018) | 9 lines Fixed: Fix the HttpServletRequestWrapper in ContextFilter.doFilter() (OFBIZ-10167) As reported by Deepak on dev ML the returned name should be a parameter and not enforced to "Authorisation" This removes a wrong comment (no functional change) Thanks: Deepak for bug report ------------------------------------------------------------------------  Modified: ofbiz/ofbiz-framework/branches/release17.12/ (props changed) ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java Propchange: ofbiz/ofbiz-framework/branches/release17.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 11:03:42 2018 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226 +/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230 Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java?rev=1821231&r1=1821230&r2=1821231&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java Tue Jan 16 11:03:42 2018 @@ -206,7 +206,7 @@ public class ContextFilter implements Fi value = ExternalLoginKeysManager.createJwt(externalServerUserLoginId, dnsName, webAppName , timeToLive); } if (value != null) return value; - return super.getHeader(name); // Here name is always "Authorisation" + return super.getHeader(name); } }; // we're done checking; continue on