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

Fixes #1435

This commit is contained in:
Greg Wilkins 2017-03-30 11:20:39 +11:00
parent 9732e3a985
commit 70d33eab5d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -119,6 +119,7 @@ public class Response implements HttpServletResponse
private enum EncodingFrom { NOT_SET, INFERRED, SET_LOCALE, SET_CONTENT_TYPE, SET_CHARACTER_ENCODING }; private enum EncodingFrom { NOT_SET, INFERRED, SET_LOCALE, SET_CONTENT_TYPE, SET_CHARACTER_ENCODING };
private static final EnumSet<EncodingFrom> __localeOverride = EnumSet.of(EncodingFrom.NOT_SET,EncodingFrom.INFERRED); private static final EnumSet<EncodingFrom> __localeOverride = EnumSet.of(EncodingFrom.NOT_SET,EncodingFrom.INFERRED);
private static final EnumSet<EncodingFrom> __explicitCharset = EnumSet.of(EncodingFrom.SET_LOCALE,EncodingFrom.SET_CHARACTER_ENCODING);
public Response(HttpChannel channel, HttpOutput out) public Response(HttpChannel channel, HttpOutput out)
@ -1425,10 +1426,19 @@ public class Response implements HttpServletResponse
HttpField ct=content.getContentType(); HttpField ct=content.getContentType();
if (ct!=null) if (ct!=null)
{ {
_fields.put(ct); if (_characterEncoding!=null &&
_contentType=ct.getValue(); content.getCharacterEncoding()==null &&
_characterEncoding=content.getCharacterEncoding(); __explicitCharset.contains(_encodingFrom))
_mimeType=content.getMimeType(); {
setContentType(content.getMimeType().getBaseType().asString());
}
else
{
_fields.put(ct);
_contentType=ct.getValue();
_characterEncoding=content.getCharacterEncoding();
_mimeType=content.getMimeType();
}
} }
HttpField ce=content.getContentEncoding(); HttpField ce=content.getContentEncoding();