Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B06F9200C51 for ; Sun, 26 Mar 2017 01:53:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF366160B96; Sun, 26 Mar 2017 00:53:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 01A3D160B88 for ; Sun, 26 Mar 2017 01:53:50 +0100 (CET) Received: (qmail 28386 invoked by uid 500); 26 Mar 2017 00:53:50 -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 28375 invoked by uid 99); 26 Mar 2017 00:53:50 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Mar 2017 00:53:50 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id F26603A05CD for ; Sun, 26 Mar 2017 00:53:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1788698 - in /httpcomponents/httpclient/branches/4.6.x: ./ httpclient/src/main/java/org/apache/http/client/methods/ httpclient/src/test/java/org/apache/http/impl/client/integration/ Date: Sun, 26 Mar 2017 00:53:41 -0000 To: commits@hc.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170326005341.F26603A05CD@svn01-us-west.apache.org> archived-at: Sun, 26 Mar 2017 00:53:51 -0000 Author: ggregory Date: Sun Mar 26 00:53:41 2017 New Revision: 1788698 URL: http://svn.apache.org/viewvc?rev=1788698&view=rev Log: [HTTPCLIENT-1828] HttpDelete, HttpGet, HttpHead do not extend HttpEntityEnclosingRequestBase. Modified: httpcomponents/httpclient/branches/4.6.x/RELEASE_NOTES.txt httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java httpcomponents/httpclient/branches/4.6.x/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java Modified: httpcomponents/httpclient/branches/4.6.x/RELEASE_NOTES.txt URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.6.x/RELEASE_NOTES.txt?rev=1788698&r1=1788697&r2=1788698&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.6.x/RELEASE_NOTES.txt (original) +++ httpcomponents/httpclient/branches/4.6.x/RELEASE_NOTES.txt Sun Mar 26 00:53:41 2017 @@ -5,7 +5,7 @@ HttpClient 4.5.4 (GA) is a maintenance r Please note that as of 4.4 HttpClient requires Java 1.6 or newer. -Changelog: +Change log: ------------------- * [HTTPCLIENT-1834] Add support for CredSsp. @@ -20,7 +20,7 @@ Changelog: * [HTTPCLIENT-1816] Update Apache Commons Codec 1.9 to 1.10. Contributed by Gary Gregory -* [HTTPCLIENT-1828] HttpDelete does not extend HttpEntityEnclosingRequestBase. +* [HTTPCLIENT-1828] HttpDelete, HttpGet, HttpHead do not extend HttpEntityEnclosingRequestBase. Contributed by Saravanakumar Selvaraj and Gary Gregory Modified: httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java?rev=1788698&r1=1788697&r2=1788698&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java (original) +++ httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java Sun Mar 26 00:53:41 2017 @@ -45,7 +45,7 @@ import java.net.URI; * * @since 4.0 */ -public class HttpGet extends HttpRequestBase { +public class HttpGet extends HttpEntityEnclosingRequestBase { public final static String METHOD_NAME = "GET"; Modified: httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java?rev=1788698&r1=1788697&r2=1788698&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java (original) +++ httpcomponents/httpclient/branches/4.6.x/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java Sun Mar 26 00:53:41 2017 @@ -48,7 +48,7 @@ import java.net.URI; * * @since 4.0 */ -public class HttpHead extends HttpRequestBase { +public class HttpHead extends HttpEntityEnclosingRequestBase { public final static String METHOD_NAME = "HEAD"; Modified: httpcomponents/httpclient/branches/4.6.x/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.6.x/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java?rev=1788698&r1=1788697&r2=1788698&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.6.x/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java (original) +++ httpcomponents/httpclient/branches/4.6.x/httpclient/src/test/java/org/apache/http/impl/client/integration/TestMinimalClientRequestExecution.java Sun Mar 26 00:53:41 2017 @@ -92,8 +92,9 @@ public class TestMinimalClientRequestExe headerSet.add(header.getName().toLowerCase(Locale.ROOT)); } String headerSetStr = headerSet.toString(); - Assert.assertEquals(headerSetStr, 3, headerSet.size()); + Assert.assertEquals(headerSetStr, 4, headerSet.size()); Assert.assertTrue(headerSetStr, headerSet.contains("connection")); + Assert.assertTrue(headerSetStr, headerSet.contains("content-length")); Assert.assertTrue(headerSetStr, headerSet.contains("host")); Assert.assertTrue(headerSetStr, headerSet.contains("user-agent")); }