Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ResourceHttpRequestHandler sends content without content-type header if no media type found (SPR-7713)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-12-06 22:50:33 +00:00
parent 7eeb654eec
commit f8402e9f82
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@@ -109,15 +109,13 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
MediaType mediaType = getMediaType(resource);
if (mediaType != null) {
if (logger.isDebugEnabled()) {
logger.debug("Determined media type [" + mediaType + "] for " + resource);
logger.debug("Determined media type '" + mediaType + "' for " + resource);
}
}
else {
if (logger.isDebugEnabled()) {
logger.debug("No media type found for " + resource + " - returning 404");
logger.debug("No media type found for " + resource + " - not sending a content-type header");
}
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
// header phase
@@ -207,7 +205,10 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
throw new IOException("Resource content too long (beyond Integer.MAX_VALUE): " + resource);
}
response.setContentLength((int) length);
response.setContentType(mediaType.toString());
if (mediaType != null) {
response.setContentType(mediaType.toString());
}
}
/**