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 2016-06-01 15:30:13 +10:00
parent 833f291975 c2831bf09c
commit 5c33a119da
2 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import java.nio.channels.IllegalSelectorException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
@ -109,12 +110,15 @@ public class Response implements HttpServletResponse
private Locale _locale;
private MimeTypes.Type _mimeType;
private String _characterEncoding;
private boolean _explicitEncoding;
private EncodingFrom _encodingFrom=EncodingFrom.NOT_SET;
private String _contentType;
private OutputType _outputType = OutputType.NONE;
private ResponseWriter _writer;
private long _contentLength = -1;
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);
public Response(HttpChannel channel, HttpOutput out)
{
@ -139,7 +143,7 @@ public class Response implements HttpServletResponse
_contentLength = -1;
_out.recycle();
_fields.clear();
_explicitEncoding=false;
_encodingFrom=EncodingFrom.NOT_SET;
}
public HttpOutput getHttpOutput()
@ -857,7 +861,7 @@ public class Response implements HttpServletResponse
encoding = MimeTypes.inferCharsetFromContentType(_contentType);
if (encoding == null)
encoding = StringUtil.__ISO_8859_1;
setCharacterEncoding(encoding,false);
setCharacterEncoding(encoding,EncodingFrom.INFERRED);
}
}
@ -973,10 +977,10 @@ public class Response implements HttpServletResponse
@Override
public void setCharacterEncoding(String encoding)
{
setCharacterEncoding(encoding,true);
setCharacterEncoding(encoding,EncodingFrom.SET_CHARACTER_ENCODING);
}
private void setCharacterEncoding(String encoding, boolean explicit)
private void setCharacterEncoding(String encoding, EncodingFrom from)
{
if (isIncluding() || isWriting())
return;
@ -985,7 +989,7 @@ public class Response implements HttpServletResponse
{
if (encoding == null)
{
_explicitEncoding=false;
_encodingFrom=EncodingFrom.NOT_SET;
// Clear any encoding.
if (_characterEncoding != null)
@ -1008,7 +1012,7 @@ public class Response implements HttpServletResponse
else
{
// No, so just add this one to the mimetype
_explicitEncoding = explicit;
_encodingFrom = from;
_characterEncoding = HttpGenerator.__STRICT?encoding:StringUtil.normalizeCharset(encoding);
if (_mimeType!=null)
{
@ -1058,10 +1062,29 @@ public class Response implements HttpServletResponse
if (charset == null)
{
if (_characterEncoding != null)
switch (_encodingFrom)
{
_contentType = contentType + ";charset=" + _characterEncoding;
_mimeType = null;
case NOT_SET:
break;
case INFERRED:
case SET_CONTENT_TYPE:
if (isWriting())
{
_mimeType=null;
_contentType = _contentType + ";charset=" + _characterEncoding;
}
else
{
_encodingFrom=EncodingFrom.NOT_SET;
_characterEncoding=null;
}
break;
case SET_LOCALE:
case SET_CHARACTER_ENCODING:
{
_contentType = contentType + ";charset=" + _characterEncoding;
_mimeType = null;
}
}
}
else if (isWriting() && !charset.equalsIgnoreCase(_characterEncoding))
@ -1075,7 +1098,7 @@ public class Response implements HttpServletResponse
else
{
_characterEncoding = charset;
_explicitEncoding = true;
_encodingFrom = EncodingFrom.SET_CONTENT_TYPE;
}
if (HttpGenerator.__STRICT || _mimeType==null)
@ -1226,8 +1249,8 @@ public class Response implements HttpServletResponse
String charset = _channel.getRequest().getContext().getContextHandler().getLocaleEncoding(locale);
if (charset != null && charset.length() > 0 && !_explicitEncoding)
setCharacterEncoding(charset,false);
if (charset != null && charset.length() > 0 && __localeOverride.contains(_encodingFrom))
setCharacterEncoding(charset,EncodingFrom.SET_LOCALE);
}
@Override

34
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
View File

@ -169,7 +169,7 @@ public class ResponseTest
assertEquals("text/html", response.getContentType());
response.getWriter();
assertEquals("text/html;charset=utf-8", response.getContentType());
response.setContentType("foo2/bar2");
response.setContentType("foo2/bar2;charset=utf-8");
assertEquals("foo2/bar2;charset=utf-8", response.getContentType());
response.recycle();
@ -361,6 +361,38 @@ public class ResponseTest
assertEquals("text/xml;charset=utf-8", response.getContentType());
}
@Test
public void testResetContentTypeWithoutCharacterEncoding() throws Exception
{
Response response = newResponse();
response.setCharacterEncoding("utf-8");
response.setContentType("wrong/answer");
response.setContentType("foo/bar");
assertEquals("foo/bar;charset=utf-8", response.getContentType());
response.getWriter();
response.setContentType("foo2/bar2");
assertEquals("foo2/bar2;charset=utf-8", response.getContentType());
}
@Test
public void testResetContentTypeWithCharacterEncoding() throws Exception
{
Response response = newResponse();
response.setContentType("wrong/answer;charset=utf-8");
response.setContentType("foo/bar");
assertEquals("foo/bar", response.getContentType());
response.setContentType("wrong/answer;charset=utf-8");
response.getWriter();
response.setContentType("foo2/bar2;charset=utf-16");
assertEquals("foo2/bar2;charset=utf-8", response.getContentType());
}
@Test
public void testContentTypeWithOther() throws Exception
{