httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main util.c
Date Sat, 22 Feb 2003 01:02:18 GMT
trawick     2003/02/21 17:02:18

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/dav/main Tag: APACHE_2_0_BRANCH util.c
  Log:
  merge this fix into 2.0.45-dev:
  
  *) Fix If header parsing when a non-mod_dav lock token is passed to it.
     PR 16452.  [Justin Erenkrantz]
  
  PR: 16452
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.36 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.35
  retrieving revision 1.988.2.36
  diff -u -r1.988.2.35 -r1.988.2.36
  --- CHANGES	16 Feb 2003 04:41:17 -0000	1.988.2.35
  +++ CHANGES	22 Feb 2003 01:02:17 -0000	1.988.2.36
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.45
   
  +  *) Fix If header parsing when a non-mod_dav lock token is passed to it.
  +     PR 16452.  [Justin Erenkrantz]
  +
     *) mod_auth_digest no longer tries to guess AuthDigestDomain, if it's
        not specified. Now it assumes "/" as already documented. PR 16937.
        [André Malo]
  
  
  
  1.751.2.106 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.105
  retrieving revision 1.751.2.106
  diff -u -r1.751.2.105 -r1.751.2.106
  --- STATUS	20 Feb 2003 12:13:06 -0000	1.751.2.105
  +++ STATUS	22 Feb 2003 01:02:17 -0000	1.751.2.106
  @@ -91,10 +91,6 @@
         modules/metadata/mod_setenvif.c r1.42
         +1: nd
   
  -    * Fix If header handling to ignore non-mod_dav locks. (PR 16452)
  -      modules/dav/main/util.c: r1.44
  -      +1: jerenkrantz, trawick, nd
  -
       * Allow mod_dav to do weak entity comparison functions.
         modules/dav/main/util.c: r1.45
         [ This one is under review.  Don't merge.  ]
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.42.2.3  +10 -2     httpd-2.0/modules/dav/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
  retrieving revision 1.42.2.2
  retrieving revision 1.42.2.3
  diff -u -r1.42.2.2 -r1.42.2.3
  --- util.c	3 Feb 2003 17:31:35 -0000	1.42.2.2
  +++ util.c	22 Feb 2003 01:02:18 -0000	1.42.2.3
  @@ -574,8 +574,16 @@
   
           if ((err = (*locks_hooks->parse_locktoken)(p, state_token,
                                                      &new_sl->locktoken)) != NULL)
{
  -            /* ### maybe add a higher-level description */
  -            return err;
  +            /* In cases where the state token is invalid, we'll just skip
  +             * it rather than return 400.
  +             */
  +            if (err->error_id == DAV_ERR_LOCK_UNK_STATE_TOKEN) {
  +                return NULL;
  +            }
  +            else {
  +                /* ### maybe add a higher-level description */
  +                return err;
  +            }
           }
       }
       else
  
  
  

Mime
View raw message