You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/05/29 04:38:26 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method WebdavMethod.java

remm        01/05/28 19:38:25

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        WebdavMethod.java
  Log:
  - Store the current principal in the session, to get around a bug in IE 5 where
    the authentication info is not submitted by IE when doing a HEAD request.
  
  Revision  Changes    Path
  1.22      +16 -5     jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java
  
  Index: WebdavMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WebdavMethod.java	2001/05/16 12:07:59	1.21
  +++ WebdavMethod.java	2001/05/29 02:38:25	1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.21 2001/05/16 12:07:59 juergen Exp $
  - * $Revision: 1.21 $
  - * $Date: 2001/05/16 12:07:59 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.22 2001/05/29 02:38:25 remm Exp $
  + * $Revision: 1.22 $
  + * $Date: 2001/05/29 02:38:25 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,10 @@
           "http://jakarta.apache.org/slide/";
       public static final String SLIDE_NAMESPACE_ABBREV = "S";
       
  +    public static final String PRINCIPAL = 
  +        "org.apache.slide.webdav.method.principal";
       
  +    
       // ----------------------------------------------------- Instance Variables
       
       
  @@ -273,10 +276,18 @@
           this.security = token.getSecurityHelper();
           this.lock = token.getLockHelper();
           this.macro = token.getMacroHelper();
  -        if (principal != null) {
  -            this.credToken = new CredentialsToken(principal);
  +
  +        if (principal == null) {
  +            this.principal = 
  +                (Principal) req.getSession(true).getAttribute(PRINCIPAL);
           } else {
  +            req.getSession(true).setAttribute(PRINCIPAL, principal);
  +        }
  +        
  +        if (principal == null) {
               this.credToken = new CredentialsToken("");
  +        } else {
  +            this.credToken = new CredentialsToken(principal);
           }
           
           this.slideToken = new SlideToken(this.credToken);