Issue #1269

report inferred encoding
2017-01-20 11:38:21 +11:00 · 2017-01-20 11:38:21 +11:00 · f9c829f7cc
parent 91987d4233
commit f9c829f7cc
1 changed files with 3 additions and 0 deletions
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
@ -839,6 +839,9 @@ public class Response implements HttpServletResponse
        if (_characterEncoding == null)
        {
            String encoding = MimeTypes.getCharsetAssumedFromContentType(_contentType);
+            if (encoding!=null)
+                return encoding;
+            encoding = MimeTypes.getCharsetInferredFromContentType(_contentType);
            if (encoding!=null)
                return encoding;
            return StringUtil.__ISO_8859_1;