From 43fba60aef2dd3052292f83f5807727b13b2b4fe Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Mon, 22 Dec 2014 10:07:32 +0000 Subject: QPID-6276: [Java Broker] Don't set caching headers when using content-disposition attachment (prevents IE8 failure). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1647277 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/management/plugin/servlet/rest/RestServlet.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index 52c9b10e59..883da04b3d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java @@ -330,8 +330,14 @@ public class RestServlet extends AbstractServlet response.setContentType("application/json"); response.setStatus(HttpServletResponse.SC_OK); - setCachingHeadersOnResponse(response); - setContentDispositionHeaderIfNecessary(response, attachmentFilename); + if (attachmentFilename == null) + { + setCachingHeadersOnResponse(response); + } + else + { + setContentDispositionHeaderIfNecessary(response, attachmentFilename); + } Collection> allObjects = getObjects(request); -- cgit v1.2.1