Index: bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.38
diff -U3 -r1.38 bootstrap.inc
--- bootstrap.inc	9 Jan 2005 09:22:38 -0000	1.38
+++ bootstrap.inc	10 Mar 2005 03:58:29 -0000
@@ -438,10 +438,16 @@
       $none_match = !empty($_SERVER['HTTP_IF_NONE_MATCH']) ? $_SERVER['HTTP_IF_NONE_MATCH'] == $etag : NULL;
 
       // The type checking here is very important, be careful when changing entries.
-      if (($modified_since !== NULL || $none_match !== NULL) && $modified_since !== false && $none_match !== false) {
+      if (($modified_since !== NULL || $none_match !== NULL) && $modified_since !== false && $none_match !== false && $_GET['q'] != '') {
         header('HTTP/1.0 304 Not Modified');
         exit();
       }
+      else {
+        header("Expires: Sun, 19 Nov 1978 05:00:00 GMT");
+        header("Cache-Control: no-store, no-cache, must-revalidate");
+        header("Cache-Control: post-check=0, pre-check=0");
+        header("Pragma: no-cache");
+      }
 
       // Send appropriate response:
       header("Last-Modified: $date");