? .directory
? boost-679422.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.143
diff -u -p -r1.1.2.1.2.3.2.143 boost.admin.inc
--- boost.admin.inc	22 May 2010 18:40:18 -0000	1.1.2.1.2.3.2.143
+++ boost.admin.inc	7 Jul 2010 00:28:47 -0000
@@ -492,6 +492,12 @@ function boost_admin_boost_performance_p
     '#maxlength'     => 255,
     '#description'   => t('The name of a PHP function used to pre-process the contents of each page before writing them out to static files. The function is called with the contents of the page passed as a string argument, and its return value is used as the data written out to the disk.'),
   );
+  $form['advanced']['boost_exit_in_hook_exit'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Exit() inside of boost_exit'),
+    '#default_value' => BOOST_EXIT_IN_HOOK_EXIT,
+    '#description'   => t('If using ubercart disable this setting.'),
+  );
   $form['advanced']['boost_aggressive_cookie'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Aggressive setting of the boost cookie'),
Index: boost.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v
retrieving revision 1.3.2.2.2.5.2.353
diff -u -p -r1.3.2.2.2.5.2.353 boost.module
--- boost.module	1 Jul 2010 19:41:28 -0000	1.3.2.2.2.5.2.353
+++ boost.module	7 Jul 2010 00:28:51 -0000
@@ -58,6 +58,7 @@ define('BOOST_MAX_PATH_DEPTH',       10)
 // Advanced Settings
 define('BOOST_CHECK_BEFORE_CRON_EXPIRE', variable_get('boost_check_before_cron_expire', FALSE));
 define('BOOST_PRE_PROCESS_FUNCTION', variable_get('boost_pre_process_function', ''));
+define('BOOST_EXIT_IN_HOOK_EXIT',    variable_get('boost_exit_in_hook_exit', ''));
 define('BOOST_FLUSH_ALL_MULTISITE',  variable_get('boost_flush_all_multisite', TRUE));
 define('BOOST_ONLY_ASCII_PATH',      variable_get('boost_only_ascii_path', TRUE));
 define('BOOST_AGGRESSIVE_COOKIE',     variable_get('boost_aggressive_cookie', TRUE));
@@ -388,7 +389,12 @@ function boost_exit($destination = NULL)
       $destination = boost_glue_url($query_parts);
 
       // Do what drupal_goto() would do if we were to return to it:
-      exit(header('Location: ' . $destination));
+      if (BOOST_EXIT_IN_HOOK_EXIT) {
+        exit(header('Location: ' . $destination));
+      }
+      else {
+        header('Location: ' . $destination);
+      }
     }
   }
   // Set watchdog error if headers already sent