? boost-602944.patch
Index: boost.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v
retrieving revision 1.3.2.2.2.5.2.185
diff -u -p -r1.3.2.2.2.5.2.185 boost.module
--- boost.module	12 Oct 2009 07:50:51 -0000	1.3.2.2.2.5.2.185
+++ boost.module	13 Oct 2009 05:03:50 -0000
@@ -9,13 +9,36 @@
 //////////////////////////////////////////////////////////////////////////////
 // Module settings
 
-define('BOOST_PATH',                 dirname(__FILE__));
-define('BOOST_ENABLED',              variable_get('boost_enabled', CACHE_DISABLED));
 define('BOOST_TIME',                 time());
+define('BOOST_MAX_TIMESTAMP',        variable_get('boost_max_timestamp', BOOST_TIME));
+define('BOOST_ENABLED',              variable_get('boost_enabled', CACHE_DISABLED));
+define('BOOST_GZIP',                 variable_get('page_compression', TRUE));
+
+// This cookie is set for all authenticated users, so that they can be
+// excluded from caching (or in the future get a user-specific cached page):
+define('BOOST_COOKIE',               variable_get('boost_cookie', 'DRUPAL_UID'));
+
+// This line is appended to the generated static files; it is very useful
+// for troubleshooting (e.g. determining whether one got the dynamic or
+// static version):
+define('BOOST_BANNER',               variable_get('boost_banner', "Page cached by Boost @ %cached_at, expires @ %expires_at"));
+
+// Caching Options
+define('BOOST_CACHE_LIFETIME',       variable_get('boost_cache_lifetime', 3600));
+define('BOOST_CACHE_XML_LIFETIME',   variable_get('boost_cache_xml_lifetime', 3600));
+define('BOOST_CACHE_JSON_LIFETIME',  variable_get('boost_cache_json_lifetime', 3600));
+define('BOOST_CACHE_QUERY',          variable_get('boost_cache_query', TRUE));
+define('BOOST_CACHE_HTML',           variable_get('boost_cache_html', TRUE));
+define('BOOST_CACHE_XML',            variable_get('boost_cache_xml', FALSE));
+define('BOOST_CACHE_JSON',           variable_get('boost_cache_json', FALSE));
+define('BOOST_CACHE_CSS',            variable_get('boost_cache_css', TRUE));
+define('BOOST_CACHE_JS',             variable_get('boost_cache_js', TRUE));
+define('BOOST_CACHEABILITY_OPTION',  variable_get('boost_cacheability_option', 0));
+define('BOOST_CACHEABILITY_PAGES',   variable_get('boost_cacheability_pages', ''));
 
 // Dir & File Structure
-define('BOOST_MULTISITE_SINGLE_DB',  variable_get('boost_multisite_single_db', FALSE));
 define('BOOST_ROOT_CACHE_DIR',       variable_get('boost_root_cache_dir', 'cache'));
+define('BOOST_MULTISITE_SINGLE_DB',  variable_get('boost_multisite_single_db', FALSE));
 define('BOOST_NORMAL_DIR',           variable_get('boost_normal_dir', ''));
 define('BOOST_GZIP_DIR',             variable_get('boost_gzip_dir', 'gz'));
 define('BOOST_PERM_NORMAL_DIR',      variable_get('boost_perm_normal_dir', ''));
@@ -30,67 +53,40 @@ define('BOOST_CSS_EXTENSION',        var
 define('BOOST_JS_EXTENSION',         variable_get('boost_js_extension', '.js'));
 define('BOOST_GZIP_EXTENSION',       variable_get('boost_gzip_extension', '.gz'));
 define('BOOST_ROOT_FILE',            variable_get('boost_root_file', '.boost'));
-define('BOOST_FLUSH_DIR',            variable_get('boost_flush_dir', TRUE));
 define('BOOST_MAX_PATH_DEPTH',       10);
 
-// Caching Options
-define('BOOST_CACHE_XML',            variable_get('boost_cache_xml', FALSE));
-define('BOOST_CACHE_JSON',           variable_get('boost_cache_json', FALSE));
-define('BOOST_CACHE_HTML',           variable_get('boost_cache_html', TRUE));
-define('BOOST_CACHE_CSS',            variable_get('boost_cache_css', TRUE));
-define('BOOST_CACHE_JS',             variable_get('boost_cache_js', TRUE));
-define('BOOST_PUSH_HTML',            variable_get('boost_push_html', FALSE));
-define('BOOST_PUSH_XML',             variable_get('boost_push_xml', FALSE));
-define('BOOST_PUSH_JSON',            variable_get('boost_push_json', FALSE));
-define('BOOST_CACHE_LIFETIME',       variable_get('boost_cache_lifetime', 3600));
-define('BOOST_CACHE_XML_LIFETIME',   variable_get('boost_cache_xml_lifetime', 3600));
-define('BOOST_CACHE_JSON_LIFETIME',  variable_get('boost_cache_json_lifetime', 3600));
-define('BOOST_CACHEABILITY_OPTION',  variable_get('boost_cacheability_option', 0));
-define('BOOST_CACHEABILITY_PAGES',   variable_get('boost_cacheability_pages', ''));
-
 // Advanced Settings
-define('BOOST_FETCH_METHOD',         variable_get('boost_fetch_method', 'php'));
+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_POST_UPDATE_COMMAND',  variable_get('boost_post_update_command', ''));
-define('BOOST_CRON_LIMIT',           variable_get('boost_cron_limit', 100));
-define('BOOST_ASYNCHRONOUS_OUTPUT',  variable_get('boost_asynchronous_output', TRUE));
 define('BOOST_ONLY_ASCII_PATH',      variable_get('boost_only_ascii_path', TRUE));
-define('BOOST_GZIP',                 variable_get('page_compression', TRUE));
-define('BOOST_AGGRESSIVE_GZIP',      variable_get('boost_aggressive_gzip', FALSE));
+define('BOOST_ASYNCHRONOUS_OUTPUT',  variable_get('boost_asynchronous_output', TRUE));
+define('BOOST_FLUSH_DIR',            variable_get('boost_flush_dir', TRUE));
+define('BOOST_FLUSH_CCK_REFERENCES', variable_get('boost_flush_cck_references', TRUE));
+define('BOOST_FLUSH_NODE_TERMS',     variable_get('boost_flush_node_terms', TRUE));
+define('BOOST_FLUSH_VIEWS',          variable_get('boost_flush_views', FALSE));
+define('BOOST_FLUSH_VIEWS_INSERT',   variable_get('boost_flush_views_insert', FALSE));
 define('BOOST_CLEAR_CACHE_OFFLINE',  variable_get('boost_clear_cache_offline', TRUE));
+define('BOOST_OVERWRITE_FILE',       variable_get('boost_overwrite_file', FALSE));
 define('BOOST_HALT_ON_ERRORS',       variable_get('boost_halt_on_errors', FALSE));
 define('BOOST_HALT_ON_MESSAGES',     variable_get('boost_halt_on_messages', TRUE));
-define('BOOST_CACHE_QUERY',          variable_get('boost_cache_query', TRUE));
-define('BOOST_IGNORE_FLUSH',         variable_get('boost_ignore_flush', 0));
+define('BOOST_DISABLE_CLEAN_URL',    variable_get('boost_disable_clean_url', FALSE));
+define('BOOST_AGGRESSIVE_GZIP',      variable_get('boost_aggressive_gzip', FALSE));
 define('BOOST_PERMISSIONS_FILE',     variable_get('boost_permissions_file', ''));
 define('BOOST_PERMISSIONS_DIR',      variable_get('boost_permissions_dir', ''));
-define('BOOST_OVERWRITE_FILE',       variable_get('boost_overwrite_file', FALSE));
-define('BOOST_DISABLE_CLEAN_URL',    variable_get('boost_disable_clean_url', FALSE));
-define('BOOST_VERBOSE',              variable_get('boost_verbose', 5));
-define('BOOST_FLUSH_NODE_TERMS',     variable_get('boost_flush_node_terms', TRUE));
-define('BOOST_FLUSH_CCK_REFERENCES', variable_get('boost_flush_cck_references', TRUE));
-define('BOOST_FLUSH_VIEWS',          variable_get('boost_flush_views', FALSE));
-define('BOOST_FLUSH_VIEWS_INSERT',   variable_get('boost_flush_views_insert', FALSE));
 define('BOOST_EXPIRE_NO_FLUSH',      variable_get('boost_expire_no_flush', FALSE));
-define('BOOST_MAX_TIMESTAMP',        variable_get('boost_max_timestamp', BOOST_TIME));
+define('BOOST_IGNORE_FLUSH',         variable_get('boost_ignore_flush', 0));
+define('BOOST_VERBOSE',              variable_get('boost_verbose', 5));
 
 // Crawler Settings
-define('BOOST_CHECK_BEFORE_CRON_EXPIRE', variable_get('boost_check_before_cron_expire', FALSE));
 define('BOOST_CRAWL_ON_CRON',        variable_get('boost_crawl_on_cron', FALSE));
+define('BOOST_LOOPBACK_BYPASS',      BOOST_OVERWRITE_FILE ? variable_get('boost_loopback_bypass', FALSE) : FALSE);
+define('BOOST_PUSH_HTML',            variable_get('boost_push_html', FALSE));
+define('BOOST_PUSH_XML',             variable_get('boost_push_xml', FALSE));
+define('BOOST_PUSH_JSON',            variable_get('boost_push_json', FALSE));
 define('BOOST_CRAWLER_THROTTLE',     variable_get('boost_crawler_throttle', 0));
 define('BOOST_CRAWLER_THREADS',      variable_get('boost_crawler_threads', 2));
 define('BOOST_CRAWL_URL_ALIAS',      variable_get('boost_crawl_url_alias', FALSE));
 define('BOOST_MAX_THREADS',          8);
-define('BOOST_LOOPBACK_BYPASS',      BOOST_OVERWRITE_FILE ? variable_get('boost_loopback_bypass', FALSE) : FALSE);
-
-// This cookie is set for all authenticated users, so that they can be
-// excluded from caching (or in the future get a user-specific cached page):
-define('BOOST_COOKIE',               variable_get('boost_cookie', 'DRUPAL_UID'));
-
-// This line is appended to the generated static files; it is very useful
-// for troubleshooting (e.g. determining whether one got the dynamic or
-// static version):
-define('BOOST_BANNER',               variable_get('boost_banner', "Page cached by Boost @ %cached_at, expires @ %expires_at"));
 
 // Requires Boost Functions or global scope, Define These Last
 global $base_url;