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 C65D5101F3 for ; Fri, 6 Dec 2013 14:59:10 +0000 (UTC) Received: (qmail 56327 invoked by uid 500); 6 Dec 2013 14:59:10 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 56297 invoked by uid 500); 6 Dec 2013 14:59:09 -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 56276 invoked by uid 99); 6 Dec 2013 14:59:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Dec 2013 14:59:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Dec 2013 14:59:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B7A102388831 for ; Fri, 6 Dec 2013 14:58:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1548548 - in /httpcomponents/httpasyncclient/trunk: RELEASE_NOTES.txt httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java Date: Fri, 06 Dec 2013 14:58:44 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131206145844.B7A102388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Fri Dec 6 14:58:44 2013 New Revision: 1548548 URL: http://svn.apache.org/r1548548 Log: HTTPCLIENT-1442: Authentication header set by the user gets removed in case of proxy authentication Modified: httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java Modified: httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt?rev=1548548&r1=1548547&r2=1548548&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt (original) +++ httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt Fri Dec 6 14:58:44 2013 @@ -1,6 +1,10 @@ Changes since 4.0 ------------------- +* [HTTPCLIENT-1442] Authentication header set by the user gets removed in case + of proxy authentication. + Contributed by Oleg Kalnichevski + * [HTTPASYNC-60] Fixed incorrect OSGi Symbolic-BundleName. Contributed by M. van Cuijk Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java?rev=1548548&r1=1548547&r2=1548548&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java Fri Dec 6 14:58:44 2013 @@ -589,9 +589,14 @@ class MainClientExec implements Internal if (config.isAuthenticationEnabled()) { if (needAuthentication(state)) { // discard previous auth headers - final HttpRequest currentRequest = state.getCurrentRequest(); - currentRequest.removeHeaders(AUTH.WWW_AUTH_RESP); - currentRequest.removeHeaders(AUTH.PROXY_AUTH_RESP); + final HttpRequestWrapper currentRequest = state.getCurrentRequest(); + final HttpRequest original = currentRequest.getOriginal(); + if (!original.containsHeader(AUTH.WWW_AUTH_RESP)) { + currentRequest.removeHeaders(AUTH.WWW_AUTH_RESP); + } + if (!original.containsHeader(AUTH.PROXY_AUTH_RESP)) { + currentRequest.removeHeaders(AUTH.PROXY_AUTH_RESP); + } return true; } }