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 7CA8410208 for ; Wed, 23 Jul 2014 11:54:39 +0000 (UTC) Received: (qmail 19641 invoked by uid 500); 23 Jul 2014 11:54:39 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 19597 invoked by uid 500); 23 Jul 2014 11:54:39 -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 19570 invoked by uid 99); 23 Jul 2014 11:54:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2014 11:54:39 +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; Wed, 23 Jul 2014 11:54:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E2D2123888D7 for ; Wed, 23 Jul 2014 11:54:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1612816 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java Date: Wed, 23 Jul 2014 11:54:17 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140723115417.E2D2123888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Wed Jul 23 11:54:17 2014 New Revision: 1612816 URL: http://svn.apache.org/r1612816 Log: HTTPCLIENT-1531: CONNECT via proxy fails if authentication is disabled Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java?rev=1612816&r1=1612815&r2=1612816&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java Wed Jul 23 11:54:17 2014 @@ -450,14 +450,14 @@ public class MainClientExec implements C final HttpHost target = route.getTargetHost(); final HttpHost proxy = route.getProxyHost(); - HttpResponse response; + HttpResponse response = null; final String authority = target.toHostString(); final HttpRequest connect = new BasicHttpRequest("CONNECT", authority, request.getProtocolVersion()); this.requestExecutor.preProcess(connect, this.proxyHttpProcessor, context); - for (;;) { + while (response == null) { if (!managedConn.isOpen()) { this.connManager.connect( managedConn, @@ -491,11 +491,8 @@ public class MainClientExec implements C } else { managedConn.close(); } - } else { - break; + response = null; } - } else { - break; } } }