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 8168110336 for ; Wed, 28 Aug 2013 17:50:14 +0000 (UTC) Received: (qmail 24909 invoked by uid 500); 28 Aug 2013 17:50:14 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 24863 invoked by uid 500); 28 Aug 2013 17:50:11 -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 24852 invoked by uid 99); 28 Aug 2013 17:50:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Aug 2013 17:50:10 +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, 28 Aug 2013 17:50:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1A2DB23888CD for ; Wed, 28 Aug 2013 17:49:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1518298 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java Date: Wed, 28 Aug 2013 17:49:47 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130828174947.1A2DB23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Wed Aug 28 17:49:46 2013 New Revision: 1518298 URL: http://svn.apache.org/r1518298 Log: HTTPCLIENT-1393: original request headers do not get copied over in case of multiple redirects Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java?rev=1518298&r1=1518297&r2=1518298&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java Wed Aug 28 17:49:46 2013 @@ -116,12 +116,16 @@ public class RedirectExec implements Cli } redirectCount++; - final HttpRequest redirect = this.redirectStrategy.getRedirect(currentRequest, response, context); - final HttpRequest original = currentRequest.getOriginal(); + final HttpRequest redirect = this.redirectStrategy.getRedirect( + currentRequest, response, context); + if (!redirect.headerIterator().hasNext()) { + final HttpRequest original = request.getOriginal(); + redirect.setHeaders(original.getAllHeaders()); + } currentRequest = HttpRequestWrapper.wrap(redirect); - currentRequest.setHeaders(original.getAllHeaders()); - if (original instanceof HttpEntityEnclosingRequest) { - Proxies.enhanceEntity((HttpEntityEnclosingRequest) request); + + if (currentRequest instanceof HttpEntityEnclosingRequest) { + Proxies.enhanceEntity((HttpEntityEnclosingRequest) currentRequest); } final URI uri = currentRequest.getURI();