remm 2005/04/19 06:35:16
Modified: catalina/src/share/org/apache/catalina/authenticator
AuthenticatorBase.java
Log:
- Remove inaccurate comments.
- Change field name as suggested.
Revision Changes Path
1.29 +10 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
Index: AuthenticatorBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AuthenticatorBase.java 18 Apr 2005 21:48:14 -0000 1.28
+++ AuthenticatorBase.java 19 Apr 2005 13:35:16 -0000 1.29
@@ -147,7 +147,7 @@
* Flag to determine if we disable proxy caching with headers compatible
* with IE
*/
- protected boolean securePagesAsPrivate = false;
+ protected boolean securePagesWithPragma = false;
/**
* The lifecycle event support for this component.
@@ -350,8 +350,8 @@
* Return the flag that states, if proxy caching is disabled, what
headers
* we add to disable the caching.
*/
- public boolean getSecurePagesAsPrivate() {
- return securePagesAsPrivate;
+ public boolean getSecurePagesWithPragma() {
+ return securePagesWithPragma;
}
/**
@@ -361,8 +361,8 @@
* generally compatible, <code>false</code> if add headers which aren't
* known to be compatible.
*/
- public void setSecurePagesAsPrivate(boolean securePagesAsPrivate) {
- this.securePagesAsPrivate = securePagesAsPrivate;
+ public void setSecurePagesWithPragma(boolean securePagesWithPragma) {
+ this.securePagesWithPragma = securePagesWithPragma;
}
// --------------------------------------------------------- Public
Methods
@@ -440,14 +440,11 @@
// (improper caching issue)
//!request.isSecure() &&
!"POST".equalsIgnoreCase(request.getMethod())) {
- if (securePagesAsPrivate) {
- //this is the standard way to disable caching
- response.setHeader("Cache-Control", "private");
+ if (securePagesWithPragma) {
+ response.setHeader("Cache-Control", "private");
} else {
- //IE won't render the page under SSL if this header is
specified
- //TODO It was stipulated that these not be removed, not sure
why
- response.setHeader("Pragma", "No-cache");
- response.setHeader("Cache-Control", "no-cache");
+ response.setHeader("Pragma", "No-cache");
+ response.setHeader("Cache-Control", "no-cache");
}
response.setHeader("Expires", DATE_ONE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
