? boost-590134.patch
? boost-609310_0.patch
? boost-610398.patch
Index: boost.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v
retrieving revision 1.3.2.2.2.5.2.203
diff -u -p -r1.3.2.2.2.5.2.203 boost.module
--- boost.module	23 Oct 2009 02:56:20 -0000	1.3.2.2.2.5.2.203
+++ boost.module	23 Oct 2009 03:22:07 -0000
@@ -499,9 +499,9 @@ function boost_expire_node($node) {
 
   // Expire all relevant node pages from the static page cache to prevent serving stale content:
   if ($node->promote == 1) {
-    boost_cache_expire_derivative('<front>');
+    boost_cache_expire_derivative('<front>', TRUE);
   }
-  boost_cache_expire_derivative('node/' . $node->nid);
+  boost_cache_expire_derivative('node/' . $node->nid, TRUE);
 
   // Get terms and flush their page
   if (module_exists('taxonomy') && BOOST_FLUSH_NODE_TERMS) {
@@ -530,14 +530,14 @@ function boost_expire_node($node) {
       }
     }
     foreach ($nids as $nid) {
-      boost_cache_expire_derivative('node/' . $nid);
+      boost_cache_expire_derivative('node/' . $nid, TRUE);
     }
 
     // Get CCK references pointing to this node and flush.
     if (module_exists('nodereferrer')) {
       $nids = nodereferrer_referrers($node->nid);
       foreach ($nids as $nid) {
-        boost_cache_expire_derivative('node/' . $nid['nid']);
+        boost_cache_expire_derivative('node/' . $nid['nid'], TRUE);
       }
     }
   }
@@ -778,7 +778,7 @@ function boost_block_form_flush_submit(&
   }
   $data[] = array('base_dir' => BOOST_FILE_PATH, 'page_callback' => $form['values']['page_callback'], 'page_type' => $form['values']['page_type'], 'page_id' => $form['values']['page_id']);
   boost_cache_expire_router($data, TRUE);
-  boost_cache_expire_derivative($form['values']['path'], FALSE);
+  boost_cache_expire_derivative($form['values']['path']);
 }
 
 function boost_block_db_settings_form() {
@@ -1316,10 +1316,10 @@ function boost_cache_delete($flush = FAL
  *
  * @param $path
  *   Current URL
- * @param $db
- *   Expire by database lookup
+ * @param $both
+ *   Expire database & file
  */
-function boost_cache_expire_derivative($path, $db = TRUE) {
+function boost_cache_expire_derivative($path, $both = FALSE) {
   global $base_path;
   $paths = array();
 
@@ -1348,7 +1348,11 @@ function boost_cache_expire_derivative($
     }
   }
   $paths = array_unique($paths);
-  if (BOOST_NO_DATABASE) {
+  if ($both) {
+    boost_cache_expire_by_db($paths);
+    boost_cache_expire_by_filename($paths);
+  }
+  elseif (BOOST_NO_DATABASE) {
     boost_cache_expire_by_filename($paths);
   }
   else {