SAK-49840 remove old-style, redundant caching declarations (sakaiproj…

…ect#12433)
mollerentornos · Mar 18, 2024 · 3f9e265 · 3f9e265
1 parent d82cde5
commit 3f9e265
Show file tree

Hide file tree

Showing 40 changed files with 34 additions and 171 deletions.
diff --git a/admin-su/src/webapp/su/main.jsp b/admin-su/src/webapp/su/main.jsp
@@ -4,10 +4,7 @@
 
 <%
 	response.setContentType("text/html; charset=UTF-8");
-	response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-	response.addDateHeader("Last-Modified", System.currentTimeMillis());
-	response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-	response.addHeader("Pragma", "no-cache");
+	response.addHeader("Cache-Control", "no-store");
 %>
 
 <f:view>

diff --git a/admin-su/src/webapp/su/redirect.jsp b/admin-su/src/webapp/su/redirect.jsp
@@ -4,10 +4,7 @@
 
 <%
 	response.setContentType("text/html; charset=UTF-8");
-	response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-	response.addDateHeader("Last-Modified", System.currentTimeMillis());
-	response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-	response.addHeader("Pragma", "no-cache");
+	response.addHeader("Cache-Control", "no-store");
 %>
 
 <f:view>

diff --git a/admin-su/src/webapp/su/unauthorized.jsp b/admin-su/src/webapp/su/unauthorized.jsp
@@ -4,10 +4,7 @@
 
 <%
 	response.setContentType("text/html; charset=UTF-8");
-	response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-	response.addDateHeader("Last-Modified", System.currentTimeMillis());
-	response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-	response.addHeader("Pragma", "no-cache");
+	response.addHeader("Cache-Control", "no-store");
 %>
 
 <f:view>

diff --git a/...nt/tool/src/java/org/sakaiproject/assignment/tool/RedirectingAssignmentEntityServlet.java b/...nt/tool/src/java/org/sakaiproject/assignment/tool/RedirectingAssignmentEntityServlet.java
@@ -151,14 +151,7 @@ public void handleAccess(EntityView view, HttpServletRequest req,
 	// set standard no-cache headers
 	protected void setNoCacheHeaders(HttpServletResponse resp) {
 		resp.setContentType("text/html; charset=UTF-8");
-		// some old date
-		resp.addHeader("Expires", "Mon, 01 Jan 2001 00:00:00 GMT");
-		// TODO: do we need this? adding a date header is expensive contention
-		// for the date formatter, ours or Tomcats.
-		// resp.addDateHeader("Last-Modified", System.currentTimeMillis());
-		resp.addHeader("Cache-Control",
-				"no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		resp.addHeader("Pragma", "no-cache");
+		resp.addHeader("Cache-Control", "no-store");
 	}
 
 	private void clearSessionAttributes(Session session) {

diff --git a/basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIUtil.java b/basiclti/tsugi-util/src/java/org/tsugi/basiclti/BasicLTIUtil.java
@@ -1481,10 +1481,7 @@ public static void sendHTMLPage(HttpServletResponse res, String body)
 		{
 			res.setContentType("text/html; charset=UTF-8");
 			res.setCharacterEncoding("utf-8");
-			res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-			res.addDateHeader("Last-Modified", System.currentTimeMillis());
-			res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-			res.addHeader("Pragma", "no-cache");
+			res.addHeader("Cache-Control", "no-store");
 			java.io.PrintWriter out = res.getWriter();
 
 			out.println("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">");

diff --git a/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/calendar.jsp b/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/calendar.jsp
@@ -4,10 +4,7 @@
 
 <% 
 	response.setContentType("text/html; charset=UTF-8");
-	response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-	response.addDateHeader("Last-Modified", System.currentTimeMillis());
-	response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-	response.addHeader("Pragma", "no-cache");
+	response.addHeader("Cache-Control", "no-store");
 %>
 
 <f:view>

diff --git a/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/prefs.jsp b/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/prefs.jsp
@@ -3,10 +3,7 @@
 <%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai"%>
 <% 
 	response.setContentType("text/html; charset=UTF-8");
-	response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-	response.addDateHeader("Last-Modified", System.currentTimeMillis());
-	response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-	response.addHeader("Pragma", "no-cache");
+	response.addHeader("Cache-Control", "no-store");
 %>
 
 <f:view>

diff --git a/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/subscribe.jsp b/calendar/calendar-summary-tool/tool/src/webapp/summary-calendar/subscribe.jsp
@@ -3,10 +3,7 @@
 <%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai"%>
 <% 
 	response.setContentType("text/html; charset=UTF-8");
-	response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-	response.addDateHeader("Last-Modified", System.currentTimeMillis());
-	response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-	response.addHeader("Pragma", "no-cache");
+	response.addHeader("Cache-Control", "no-store");
 %>
 
 <f:view>

diff --git a/chat/chat-tool/tool/src/webapp/jsp/prelude.jspf b/chat/chat-tool/tool/src/webapp/jsp/prelude.jspf
@@ -6,8 +6,5 @@
 <%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%
     response.setContentType("text/html; charset=UTF-8");
-    response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-    response.addDateHeader("Last-Modified", System.currentTimeMillis());
-    response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-    response.addHeader("Pragma", "no-cache");
-%>
+    response.addHeader("Cache-Control", "no-store");
+%>
diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityHandlerImpl.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityHandlerImpl.java
@@ -975,13 +975,7 @@ private void handleClassLoaderAccess(EntityViewAccessProvider accessProvider,
     protected void setNoCacheHeaders(HttpServletResponse res) {
         long currentTime = System.currentTimeMillis();
         res.setDateHeader(ActionReturn.Header.DATE.toString(), currentTime);
-        res.setDateHeader(ActionReturn.Header.EXPIRES.toString(), currentTime + 1000);
-
-        res.setHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "must-revalidate");
-        res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "private");
         res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "no-store");
-        res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "max-age=0");
-        res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "s-maxage=0");
     }
 
     /**
@@ -1014,20 +1008,11 @@ protected void setResponseHeaders(EntityView view, HttpServletResponse res, Map<
 
         // set the cache headers
         res.setDateHeader(ActionReturn.Header.DATE.toString(), currentTime);
-        res.setDateHeader(ActionReturn.Header.EXPIRES.toString(), currentTime + 600000);
 
         if (noCache) {
-            res.setHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "must-revalidate");
-            res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "private");
             res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "no-store");
-            res.setDateHeader(ActionReturn.Header.EXPIRES.toString(), currentTime + 1000);
-            res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "max-age=0");
-            res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "s-maxage=0");
         } else {
-            // response.addHeader("Cache-Control", "must-revalidate");
-            res.setHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "public");
             res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "max-age=600");
-            res.addHeader(ActionReturn.Header.CACHE_CONTROL.toString(), "s-maxage=600");
         }
 
         // set the EB specific headers

diff --git a/help/help-tool/src/webapp/search/main.jsp b/help/help-tool/src/webapp/search/main.jsp
@@ -7,10 +7,7 @@
 <%@ taglib uri="http://sakaiproject.org/jsf/help" prefix="help" %>
 <%
 		response.setContentType("text/html; charset=UTF-8");
-		response.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-		response.addDateHeader("Last-Modified", System.currentTimeMillis());
-		response.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		response.addHeader("Pragma", "no-cache");
+		response.addHeader("Cache-Control", "no-store");
 %>
 <f:view>
 <sakai:view_container title="#{msgs.title_edit}">

diff --git a/jsf/jsf-spreadsheet/src/java/org/sakaiproject/jsf/spreadsheet/SpreadsheetUtil.java b/jsf/jsf-spreadsheet/src/java/org/sakaiproject/jsf/spreadsheet/SpreadsheetUtil.java
@@ -77,7 +77,6 @@ public static void downloadSpreadsheetData(List<List<Object>> spreadsheetData, S
      */
     private static void protectAgainstInstantDeletion(HttpServletResponse response) {
         response.reset();	// Eliminate the added-on stuff
-        response.setHeader("Pragma", "public");	// Override old-style cache control
         response.setHeader("Cache-Control", "public, must-revalidate, post-check=0, pre-check=0, max-age=0");	// New-style
     }
 

diff --git a/jsf/jsf-tool/src/java/org/sakaiproject/jsf/util/HelperAwareJsfTool.java b/jsf/jsf-tool/src/java/org/sakaiproject/jsf/util/HelperAwareJsfTool.java
@@ -160,10 +160,7 @@ protected void dispatch(HttpServletRequest req, HttpServletResponse res) throws
 
       // TODO: Should setting the HTTP headers be moved up to the portal level as well?
       res.setContentType("text/html; charset=UTF-8");
-      res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-      res.addDateHeader("Last-Modified", System.currentTimeMillis());
-      res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-      res.addHeader("Pragma", "no-cache");
+      res.addHeader("Cache-Control", "no-store");
 
       // dispatch to the target
       log.debug("dispatching path: " + req.getPathInfo() + " to: " + target + " context: "

diff --git a/jsf/jsf-tool/src/java/org/sakaiproject/jsf/util/JsfTool.java b/jsf/jsf-tool/src/java/org/sakaiproject/jsf/util/JsfTool.java
@@ -212,10 +212,7 @@ protected void dispatch(HttpServletRequest req, HttpServletResponse res) throws
 
 		// TODO: Should setting the HTTP headers be moved up to the portal level as well?
 		res.setContentType("text/html; charset=UTF-8");
-		res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-		res.addDateHeader("Last-Modified", System.currentTimeMillis());
-		res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		res.addHeader("Pragma", "no-cache");
+		res.addHeader("Cache-Control", "no-store");
 
 		// dispatch to the target
 		log.debug("dispatching path: " + req.getPathInfo() + " to: " + target + " context: "

diff --git a/jsf2/jsf2-spreadsheet/src/java/org/sakaiproject/jsf2/spreadsheet/SpreadsheetUtil.java b/jsf2/jsf2-spreadsheet/src/java/org/sakaiproject/jsf2/spreadsheet/SpreadsheetUtil.java
@@ -70,7 +70,6 @@ public static void downloadSpreadsheetData(List<List<Object>> spreadsheetData, S
      */
     private static void protectAgainstInstantDeletion(HttpServletResponse response) {
         response.reset();	// Eliminate the added-on stuff
-        response.setHeader("Pragma", "public");	// Override old-style cache control
         response.setHeader("Cache-Control", "public, must-revalidate, post-check=0, pre-check=0, max-age=0");	// New-style
     }
 

diff --git a/jsf2/jsf2-tool/src/java/org/sakaiproject/jsf2/util/HelperAwareJsfTool.java b/jsf2/jsf2-tool/src/java/org/sakaiproject/jsf2/util/HelperAwareJsfTool.java
@@ -146,10 +146,7 @@ protected void dispatch(HttpServletRequest req, HttpServletResponse res) throws
 
       // TODO: Should setting the HTTP headers be moved up to the portal level as well?
       res.setContentType("text/html; charset=UTF-8");
-      res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-      res.addDateHeader("Last-Modified", System.currentTimeMillis());
-      res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-      res.addHeader("Pragma", "no-cache");
+      res.addHeader("Cache-Control", "no-store");
 
       // dispatch to the target
       log.debug("dispatching path: " + req.getPathInfo() + " to: " + target + " context: "

diff --git a/jsf2/jsf2-tool/src/java/org/sakaiproject/jsf2/util/JsfTool.java b/jsf2/jsf2-tool/src/java/org/sakaiproject/jsf2/util/JsfTool.java
@@ -202,10 +202,7 @@ protected void dispatch(HttpServletRequest req, HttpServletResponse res) throws
 
 		// TODO: Should setting the HTTP headers be moved up to the portal level as well?
 		res.setContentType("text/html; charset=UTF-8");
-		res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-		res.addDateHeader("Last-Modified", System.currentTimeMillis());
-		res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		res.addHeader("Pragma", "no-cache");
+		res.addHeader("Cache-Control", "no-store");
 
 		// dispatch to the target
 		log.debug("dispatching path: " + req.getPathInfo() + " to: " + target + " context: "

diff --git a/login/login-authn-tool/tool/src/java/org/sakaiproject/login/tool/AuthnPortal.java b/login/login-authn-tool/tool/src/java/org/sakaiproject/login/tool/AuthnPortal.java
@@ -292,10 +292,7 @@ protected PrintWriter startResponse(HttpServletResponse res, String title, Strin
 	{
 		// headers
 		res.setContentType("text/html; charset=UTF-8");
-		res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-		res.addDateHeader("Last-Modified", System.currentTimeMillis());
-		res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		res.addHeader("Pragma", "no-cache");
+		res.addHeader("Cache-Control", "no-store");
 
 		// get the writer
 		PrintWriter out = res.getWriter();

diff --git a/login/login-tool/tool/src/java/org/sakaiproject/login/tool/SkinnableLogin.java b/login/login-tool/tool/src/java/org/sakaiproject/login/tool/SkinnableLogin.java
@@ -416,11 +416,7 @@ public void sendResponse(LoginRenderContext rcontext, HttpServletResponse res,
 		{
 			res.setContentType(contentType);
 		}
-		res.addDateHeader("Expires", System.currentTimeMillis()
-				- (1000L * 60L * 60L * 24L * 365L));
-		res.addDateHeader("Last-Modified", System.currentTimeMillis());
-		res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		res.addHeader("Pragma", "no-cache");
+		res.addHeader("Cache-Control", "no-store");
 
 		// get the writer
 		PrintWriter out = res.getWriter();

diff --git a/...rums-app/src/java/org/sakaiproject/tool/messageforums/MessageForumsFilePickerServlet.java b/...rums-app/src/java/org/sakaiproject/tool/messageforums/MessageForumsFilePickerServlet.java
@@ -161,10 +161,7 @@ protected void dispatch(HttpServletRequest req, HttpServletResponse res) throws
         // TODO: Should setting the HTTP headers be moved up to the portal level
         // as well?
         res.setContentType("text/html; charset=UTF-8");
-        res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-        res.addDateHeader("Last-Modified", System.currentTimeMillis());
-        res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-        res.addHeader("Pragma", "no-cache");
+        res.addHeader("Cache-Control", "no-store");
 
         // dispatch to the target
         RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(target);

diff --git a/...messageforums-app/src/java/org/sakaiproject/tool/messageforums/jsf/AjaxPhaseListener.java b/...messageforums-app/src/java/org/sakaiproject/tool/messageforums/jsf/AjaxPhaseListener.java
@@ -38,10 +38,8 @@ public void afterPhase(PhaseEvent event) {
 		if ("true".equals(ajax)) {
 			try {
 				ServletOutputStream out = response.getOutputStream();
-				response.setHeader("Pragma", "No-Cache");
 				response.setHeader("Cache-Control",
 						"no-cache,no-store,max-age=0");
-				response.setDateHeader("Expires", 1);
 				if (action == null) {
 					out.println("FAIL");
 				} else if ("markMessageAsRead".equals(action)) {

diff --git a/...orums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumStatisticsBean.java b/...orums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumStatisticsBean.java
@@ -2348,9 +2348,7 @@ public void processExportDataTableByUser() {
 		httpServletResponse.setHeader("Content-Disposition", "attachment;filename=Stats-Grading-Users.csv");
 		try {
 			out = httpServletResponse.getOutputStream();
-			httpServletResponse.setHeader("Pragma", "No-Cache");
 			httpServletResponse.setHeader("Cache-Control", "no-cache,no-store,max-age=0");
-			httpServletResponse.setDateHeader("Expires", 1);
 
 			StringBuilder builderHeader = new StringBuilder();
 			builderHeader.append("Student ID,Name,Authored - New,Authored - Replies,Authored - Total,Read,Unread,Percent Read");
@@ -2401,9 +2399,7 @@ public void processExportDataTableByTopic() {
 		httpServletResponse.setHeader("Content-Disposition", "attachment;filename=Stats-Grading-Topics.csv");
 		try {
 			out = httpServletResponse.getOutputStream();
-			httpServletResponse.setHeader("Pragma", "No-Cache");
 			httpServletResponse.setHeader("Cache-Control", "no-cache,no-store,max-age=0");
-			httpServletResponse.setDateHeader("Expires", 1);
 
 			StringBuilder builderHeader = new StringBuilder();
 			builderHeader.append("Forum Title,Topic Title,Date,Total Messages");

diff --git a/portal/editor-tool/tool/src/java/org/sakaiproject/editor/EditorServlet.java b/portal/editor-tool/tool/src/java/org/sakaiproject/editor/EditorServlet.java
@@ -131,7 +131,6 @@ else if (EDITOR_LAUNCH_JS.equals(name)) {
 				res.sendRedirect(editor.getLaunchUrl());
 			}
 			else if (EDITOR_BOOTSTRAP_JS.equals(name)) {
-				res.addHeader("Pragma", "no-cache");
 				res.addHeader("Cache-Control", "no-cache");
 				res.addHeader("Content-Type", "text/javascript");
 

diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -1780,10 +1780,7 @@ public void sendResponse(PortalRenderContext rcontext, HttpServletResponse res,
             throws IOException {
         // headers
         res.setContentType(Objects.requireNonNullElse(contentType, "text/html; charset=UTF-8"));
-        res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-        res.addDateHeader("Last-Modified", System.currentTimeMillis());
-        res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-        res.addHeader("Pragma", "no-cache");
+        res.addHeader("Cache-Control", "no-store");
 
         // get the writer
         PrintWriter out = res.getWriter();

diff --git a/portal/portal-util/util/src/java/org/sakaiproject/portal/util/ErrorReporter.java b/portal/portal-util/util/src/java/org/sakaiproject/portal/util/ErrorReporter.java
@@ -438,11 +438,7 @@ public void report(HttpServletRequest req, HttpServletResponse res,
 			// headers
 			res.setStatus(javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 			res.setContentType("text/html; charset=UTF-8");
-			res.addDateHeader("Expires", System.currentTimeMillis()
-					- (1000L * 60L * 60L * 24L * 365L));
-			res.addDateHeader("Last-Modified", System.currentTimeMillis());
 			res.addHeader("Cache-Control", "no-store, max-age=0");
-			res.addHeader("Pragma", "no-cache");
 
 			PrintWriter out = null;
 			try {
@@ -763,11 +759,7 @@ public void thanksResponse(HttpServletRequest req, HttpServletResponse res)
 		{
 			// headers
 			res.setContentType("text/html; charset=UTF-8");
-			res.addDateHeader("Expires", System.currentTimeMillis()
-					- (1000L * 60L * 60L * 24L * 365L));
-			res.addDateHeader("Last-Modified", System.currentTimeMillis());
 			res.addHeader("Cache-Control", "no-store, max-age=0");
-			res.addHeader("Pragma", "no-cache");
 
 			PrintWriter out = res.getWriter();
 			out.println("<!DOCTYPE html>");

diff --git a/presence/presence-tool/tool/src/java/org/sakaiproject/presence/tool/PresenceTool.java b/presence/presence-tool/tool/src/java/org/sakaiproject/presence/tool/PresenceTool.java
@@ -292,10 +292,7 @@ protected PrintWriter startResponse(HttpServletRequest req, HttpServletResponse
 	{
 		// headers
 		res.setContentType("text/html; charset=UTF-8");
-		res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-		res.addDateHeader("Last-Modified", System.currentTimeMillis());
-		res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-		res.addHeader("Pragma", "no-cache");
+		res.addHeader("Cache-Control", "no-store");
 
 		// get the writer
 		PrintWriter out = res.getWriter();

diff --git a/...e2/tool/src/java/org/sakaiproject/profile2/tool/entityprovider/ProfileEntityProvider.java b/...e2/tool/src/java/org/sakaiproject/profile2/tool/entityprovider/ProfileEntityProvider.java
@@ -215,9 +215,7 @@ public Object getProfileImage(OutputStream out, EntityView view, Map<String,Obje
 				ActionReturn actionReturn = new ActionReturn("UTF-8", image.getMimeType(), out);
 
 				Map<String,String> headers = new HashMap<>();
-				headers.put("Expires", "Mon, 01 Jan 2001 00:00:00 GMT");
-				headers.put("Cache-Control","no-cache, must-revalidate, max-age=0");
-				headers.put("Pragma", "no-cache");
+				headers.put("Cache-Control","no-store");
 
 				actionReturn.setHeaders(headers);
 
@@ -231,9 +229,7 @@ public Object getProfileImage(OutputStream out, EntityView view, Map<String,Obje
 		if(StringUtils.isNotBlank(url)) {
 			try {
 				HttpServletResponse res = requestGetter.getResponse();
-				res.addHeader("Expires", "Mon, 01 Jan 2001 00:00:00 GMT");
-				res.addHeader("Cache-Control","no-cache, must-revalidate, max-age=0");
-				res.addHeader("Pragma", "no-cache");
+				res.addHeader("Cache-Control","no-store");
 				res.sendRedirect(url);
 			} catch (IOException e) {
 				throw new EntityException("Error redirecting to external image for " + id + " : " + e.getMessage(), ref.getReference());
@@ -483,9 +479,7 @@ public Object getNamePronunciation(OutputStream out, EntityView view, Map<String
 			try {
 				HttpServletResponse response = requestGetter.getResponse();
 				HttpServletRequest request = requestGetter.getRequest();
-				response.setHeader("Expires", "0");
-				response.setHeader("Pragma", "no-cache");
-				response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+				response.setHeader("Cache-Control", "no-store");
 				response.setContentType(mtba.getMimeType());
 
 				// Are we processing a Range request

diff --git a/samigo/samigo-app/src/java/org/sakaiproject/jsf/util/SamigoJsfTool.java b/samigo/samigo-app/src/java/org/sakaiproject/jsf/util/SamigoJsfTool.java
@@ -280,10 +280,7 @@ protected void dispatch(HttpServletRequest req, HttpServletResponse res) throws
 
       // TODO: Should setting the HTTP headers be moved up to the portal level as well?
       res.setContentType("text/html; charset=UTF-8");
-      res.addDateHeader("Expires", System.currentTimeMillis() - (1000L * 60L * 60L * 24L * 365L));
-      res.addDateHeader("Last-Modified", System.currentTimeMillis());
-      res.addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0");
-      res.addHeader("Pragma", "no-cache");
+      res.addHeader("Cache-Control", "no-store");
 
       // dispatch to the target
       log.debug("***5. dispatch, dispatching path: " + req.getPathInfo() + " to: " + target + " context: "