? boost-674664.patch
? boost-679050.patch
? boost-ignore_htaccess_warning.patch
Index: boost.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.admin.inc,v
retrieving revision 1.1.2.1.2.3.2.128
diff -u -p -r1.1.2.1.2.3.2.128 boost.admin.inc
--- boost.admin.inc	24 Jan 2010 02:28:41 -0000	1.1.2.1.2.3.2.128
+++ boost.admin.inc	24 Jan 2010 04:11:32 -0000
@@ -804,6 +804,12 @@ function boost_admin_boost_performance_p
     '#default_value' => variable_get('boost_apache_rfc2616', TRUE),
     '#description'   => t('Bypass the boost cache when the headers contain a "no-cache" cache-control directive (ctrl-F5 in browser). Disable this to make boost always serve pages from the cache. Good time to disable this is right before your site goes into maintance mode.'),
   );
+  $form['htaccess']['boost_ignore_htaccess_warning'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Ignore .htaccess warning'),
+    '#default_value' => variable_get('boost_ignore_htaccess_warning', FALSE),
+    '#description'   => t('Do not warn about missing or modified boost rules in the .htaccess file on the <a href="!link">status report page</a>. Enable this if you have a good reason to modify the boost rules in .htaccss.', array('!link' => url('admin/reports/status'))),
+  );
 
   // Clear database button
   $form['clear'] = array(
Index: boost.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.install,v
retrieving revision 1.2.2.1.2.3.2.85
diff -u -p -r1.2.2.1.2.3.2.85 boost.install
--- boost.install	23 Jan 2010 22:08:33 -0000	1.2.2.1.2.3.2.85
+++ boost.install	24 Jan 2010 04:11:33 -0000
@@ -129,7 +129,7 @@ function boost_requirements($phase) {
           'value'       => $t('Cache path'),
         );
       }
-      if ($htaccess && !boost_chk_htaccess_doc($htaccess)) {
+      if ($htaccess && !BOOST_IGNORE_HTACCESS_WARNING && !boost_chk_htaccess_doc($htaccess)) {
         $requirements['boost_htaccess'] = array(
           'title'       => $t('Boost'),
           'description' => $t('.htaccess file does not contain or match the boost specific rewrite rules, or the rewrite rules have changed, due to new settings, and they need to be updated. Get the rules: <a href="@url">Boost Apache .htaccess settings generation</a>.', array('@url' => url('admin/settings/performance/boost-rules'))),
@@ -1440,3 +1440,26 @@ function boost_update_6124() {
   _boost_index_exists($ret, 'boost_cache_relationships', 'page_type');
   return $ret;
 }
+
+
+/**
+ * Update 6125 - Reset boost-gzip-cookie-test.html.gz file
+ */
+function boost_update_6125() {
+  $ret = array();
+  // Make sure we have boost.module file loaded
+  drupal_load('module', 'boost');
+  $filename = BOOST_ROOT_CACHE_DIR . '/' . BOOST_PERM_GZ_DIR . '/boost-gzip-cookie-test.html.gz';
+  if (is_file($filename) || is_link($filename)) {
+    if (unlink($filename)) {
+      _boost_generate_gzip_test_file();
+      return array(array('success' => TRUE, 'query' => t('boost-gzip-cookie-test.html.gz file was reset')));
+    }
+    else {
+      return array(array('success' => FALSE, 'query' => t('boost-gzip-cookie-test.html.gz file was not deleted; please manually delete this file')));
+    }
+  }
+  else {
+    return array(array('success' => TRUE, 'query' => t('boost-gzip-cookie-test.html.gz did not need to be reset')));
+  }
+}
Index: boost.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v
retrieving revision 1.3.2.2.2.5.2.291
diff -u -p -r1.3.2.2.2.5.2.291 boost.module
--- boost.module	23 Jan 2010 22:16:49 -0000	1.3.2.2.2.5.2.291
+++ boost.module	24 Jan 2010 04:11:34 -0000
@@ -81,6 +81,7 @@ define('BOOST_EXPIRE_NO_FLUSH',      var
 define('BOOST_VERBOSE',              variable_get('boost_verbose', 5));
 define('BOOST_IGNORE_SAFE_WARNING',  variable_get('boost_ignore_safe_warning', FALSE));
 define('BOOST_IGNORE_SUBDIR_LIMIT',  variable_get('boost_ignore_subdir_limit', TRUE));
+define('BOOST_IGNORE_HTACCESS_WARNING',  variable_get('boost_ignore_htaccess_warning', FALSE));
 define('BOOST_NO_DATABASE',          variable_get('boost_no_database', FALSE));
 
 // Crawler Settings
@@ -1298,7 +1299,7 @@ function boost_theme() {
 }
 
 function theme_boost_cache_status($ttl, $text) {
-  return '<span class="boost cache-status" content="' . $ttl . '"><small>' . $text . '</small></span>';
+  return '<div style="font-size: x-small;">' . $text . '</div>';
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -2267,7 +2268,7 @@ function boost_cache_set($path, $data, $
     // Special handling of the front page for aggressive gzip test
     if ($path == '' && BOOST_AGGRESSIVE_GZIP && $extension == BOOST_FILE_EXTENSION) {
       _boost_generate_gzip_test_file();
-      boost_cache_write($filename, _boost_inject_code($data, '<iframe src="/boost-gzip-cookie-test.html" style="width:0px; height:0px; border:0px; position:absolute; top:-1000px; z-index:10;"></iframe>' . "\n"));
+      boost_cache_write($filename, _boost_inject_code($data, '<object classid="clsid:25336920-03F9-11CF-8FD0-00AA00686F13" type="text/html" data="/boost-gzip-cookie-test.html" style="width:0px; height:0px; border:0px; position:absolute; top:-1000px; z-index:10;"></object>' . "\n"));
     }
     else {
       boost_cache_write($filename, $data);
@@ -3580,7 +3581,7 @@ date.setTime(date.getTime() + (days * 24
 expires = '; expires=' + date.toUTCString();
 document.cookie = 'boost-gzip=true' + expires + '; path=/'
 </script>
-</head><body><h1>It works!</h1></body></html>
+</head><body style="border:0;overflow:visible"><h1>It works!</h1></body></html>
 ETO;
     _boost_write_file_chmod($filename, gzencode($string, 9));
   }