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

Issue #3681 

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2019-05-23 12:33:35 +02:00
parent 4dc004cf96
commit 53dc425bde
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
View File

@ -66,7 +66,7 @@ public class HttpFields implements Iterable<HttpField>
*/ */
public HttpFields() public HttpFields()
{ {
this(16 ); // TODO tune default. Currently based on small same of Chrome requests. this(16); // TODO tune default. Currently based on small sample of Chrome requests.
} }
/** /**
@ -116,7 +116,7 @@ public class HttpFields implements Iterable<HttpField>
public Stream<HttpField> stream() public Stream<HttpField> stream()
{ {
return Arrays.stream(_fields).filter(f->f!=null); return Arrays.stream(_fields).limit(_size);
} }
/** /**

10
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -666,13 +666,11 @@ public class Request implements HttpServletRequest
{ {
if (_characterEncoding==null) if (_characterEncoding==null)
{ {
if (_contentType==null) String contentType = getContentType();
getContentType(); if (contentType!=null)
if (_contentType!=null)
{ {
MimeTypes.Type mime = MimeTypes.CACHE.get(contentType);
MimeTypes.Type mime = MimeTypes.CACHE.get(_contentType); String charset = (mime == null || mime.getCharset() == null) ? MimeTypes.getCharsetFromContentType(contentType) : mime.getCharset().toString();
String charset = (mime == null || mime.getCharset() == null) ? MimeTypes.getCharsetFromContentType(_contentType) : mime.getCharset().toString();
if (charset != null) if (charset != null)
_characterEncoding=charset; _characterEncoding=charset;
} }