? boost-428942.patch Index: htaccess/boosted1.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/htaccess/Attic/boosted1.txt,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 boosted1.txt --- htaccess/boosted1.txt 7 Apr 2009 01:16:02 -0000 1.1.2.2 +++ htaccess/boosted1.txt 22 Apr 2009 07:14:07 -0000 @@ -1,105 +1,3 @@ -# -# Apache/PHP/Drupal settings: -# - -# Protect files and directories from prying eyes. - - Order allow,deny - - -# Don't show directory listings for URLs which map to a directory. -Options -Indexes - -# Follow symbolic links in this directory. -Options +FollowSymLinks - -# Make Drupal handle any 404 errors. -ErrorDocument 404 /index.php - -# Force simple error message for requests for non-existent favicon.ico. - - ErrorDocument 404 "The requested file favicon.ico was not found. - - -# Set the default handler. -DirectoryIndex index.php - -# Override PHP settings. More in sites/default/settings.php -# but the following cannot be changed at runtime. - -# PHP 4, Apache 1. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# PHP 4, Apache 2. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# PHP 5, Apache 1 and 2. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# Requires mod_expires to be enabled. - - # Enable expirations. - ExpiresActive On - - # Cache all files for 2 weeks after access (A). - ExpiresDefault A1209600 - - # Do not cache dynamically generated pages. - ExpiresByType text/html A1 - - -# Various rewrite rules. - - RewriteEngine on - - # If your site can be accessed both with and without the 'www.' prefix, you - # can use one of the following settings to redirect users to your preferred - # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option: - # - # To redirect all users to access the site WITH the 'www.' prefix, - # (http://example.com/... will be redirected to http://www.example.com/...) - # adapt and uncomment the following: - # RewriteCond %{HTTP_HOST} ^example\.com$ [NC] - # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301] - # - # To redirect all users to access the site WITHOUT the 'www.' prefix, - # (http://www.example.com/... will be redirected to http://example.com/...) - # uncomment and adapt the following: - # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC] - # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301] - - # Modify the RewriteBase if you are using Drupal in a subdirectory or in a - # VirtualDocumentRoot and the rewrite rules are not working properly. - # For example if your site is at http://example.com/drupal uncomment and - # modify the following line: - # RewriteBase /drupal - # - # If your site is running in a VirtualDocumentRoot at http://example.com/, - # uncomment the following line: - # RewriteBase / - - # Rewrite rules for static page caching provided by the Boost module: # BOOST START Header add Expires "Sun, 19 Nov 1978 05:00:00 GMT" @@ -108,45 +6,36 @@ DirectoryIndex index.php AddCharset utf-8 .html + # root page RewriteCond %{REQUEST_METHOD} ^GET$ RewriteCond %{REQUEST_URI} ^/$ RewriteCond %{QUERY_STRING} ^$ RewriteCond %{HTTP_COOKIE} !DRUPAL_UID RewriteCond %{DOCUMENT_ROOT}/cache/%{SERVER_NAME}/index.html -f RewriteRule ^(.*)$ cache/%{SERVER_NAME}/index.html [L] + # subdir root page RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{REQUEST_URI} !^/cache - RewriteCond %{REQUEST_URI} !^/user/login - RewriteCond %{REQUEST_URI} !^/admin + RewriteCond %{REQUEST_URI} !^/admin|^/cache|^/misc|^/modules|^/sites|^/system|^/themes|^/user/login RewriteCond %{QUERY_STRING} ^$ RewriteCond %{HTTP_COOKIE} !DRUPAL_UID RewriteCond %{DOCUMENT_ROOT}/cache/%{SERVER_NAME}%{REQUEST_URI} -d RewriteCond %{DOCUMENT_ROOT}/cache/%{SERVER_NAME}%{REQUEST_URI}/index.html -f RewriteRule ^(.*)$ cache/%{SERVER_NAME}/$1/index.html [L] + # page RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{REQUEST_URI} !^/cache - RewriteCond %{REQUEST_URI} !^/user/login - RewriteCond %{REQUEST_URI} !^/admin + RewriteCond %{REQUEST_URI} !^/admin|^/cache|^/misc|^/modules|^/sites|^/system|^/themes|^/user/login RewriteCond %{QUERY_STRING} ^$ RewriteCond %{HTTP_COOKIE} !DRUPAL_UID RewriteCond %{DOCUMENT_ROOT}/cache/%{SERVER_NAME}%{REQUEST_URI}.html -f RewriteRule ^(.*)$ cache/%{SERVER_NAME}/$1.html [L] - + # page with url variables RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{REQUEST_URI} !^/cache - RewriteCond %{REQUEST_URI} !^/user/login - RewriteCond %{REQUEST_URI} !^/admin + RewriteCond %{REQUEST_URI} !^/admin|^/cache|^/misc|^/modules|^/sites|^/system|^/themes|^/user/login RewriteCond %{QUERY_STRING} !^$ RewriteCond %{HTTP_COOKIE} !DRUPAL_UID RewriteCond %{DOCUMENT_ROOT}/cache/%{SERVER_NAME}%{REQUEST_URI}_%{QUERY_STRING}.html -f RewriteRule ^(.*)$ cache/%{SERVER_NAME}/$1_%{QUERY_STRING}.html [L] # BOOST END - # Rewrite URLs of the form 'x' to the form 'index.php?q=x'. - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^(.*)$ index.php?q=$1 [L,QSA] - -# $Id: boosted1.txt,v 1.1.2.2 2009/04/07 01:16:02 mikeytown2 Exp $ +# $Id: boosted1.txt,v 1.1.2.2 2009/04/07 01:16:02 mikeytown2 Exp $ \ No newline at end of file Index: htaccess/boosted2.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/htaccess/Attic/boosted2.txt,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 boosted2.txt --- htaccess/boosted2.txt 7 Apr 2009 01:16:02 -0000 1.1.2.2 +++ htaccess/boosted2.txt 22 Apr 2009 07:14:07 -0000 @@ -1,105 +1,3 @@ -# -# Apache/PHP/Drupal settings: -# - -# Protect files and directories from prying eyes. - - Order allow,deny - - -# Don't show directory listings for URLs which map to a directory. -Options -Indexes - -# Follow symbolic links in this directory. -Options +FollowSymLinks - -# Make Drupal handle any 404 errors. -ErrorDocument 404 /index.php - -# Force simple error message for requests for non-existent favicon.ico. - - ErrorDocument 404 "The requested file favicon.ico was not found. - - -# Set the default handler. -DirectoryIndex index.php - -# Override PHP settings. More in sites/default/settings.php -# but the following cannot be changed at runtime. - -# PHP 4, Apache 1. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# PHP 4, Apache 2. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# PHP 5, Apache 1 and 2. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# Requires mod_expires to be enabled. - - # Enable expirations. - ExpiresActive On - - # Cache all files for 2 weeks after access (A). - ExpiresDefault A1209600 - - # Do not cache dynamically generated pages. - ExpiresByType text/html A1 - - -# Various rewrite rules. - - RewriteEngine on - - # If your site can be accessed both with and without the 'www.' prefix, you - # can use one of the following settings to redirect users to your preferred - # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option: - # - # To redirect all users to access the site WITH the 'www.' prefix, - # (http://example.com/... will be redirected to http://www.example.com/...) - # adapt and uncomment the following: - # RewriteCond %{HTTP_HOST} ^example\.com$ [NC] - # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301] - # - # To redirect all users to access the site WITHOUT the 'www.' prefix, - # (http://www.example.com/... will be redirected to http://example.com/...) - # uncomment and adapt the following: - # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC] - # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301] - - # Modify the RewriteBase if you are using Drupal in a subdirectory or in a - # VirtualDocumentRoot and the rewrite rules are not working properly. - # For example if your site is at http://example.com/drupal uncomment and - # modify the following line: - # RewriteBase /drupal - # - # If your site is running in a VirtualDocumentRoot at http://example.com/, - # uncomment the following line: - # RewriteBase / - - # Rewrite rules for static page caching provided by the Boost module: # BOOST START Header add Expires "Sun, 19 Nov 1978 05:00:00 GMT" @@ -108,45 +6,36 @@ DirectoryIndex index.php AddCharset utf-8 .html + # root page RewriteCond %{REQUEST_METHOD} ^GET$ RewriteCond %{REQUEST_URI} ^/$ RewriteCond %{QUERY_STRING} ^$ RewriteCond %{HTTP_COOKIE} !DRUPAL_UID RewriteCond %{DOCUMENT_ROOT}/cache/%{HTTP_HOST}/index.html -f RewriteRule ^(.*)$ cache/%{HTTP_HOST}/index.html [L] + # subdir root page RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{REQUEST_URI} !^/cache - RewriteCond %{REQUEST_URI} !^/user/login - RewriteCond %{REQUEST_URI} !^/admin + RewriteCond %{REQUEST_URI} !^/admin|^/cache|^/misc|^/modules|^/sites|^/system|^/themes|^/user/login 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] + # page RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{REQUEST_URI} !^/cache - RewriteCond %{REQUEST_URI} !^/user/login - RewriteCond %{REQUEST_URI} !^/admin + RewriteCond %{REQUEST_URI} !^/admin|^/cache|^/misc|^/modules|^/sites|^/system|^/themes|^/user/login 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] - + # page with url variables RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{REQUEST_URI} !^/cache - RewriteCond %{REQUEST_URI} !^/user/login - RewriteCond %{REQUEST_URI} !^/admin + RewriteCond %{REQUEST_URI} !^/admin|^/cache|^/misc|^/modules|^/sites|^/system|^/themes|^/user/login RewriteCond %{QUERY_STRING} !^$ RewriteCond %{HTTP_COOKIE} !DRUPAL_UID RewriteCond %{DOCUMENT_ROOT}/cache/%{HTTP_HOST}%{REQUEST_URI}_%{QUERY_STRING}.html -f RewriteRule ^(.*)$ cache/%{HTTP_HOST}/$1_%{QUERY_STRING}.html [L] # BOOST END - # Rewrite URLs of the form 'x' to the form 'index.php?q=x'. - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^(.*)$ index.php?q=$1 [L,QSA] - -# $Id: boosted2.txt,v 1.1.2.2 2009/04/07 01:16:02 mikeytown2 Exp $ +# $Id: boosted2.txt,v 1.1.2.2 2009/04/07 01:16:02 mikeytown2 Exp $ \ No newline at end of file Index: htaccess/default.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/htaccess/default.txt,v retrieving revision 1.1.2.1.2.5.2.1 diff -u -p -r1.1.2.1.2.5.2.1 default.txt --- htaccess/default.txt 25 Oct 2008 02:26:10 -0000 1.1.2.1.2.5.2.1 +++ htaccess/default.txt 22 Apr 2009 07:14:07 -0000 @@ -3,7 +3,7 @@ # # Protect files and directories from prying eyes. - + Order allow,deny @@ -18,6 +18,7 @@ ErrorDocument 404 /index.php # Force simple error message for requests for non-existent favicon.ico. + # There is no end quote below, for compatibility with Apache 1.3. ErrorDocument 404 "The requested file favicon.ico was not found. @@ -106,4 +107,4 @@ DirectoryIndex index.php RewriteRule ^(.*)$ index.php?q=$1 [L,QSA] -# $Id: default.txt,v 1.1.2.1.2.5.2.1 2008/10/25 02:26:10 arto Exp $ +# $Id: default.txt,v 1.1.2.1.2.5.2.1 2008/10/25 02:26:10 arto Exp $ \ No newline at end of file