Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1064 - HttpClient sets chunked transfer-encoding. 

Replaced the hint that there is a body by setting the Content-Type
header rather than the Transfer-Encoding header.
This commit is contained in:
Simone Bordet 2016-11-03 11:40:21 +01:00
parent bbc21e8648
commit 7e903cfc6b
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
View File

@ -122,14 +122,15 @@ public abstract class HttpConnection implements Connection
// Add content headers
if (content != null)
{
if (content instanceof ContentProvider.Typed)
if (!headers.containsKey(HttpHeader.CONTENT_TYPE.asString()))
{
if (!headers.containsKey(HttpHeader.CONTENT_TYPE.asString()))
{
String contentType = ((ContentProvider.Typed)content).getContentType();
if (contentType != null)
headers.put(HttpHeader.CONTENT_TYPE, contentType);
}
String contentType = null;
if (content instanceof ContentProvider.Typed)
contentType = ((ContentProvider.Typed)content).getContentType();
if (contentType != null)
headers.put(HttpHeader.CONTENT_TYPE, contentType);
else
headers.put(HttpHeader.CONTENT_TYPE, "application/octet-stream");
}
long contentLength = content.getLength();
if (contentLength >= 0)
@ -137,11 +138,6 @@ public abstract class HttpConnection implements Connection
if (!headers.containsKey(HttpHeader.CONTENT_LENGTH.asString()))
headers.put(HttpHeader.CONTENT_LENGTH, String.valueOf(contentLength));
}
else
{
if (!headers.containsKey(HttpHeader.TRANSFER_ENCODING.asString()))
headers.put(CHUNKED_FIELD);
}
}
// Cookies