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

416663 Content-length set by resourcehandler

This commit is contained in:
Greg Wilkins 2013-09-06 09:18:22 +10:00
parent b8a4bf37e6
commit ee52769dea
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,10 +135,10 @@ public class Response implements HttpServletResponse
Response response = _channel.getResponse(); Response response = _channel.getResponse();
String contentType = httpContent.getContentType(); String contentType = httpContent.getContentType();
if (contentType != null && !response.getHttpFields().containsKey(HttpHeader.CONTENT_TYPE.asString())) if (contentType != null && !response.getHttpFields().containsKey(HttpHeader.CONTENT_TYPE.asString()))
response.getHttpFields().put(HttpHeader.CONTENT_TYPE, contentType); setContentType(contentType);
if (httpContent.getContentLength() > 0) if (httpContent.getContentLength() > 0)
response.getHttpFields().putLongField(HttpHeader.CONTENT_LENGTH, httpContent.getContentLength()); setLongContentLength(httpContent.getContentLength());
String lm = httpContent.getLastModified(); String lm = httpContent.getLastModified();
if (lm != null) if (lm != null)

7
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
View File

@ -602,19 +602,20 @@ public class ResourceHandler extends HandlerWrapper
HttpFields fields = ((Response)response).getHttpFields(); HttpFields fields = ((Response)response).getHttpFields();
if (length>0) if (length>0)
fields.putLongField(HttpHeader.CONTENT_LENGTH,length); ((Response)response).setLongContentLength(length);
if (_cacheControl!=null) if (_cacheControl!=null)
fields.put(HttpHeader.CACHE_CONTROL,_cacheControl); fields.put(HttpHeader.CACHE_CONTROL,_cacheControl);
} }
else else
{ {
if (length>0) if (length>Integer.MAX_VALUE)
response.setHeader(HttpHeader.CONTENT_LENGTH.asString(),Long.toString(length)); response.setHeader(HttpHeader.CONTENT_LENGTH.asString(),Long.toString(length));
else if (length>0)
response.setContentLength((int)length);
if (_cacheControl!=null) if (_cacheControl!=null)
response.setHeader(HttpHeader.CACHE_CONTROL.asString(),_cacheControl.toString()); response.setHeader(HttpHeader.CACHE_CONTROL.asString(),_cacheControl.toString());
} }
} }
} }

1
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
View File

@ -988,7 +988,6 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory
else else
// Handle cached resource // Handle cached resource
(resource).writeTo(multi,start,size); (resource).writeTo(multi,start,size);
} }
if (in!=null) if (in!=null)
in.close(); in.close();