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

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2017-01-20 15:57:33 +11:00
parent 0c8273f2ca f9c829f7cc
commit 389ef2a2a3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -801,7 +801,10 @@ public class Response implements HttpServletResponse
String encoding = MimeTypes.getCharsetAssumedFromContentType(_contentType);
if (encoding!=null)
return encoding;
_characterEncoding = StringUtil.__ISO_8859_1;
encoding = MimeTypes.getCharsetInferredFromContentType(_contentType);
if (encoding!=null)
return encoding;
return StringUtil.__ISO_8859_1;
}
return _characterEncoding;
}