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

jhoeller · jhoeller · commit f8402e9f821d · 2011-12-06T22:50:33.000Z
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -109,15 +109,13 @@ public void handleRequest(HttpServletRequest request, HttpServletResponse respon
 		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 @@ protected void setHeaders(HttpServletResponse response, Resource resource, Media
 			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());
+		}
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -109,15 +109,13 @@ public void handleRequest(HttpServletRequest request, HttpServletResponse respon`
`109`	`109`	`MediaType mediaType = getMediaType(resource);`
`110`	`110`	`if (mediaType != null) {`
`111`	`111`	`if (logger.isDebugEnabled()) {`
`112`		`- logger.debug("Determined media type [" + mediaType + "] for " + resource);`
	`112`	`+ logger.debug("Determined media type '" + mediaType + "' for " + resource);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`else {`
`116`	`116`	`if (logger.isDebugEnabled()) {`
`117`		`- logger.debug("No media type found for " + resource + " - returning 404");`
	`117`	`+ logger.debug("No media type found for " + resource + " - not sending a content-type header");`
`118`	`118`	`}`
`119`		`- response.sendError(HttpServletResponse.SC_NOT_FOUND);`
`120`		`- return;`
`121`	`119`	`}`
`122`	`120`
`123`	`121`	`// header phase`
`@@ -207,7 +205,10 @@ protected void setHeaders(HttpServletResponse response, Resource resource, Media`
`207`	`205`	`throw new IOException("Resource content too long (beyond Integer.MAX_VALUE): " + resource);`
`208`	`206`	`}`
`209`	`207`	`response.setContentLength((int) length);`
`210`		`- response.setContentType(mediaType.toString());`
	`208`	`+`
	`209`	`+ if (mediaType != null) {`
	`210`	`+ response.setContentType(mediaType.toString());`
	`211`	`+ }`
`211`	`212`	`}`
`212`	`213`
`213`	`214`	`/**`