You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2017/03/26 00:53:41 UTC
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/
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 <ggregory at apache.org>
-* [HTTPCLIENT-1828] HttpDelete does not extend HttpEntityEnclosingRequestBase.
+* [HTTPCLIENT-1828] HttpDelete, HttpGet, HttpHead do not extend HttpEntityEnclosingRequestBase.
Contributed by Saravanakumar Selvaraj <saravanakumar dot java at gmail dot com> and Gary Gregory <ggregory at apache.org>
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"));
}