Index: .htaccess
===================================================================
RCS file: /cvs/drupal/drupal/.htaccess,v
retrieving revision 1.103
diff -u -8 -p -r1.103 .htaccess
--- .htaccess 21 Jun 2009 10:48:06 -0000 1.103
+++ .htaccess 16 Aug 2009 11:48:31 -0000
@@ -43,20 +43,24 @@ DirectoryIndex index.php index.html inde
# Requires mod_expires to be enabled.
# Enable expirations.
ExpiresActive On
# Cache all files for 2 weeks after access (A).
ExpiresDefault A1209600
-
- # Caching headers for dynamically generated pages are set from PHP.
+
+ # Do not allow PHP scripts to be cached unless they explicitly send cache
+ # headers themselves. Otherwise all scripts would have to overwrite the
+ # headers set by mod_expires if they want another caching behavior. This may
+ # fail if an error occurs early in the bootstrap process, and it may cause
+ # problems if a non-Drupal PHP file is installed in a subdirectory.
ExpiresActive Off
-
+
# 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