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 6A18F100F4 for ; Thu, 29 Aug 2013 09:23:45 +0000 (UTC) Received: (qmail 66052 invoked by uid 500); 29 Aug 2013 09:23:45 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 66007 invoked by uid 500); 29 Aug 2013 09:23:41 -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 65999 invoked by uid 99); 29 Aug 2013 09:23:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Aug 2013 09:23:40 +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; Thu, 29 Aug 2013 09:23:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3712623889EC for ; Thu, 29 Aug 2013 09:23:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1518548 - in /httpcomponents/httpasyncclient/trunk: ./ httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ Date: Thu, 29 Aug 2013 09:23:19 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130829092319.3712623889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Thu Aug 29 09:23:18 2013 New Revision: 1518548 URL: http://svn.apache.org/r1518548 Log: HTTPASYNC-52: Proxy configuration set at the request level does not apply Modified: httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java 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=1518548&r1=1518547&r2=1518548&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt (original) +++ httpcomponents/httpasyncclient/trunk/RELEASE_NOTES.txt Thu Aug 29 09:23:18 2013 @@ -1,6 +1,9 @@ Change since Release 4.0 Beta 4 ------------------- +* [HTTPASYNC-52] Proxy configuration set at the request level does not apply. + Contributed by Oleg Kalnichevski + * [HTTPASYNC-51] Request producers do not get correctly reset if the server responds early (out of sequence), which can cause entity enclosing requests to be malformed in case of re-execution. Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java?rev=1518548&r1=1518547&r2=1518548&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClientBase.java Thu Aug 29 09:23:18 2013 @@ -57,7 +57,8 @@ abstract class CloseableHttpAsyncClientB doExecute(); } - }); this.status = new AtomicReference(Status.INACTIVE); + }); + this.status = new AtomicReference(Status.INACTIVE); } private void doExecute() { 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=1518548&r1=1518547&r2=1518548&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 Thu Aug 29 09:23:18 2013 @@ -127,11 +127,6 @@ class MainClientExec implements Internal } final HttpClientContext localContext = state.getLocalContext(); - final HttpRequestWrapper request = HttpRequestWrapper.wrap(original); - final HttpRoute route = this.routePlanner.determineRoute(target, request, localContext); - state.setRoute(route); - state.setMainRequest(request); - state.setCurrentRequest(request); if (original instanceof Configurable) { final RequestConfig config = ((Configurable) original).getConfig(); @@ -145,6 +140,12 @@ class MainClientExec implements Internal redirectLocations.clear(); } + final HttpRequestWrapper request = HttpRequestWrapper.wrap(original); + final HttpRoute route = this.routePlanner.determineRoute(target, request, localContext); + state.setRoute(route); + state.setMainRequest(request); + state.setCurrentRequest(request); + prepareRequest(state); }