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 8E71A97E0 for ; Sun, 25 Sep 2011 12:39:07 +0000 (UTC) Received: (qmail 41114 invoked by uid 500); 25 Sep 2011 12:39:07 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 41089 invoked by uid 500); 25 Sep 2011 12:39:07 -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 41082 invoked by uid 99); 25 Sep 2011 12:39:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Sep 2011 12:39:07 +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; Sun, 25 Sep 2011 12:39:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1BAA023889BB for ; Sun, 25 Sep 2011 12:38:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1175378 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client: AbstractAuthenticationHandler.java HttpAuthenticator.java Date: Sun, 25 Sep 2011 12:38:44 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110925123844.1BAA023889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Sun Sep 25 12:38:43 2011 New Revision: 1175378 URL: http://svn.apache.org/viewvc?rev=1175378&view=rev Log: HTTPCLIENT-1107: support auth scheme switching Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java?rev=1175378&r1=1175377&r2=1175378&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java Sun Sep 25 12:38:43 2011 @@ -102,7 +102,7 @@ public abstract class AbstractAuthentica } int endIndex = pos; String s = buffer.substring(beginIndex, endIndex); - map.put(s.toLowerCase(Locale.ENGLISH), header); + map.put(s.toLowerCase(Locale.US), header); } return map; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java?rev=1175378&r1=1175377&r2=1175378&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java Sun Sep 25 12:38:43 2011 @@ -79,10 +79,12 @@ public class HttpAuthenticator { String id = authScheme.getSchemeName(); Header challenge = challenges.get(id.toLowerCase(Locale.US)); if (challenge == null) { - if (this.log.isWarnEnabled()) { - this.log.warn(id + " authorization challenge expected, but not found"); - } - return false; + // Retry authentication with a different scheme + authState.invalidate(); + authScheme = authHandler.selectScheme(challenges, response, context); + authState.setAuthScheme(authScheme); + id = authScheme.getSchemeName(); + challenge = challenges.get(id.toLowerCase(Locale.US)); } authScheme.processChallenge(challenge); this.log.debug("Authorization challenge processed");