Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF9DF18A6A for ; Mon, 10 Aug 2015 19:43:54 +0000 (UTC) Received: (qmail 98646 invoked by uid 500); 10 Aug 2015 19:43:54 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 98607 invoked by uid 500); 10 Aug 2015 19:43:54 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 98598 invoked by uid 99); 10 Aug 2015 19:43:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 19:43:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 64390AC0255 for ; Mon, 10 Aug 2015 19:43:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1695155 - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java Date: Mon, 10 Aug 2015 19:43:54 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150810194354.64390AC0255@hades.apache.org> Author: olegk Date: Mon Aug 10 19:43:53 2015 New Revision: 1695155 URL: http://svn.apache.org/r1695155 Log: HTTPCLIENT-1671: default headers should only be set if a header with the same name hasn't already been set Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java?rev=1695155&r1=1695154&r2=1695155&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java Mon Aug 10 19:43:53 2015 @@ -72,7 +72,9 @@ public class RequestDefaultHeaders imple if (this.defaultHeaders != null) { for (final Header defHeader : this.defaultHeaders) { - request.addHeader(defHeader); + if(!request.containsHeader(defHeader.getName())) { + request.addHeader(defHeader); + } } } } Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java?rev=1695155&r1=1695154&r2=1695155&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java Mon Aug 10 19:43:53 2015 @@ -66,16 +66,15 @@ public class TestRequestDefaultHeaders { final HttpRequest request = new BasicHttpRequest("GET", "/"); request.addHeader("custom", "stuff"); final List
defheaders = new ArrayList<>(); - defheaders.add(new BasicHeader("custom", "more stuff")); + defheaders.add(new BasicHeader("custom", "other stuff")); final HttpContext context = new BasicHttpContext(); final HttpRequestInterceptor interceptor = new RequestDefaultHeaders(defheaders); interceptor.process(request, context); final Header[] headers = request.getHeaders("custom"); Assert.assertNotNull(headers); - Assert.assertEquals(2, headers.length); + Assert.assertEquals(1, headers.length); Assert.assertEquals("stuff", headers[0].getValue()); - Assert.assertEquals("more stuff", headers[1].getValue()); } }