From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 20 Jun 2010 14:37:16 +0000 (+0000)
Subject: Explicitly disable caching for left_main and right_main pages (#2983134)
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=99491db0312426e7aae1807057dca6d688369629

Explicitly disable caching for left_main and right_main pages (#2983134)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13940 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 358c3153..ff9a78c6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -337,6 +337,7 @@ Version 1.5.2 - SVN
     leakage when Firefox does DNS prefetching for URLs contained in emails.
   - Added the ability to configure Google Mail (Gmail) as the mail server
     behind SquirrelMail.
+  - Explicitly disable caching for left_main and right_main pages (#2983134).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------
diff --git a/src/left_main.php b/src/left_main.php
index 80d71720..24f32253 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -15,6 +15,11 @@
 /** This is the left_main page */
 define('PAGE_NAME', 'left_main');
 
+/* Disable browser caching */
+header('Cache-Control: no-cache, no-store, must-revalidate');
+header('Pragma: no-cache');
+header('Expires: ' . gmdate(DATE_RFC1123, time()-1));
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -45,9 +50,7 @@ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort,
  */
 if (!empty($left_refresh) &&
     !stristr($left_refresh, 'none')){
-    $xtra =  "\n<meta http-equiv=\"Expires\" content=\"Thu, 01 Dec 1994 16:00:00 GMT\" />\n" .
-             "<meta http-equiv=\"Pragma\" content=\"no-cache\" />\n".
-             "<meta http-equiv=\"REFRESH\" content=\"$left_refresh;URL=left_main.php\" />\n";
+    $xtra =  "\n<meta http-equiv=\"REFRESH\" content=\"$left_refresh;URL=left_main.php\" />\n";
 } else {
     $xtra = '';
 }
diff --git a/src/right_main.php b/src/right_main.php
index eb724782..ef2797da 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -17,6 +17,10 @@ define('PAGE_NAME', 'right_main');
 
 //xdebug_start_profiling("/var/spool/xdebug/right_main.txt");
 
+/* Disable browser caching */
+header('Cache-Control: no-cache, no-store, must-revalidate');
+header('Pragma: no-cache');
+header('Expires: ' . gmdate(DATE_RFC1123, time()-1));
 
 /**
  * Include the SquirrelMail initialization file.