Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.278
diff -u -p -r1.278 bootstrap.inc
--- includes/bootstrap.inc	30 Apr 2009 16:15:44 -0000	1.278
+++ includes/bootstrap.inc	8 May 2009 01:14:22 -0000
@@ -897,7 +897,7 @@ function drupal_page_header() {
   $default_headers = array(
     'Expires' => 'Sun, 19 Nov 1978 05:00:00 GMT',
     'Last-Modified' => gmdate(DATE_RFC1123, REQUEST_TIME),
-    'Cache-Control' => 'no-cache, must-revalidate, post-check=0, pre-check=0',
+    'Cache-Control' => 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0',
     'ETag' => '"' . REQUEST_TIME . '"',
   );
   drupal_send_headers($default_headers);
@@ -944,7 +944,7 @@ function drupal_page_cache_header(stdCla
   // will only be served to that particular user due to Vary: Cookie, unless
   // the Vary header has been replaced or unset in hook_boot() (see below).
   $max_age = variable_get('cache') == CACHE_AGGRESSIVE && (!isset($_COOKIE[session_name()]) || isset($hook_boot_headers['vary'])) ? variable_get('cache_lifetime', 0) : 0;
-  $default_headers['Cache-Control'] = 'public, max-age=' . $max_age;
+  $default_headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, public, max-age=' . $max_age;
 
   // Entity tag should change if the output changes.
   $etag = '"' . $cache->created . '-' . intval($return_compressed) . '"';