Author: markt
Date: Sun May 22 22:54:15 2011
New Revision: 1126273
URL: http://svn.apache.org/viewvc?rev=1126273&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=27122
Remove a workaround for a very old and since fixed Mozilla bug and change the
default value of the securePagesWithPragma attribute of the Authenticator
Valves to false to reduce the likelihood of issues when downloading files with
IE.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1126273&r1=1126272&r2=1126273&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Sun May 22 22:54:15 2011
@@ -143,9 +143,9 @@ public abstract class AuthenticatorBase
/**
* Flag to determine if we disable proxy caching with headers incompatible
- * with IE
+ * with IE.
*/
- protected boolean securePagesWithPragma = true;
+ protected boolean securePagesWithPragma = false;
/**
* The Java class name of the secure random number generator class to be
@@ -466,14 +466,10 @@ public abstract class AuthenticatorBase
// Make sure that constrained resources are not cached by web proxies
// or browsers as caching can provide a security hole
if (constraints != null && disableProxyCaching &&
- // FIXME: Disabled for Mozilla FORM support over SSL
- // (improper caching issue)
- //!request.isSecure() &&
+ !request.isSecure() &&
!"POST".equalsIgnoreCase(request.getMethod())) {
if (securePagesWithPragma) {
- // FIXME: These cause problems with downloading office docs
- // from IE under SSL and may not be needed for newer Mozilla
- // clients.
+ // Note: These can cause problems with downloading files with
IE
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
} else {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1126273&r1=1126272&r2=1126273&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun May 22 22:54:15 2011
@@ -46,6 +46,12 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>27122</bug>: Remove a workaround for a very old and since fixed
+ Mozilla bug and change the default value of the securePagesWithPragma
+ attribute of the Authenticator Valves to false. These changes should
+ reduce the likelihood of issues when downloading files with IE.
(markt)
+ </fix>
+ <fix>
<bug>35054</bug>: Check that a file is not specified for a Host's
appBase and log an error if it is. (markt)
</fix>
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1126273&r1=1126272&r2=1126273&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Sun May 22 22:54:15 2011
@@ -462,7 +462,7 @@
caching issues in some browsers by using
<code>Cache-Control: private</code> rather than the default of
<code>Pragma: No-cache</code> and <code>Cache-control: No-cache</code>.
- If not set, the default value of <code>true</code> will be used.</p>
+ If not set, the default value of <code>false</code> will be used.</p>
</attribute>
<attribute name="secureRandomAlgorithm" required="false">
@@ -591,7 +591,7 @@
caching issues in some browsers by using
<code>Cache-Control: private</code> rather than the default of
<code>Pragma: No-cache</code> and <code>Cache-control: No-cache</code>.
- If not set, the default value of <code>true</code> will be used.</p>
+ If not set, the default value of <code>false</code> will be used.</p>
</attribute>
<attribute name="secureRandomAlgorithm" required="false">
@@ -704,7 +704,7 @@
caching issues in some browsers by using
<code>Cache-Control: private</code> rather than the default of
<code>Pragma: No-cache</code> and <code>Cache-control: No-cache</code>.
- If not set, the default value of <code>true</code> will be used.</p>
+ If not set, the default value of <code>false</code> will be used.</p>
</attribute>
<attribute name="secureRandomAlgorithm" required="false">
@@ -796,7 +796,7 @@
caching issues in some browsers by using
<code>Cache-Control: private</code> rather than the default of
<code>Pragma: No-cache</code> and <code>Cache-control: No-cache</code>.
- If not set, the default value of <code>true</code> will be used.</p>
+ If not set, the default value of <code>false</code> will be used.</p>
</attribute>
<attribute name="secureRandomAlgorithm" required="false">
@@ -895,7 +895,7 @@
caching issues in some browsers by using
<code>Cache-Control: private</code> rather than the default of
<code>Pragma: No-cache</code> and <code>Cache-control: No-cache</code>.
- If not set, the default value of <code>true</code> will be used.</p>
+ If not set, the default value of <code>false</code> will be used.</p>
</attribute>
<attribute name="secureRandomAlgorithm" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
