--- boosted2.txt	Sat Oct 25 08:29:26 2008
+++ boosted2.txt	Mon Apr  6 17:17:03 2009
@@ -115,22 +115,18 @@
   RewriteCond %{DOCUMENT_ROOT}/cache/%{HTTP_HOST}/index.html -f
   RewriteRule ^(.*)$ cache/%{HTTP_HOST}/index.html [L]
   RewriteCond %{REQUEST_METHOD} ^GET$
-  RewriteCond %{REQUEST_URI} !^/cache
-  RewriteCond %{REQUEST_URI} !^/user/login
-  RewriteCond %{REQUEST_URI} !^/admin
+  RewriteCond %{REQUEST_URI} !^/admin|^/cache|^files|^/user/login|^/system
   RewriteCond %{QUERY_STRING} ^$
   RewriteCond %{HTTP_COOKIE} !DRUPAL_UID
   RewriteCond %{DOCUMENT_ROOT}/cache/%{HTTP_HOST}%{REQUEST_URI} -d
   RewriteCond %{DOCUMENT_ROOT}/cache/%{HTTP_HOST}%{REQUEST_URI}/index.html -f
-  RewriteRule ^(.*)$ cache/%{HTTP_HOST}/$1/index.html [L]
+  RewriteRule ^(.*)$ cache/%{HTTP_HOST}/%{REQUEST_URI}/index.html [L]
   RewriteCond %{REQUEST_METHOD} ^GET$
-  RewriteCond %{REQUEST_URI} !^/cache
-  RewriteCond %{REQUEST_URI} !^/user/login
-  RewriteCond %{REQUEST_URI} !^/admin
+  RewriteCond %{REQUEST_URI} !^/admin|^/cache|^files|^/user/login|^/system
   RewriteCond %{QUERY_STRING} ^$
   RewriteCond %{HTTP_COOKIE} !DRUPAL_UID
   RewriteCond %{DOCUMENT_ROOT}/cache/%{HTTP_HOST}%{REQUEST_URI}.html -f
-  RewriteRule ^(.*)$ cache/%{HTTP_HOST}/$1.html [L]
+  RewriteRule ^(.*)$ cache/%{HTTP_HOST}/%{REQUEST_URI}.html [L]
   # BOOST END
 
   # Rewrite URLs of the form 'x' to the form 'index.php?q=x'.