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

412935 setLocale is not an explicit set of character encoding

This commit is contained in:
Greg Wilkins 2013-07-19 14:33:53 +10:00
parent be00279e7e
commit 8e83b574a2
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,7 @@ public class Response implements HttpServletResponse
private Locale _locale; private Locale _locale;
private MimeTypes.Type _mimeType; private MimeTypes.Type _mimeType;
private String _characterEncoding; private String _characterEncoding;
private boolean _explicitEncoding;
private String _contentType; private String _contentType;
private OutputType _outputType = OutputType.NONE; private OutputType _outputType = OutputType.NONE;
private ResponseWriter _writer; private ResponseWriter _writer;
@ -128,6 +129,7 @@ public class Response implements HttpServletResponse
_contentLength = -1; _contentLength = -1;
_out.reset(); _out.reset();
_fields.clear(); _fields.clear();
_explicitEncoding=false;
} }
public void setHeaders(HttpContent httpContent) public void setHeaders(HttpContent httpContent)
@ -745,7 +747,7 @@ public class Response implements HttpServletResponse
encoding = MimeTypes.inferCharsetFromContentType(_contentType); encoding = MimeTypes.inferCharsetFromContentType(_contentType);
if (encoding == null) if (encoding == null)
encoding = StringUtil.__ISO_8859_1; encoding = StringUtil.__ISO_8859_1;
setCharacterEncoding(encoding); setCharacterEncoding(encoding,false);
} }
if (_writer != null && _writer.isFor(encoding)) if (_writer != null && _writer.isFor(encoding))
@ -842,6 +844,11 @@ public class Response implements HttpServletResponse
@Override @Override
public void setCharacterEncoding(String encoding) public void setCharacterEncoding(String encoding)
{
setCharacterEncoding(encoding,true);
}
private void setCharacterEncoding(String encoding, boolean explicit)
{ {
if (isIncluding()) if (isIncluding())
return; return;
@ -850,6 +857,8 @@ public class Response implements HttpServletResponse
{ {
if (encoding == null) if (encoding == null)
{ {
_explicitEncoding=false;
// Clear any encoding. // Clear any encoding.
if (_characterEncoding != null) if (_characterEncoding != null)
{ {
@ -868,6 +877,7 @@ public class Response implements HttpServletResponse
else else
{ {
// No, so just add this one to the mimetype // No, so just add this one to the mimetype
_explicitEncoding=explicit;
_characterEncoding = StringUtil.normalizeCharset(encoding); _characterEncoding = StringUtil.normalizeCharset(encoding);
if (_contentType != null) if (_contentType != null)
{ {
@ -928,6 +938,7 @@ public class Response implements HttpServletResponse
else else
{ {
_characterEncoding = charset; _characterEncoding = charset;
_explicitEncoding = true;
} }
HttpField field = HttpField.CONTENT_TYPE.get(_contentType); HttpField field = HttpField.CONTENT_TYPE.get(_contentType);
@ -1068,8 +1079,8 @@ public class Response implements HttpServletResponse
String charset = _channel.getRequest().getContext().getContextHandler().getLocaleEncoding(locale); String charset = _channel.getRequest().getContext().getContextHandler().getLocaleEncoding(locale);
if (charset != null && charset.length() > 0 && _characterEncoding == null) if (charset != null && charset.length() > 0 && !_explicitEncoding)
setCharacterEncoding(charset); setCharacterEncoding(charset,false);
} }
@Override @Override