keith       2005/04/19 07:06:24

  Modified:    catalina/src/share/org/apache/catalina/authenticator
                        AuthenticatorBase.java
  Log:
  [34083, 27122, 28662, 29336, 29975, and 30618]
  - invert so that securePagesWithPragma secures the pages with Pragma
    (retaining Remy's default behavior)
  
  To enable downloading of office docs with IE under SSL, add
  
      <Valve className="org.apache.catalina.authenticator.DigestAuthenticator"
                       securePagesWithPragma="false" />
  
  to context.xml (with the appropriate authenticator class)
  
  Revision  Changes    Path
  1.30      +12 -9     
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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AuthenticatorBase.java    19 Apr 2005 13:35:16 -0000      1.29
  +++ AuthenticatorBase.java    19 Apr 2005 14:06:23 -0000      1.30
  @@ -144,10 +144,10 @@
       protected boolean disableProxyCaching = true;
   
       /**
  -     * Flag to determine if we disable proxy caching with headers compatible
  +     * Flag to determine if we disable proxy caching with headers 
incompatible
        * with IE 
        */
  -    protected boolean securePagesWithPragma = false;
  +    protected boolean securePagesWithPragma = true;
       
       /**
        * The lifecycle event support for this component.
  @@ -348,7 +348,7 @@
       
       /**
        * Return the flag that states, if proxy caching is disabled, what 
headers
  -     * we add to disable the caching.  
  +     * we add to disable the caching.
        */
       public boolean getSecurePagesWithPragma() {
           return securePagesWithPragma;
  @@ -357,9 +357,9 @@
       /**
        * Set the value of the flag that states what headers we add to disable
        * proxy caching.
  -     * @param compatible <code>true</code> if we add headers which are
  -     * generally compatible, <code>false</code> if add headers which aren't
  -     * known to be compatible.
  +     * @param securePagesWithPragma <code>true</code> if we add headers 
which 
  +     * are incompatible with downloading office documents in IE under SSL but
  +     * which fix a caching problem in Mozilla.
        */
       public void setSecurePagesWithPragma(boolean securePagesWithPragma) {
           this.securePagesWithPragma = securePagesWithPragma;
  @@ -441,10 +441,13 @@
               //!request.isSecure() &&
               !"POST".equalsIgnoreCase(request.getMethod())) {
               if (securePagesWithPragma) {
  -                response.setHeader("Cache-Control", "private");
  -            } else {
  +                // FIXME: These cause problems with downloading office docs
  +                // from IE under SSL and may not be needed for newer Mozilla
  +                // clients.
                   response.setHeader("Pragma", "No-cache");
                   response.setHeader("Cache-Control", "no-cache");
  +            } else {
  +                response.setHeader("Cache-Control", "private");
               }
               response.setHeader("Expires", DATE_ONE);
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to