Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-28 19:09:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce extra enum state for DEFAULT encoding.

Browse Source 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2020-12-15 13:34:26 +11:00
parent b13fb8ad1e
commit 88a838fb17
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,11 @@ public class Response implements HttpServletResponse
*/ */
NOT_SET, NOT_SET,
/**
* Using the default character encoding from the context otherwise iso-8859-1.
*/
DEFAULT,
/** /**
* Character encoding was inferred from the Content-Type and will be added as a parameter to the Content-Type. * Character encoding was inferred from the Content-Type and will be added as a parameter to the Content-Type.
*/ */
@ -129,7 +134,7 @@ public class Response implements HttpServletResponse
SET_CHARACTER_ENCODING SET_CHARACTER_ENCODING
} }
private static final EnumSet<EncodingFrom> __localeOverride = EnumSet.of(EncodingFrom.NOT_SET, EncodingFrom.INFERRED, EncodingFrom.SET_LOCALE); private static final EnumSet<EncodingFrom> __localeOverride = EnumSet.of(EncodingFrom.NOT_SET, EncodingFrom.DEFAULT, EncodingFrom.INFERRED, EncodingFrom.SET_LOCALE);
private static final EnumSet<EncodingFrom> __explicitCharset = EnumSet.of(EncodingFrom.SET_LOCALE, EncodingFrom.SET_CHARACTER_ENCODING, EncodingFrom.SET_CONTENT_TYPE); private static final EnumSet<EncodingFrom> __explicitCharset = EnumSet.of(EncodingFrom.SET_LOCALE, EncodingFrom.SET_CHARACTER_ENCODING, EncodingFrom.SET_CONTENT_TYPE);
public Response(HttpChannel channel, HttpOutput out) public Response(HttpChannel channel, HttpOutput out)
@ -785,7 +790,7 @@ public class Response implements HttpServletResponse
* A standard call to {@link #getCharacterEncoding()} should not change the Content-Type header. * A standard call to {@link #getCharacterEncoding()} should not change the Content-Type header.
* But when {@link #getWriter()} is called we must decide what Content-Type to use, so this will allow an inferred * But when {@link #getWriter()} is called we must decide what Content-Type to use, so this will allow an inferred
* charset to be set in in the Content-Type. * charset to be set in in the Content-Type.
* @param setContentType if true allow the Content-Type header to be changed if character encoding was inferred. * @param setContentType if true allow the Content-Type header to be changed if character encoding was inferred or the default encoding was used.
* @return the character encoding for this response. * @return the character encoding for this response.
*/ */
private String getCharacterEncoding(boolean setContentType) private String getCharacterEncoding(boolean setContentType)
@ -822,7 +827,7 @@ public class Response implements HttpServletResponse
if (encoding != null) if (encoding != null)
{ {
if (setContentType) if (setContentType)
setCharacterEncoding(encoding, EncodingFrom.INFERRED); setCharacterEncoding(encoding, EncodingFrom.DEFAULT);
return encoding; return encoding;
} }
} }
@ -830,7 +835,7 @@ public class Response implements HttpServletResponse
// Fallback to last resort iso-8859-1. // Fallback to last resort iso-8859-1.
encoding = StringUtil.__ISO_8859_1; encoding = StringUtil.__ISO_8859_1;
if (setContentType) if (setContentType)
setCharacterEncoding(encoding, EncodingFrom.INFERRED); setCharacterEncoding(encoding, EncodingFrom.DEFAULT);
return encoding; return encoding;
} }
@ -1083,18 +1088,8 @@ public class Response implements HttpServletResponse
{ {
case NOT_SET: case NOT_SET:
break; break;
case DEFAULT:
case INFERRED: case INFERRED:
if (isWriting())
{
_contentType = _contentType + ";charset=" + _characterEncoding;
_mimeType = MimeTypes.CACHE.get(_contentType);
}
else
{
_encodingFrom = EncodingFrom.NOT_SET;
_characterEncoding = null;
}
break;
case SET_CONTENT_TYPE: case SET_CONTENT_TYPE:
case SET_LOCALE: case SET_LOCALE:
case SET_CHARACTER_ENCODING: case SET_CHARACTER_ENCODING:
@ -1294,8 +1289,7 @@ public class Response implements HttpServletResponse
protected MetaData.Response newResponseMetaData() protected MetaData.Response newResponseMetaData()
{ {
MetaData.Response info = new MetaData.Response(_channel.getRequest().getHttpVersion(), getStatus(), getReason(), _fields, getLongContentLength(), getTrailers()); return new MetaData.Response(_channel.getRequest().getHttpVersion(), getStatus(), getReason(), _fields, getLongContentLength(), getTrailers());
return info;
} }
/** /**
@ -1337,11 +1331,9 @@ public class Response implements HttpServletResponse
_fields.remove(HttpHeader.CONTENT_LANGUAGE); _fields.remove(HttpHeader.CONTENT_LANGUAGE);
if (_encodingFrom == EncodingFrom.SET_LOCALE) if (_encodingFrom == EncodingFrom.SET_LOCALE)
setCharacterEncoding(null, EncodingFrom.NOT_SET); setCharacterEncoding(null, EncodingFrom.NOT_SET);
return;
} }
else else
{ {
_locale = locale; _locale = locale;
_fields.put(HttpHeader.CONTENT_LANGUAGE, StringUtil.replace(locale.toString(), '_', '-')); _fields.put(HttpHeader.CONTENT_LANGUAGE, StringUtil.replace(locale.toString(), '_', '-'));