httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main util.c
Date Wed, 29 Jan 2003 05:07:18 GMT
jerenkrantz    2003/01/28 21:07:18

  Modified:    .        CHANGES
               modules/dav/main util.c
  Log:
  Fix If header parsing when a non-mod_dav lock token is passed to it.  We'll
  now just skip over it rather than aborting.
  
  PR: 16452
  
  Revision  Changes    Path
  1.1043    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1042
  retrieving revision 1.1043
  diff -u -u -r1.1042 -r1.1043
  --- CHANGES	28 Jan 2003 21:14:23 -0000	1.1042
  +++ CHANGES	29 Jan 2003 05:07:17 -0000	1.1043
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Fix If header parsing when a non-mod_dav lock token is passed to it.
  +     PR 16452.  [Justin Erenkrantz]
  +
     *) Fix bug where 'Satisfy Any' without an AuthType lost all MIME
        information (and more). Related to PR 9076.  [André Malo]
   
  
  
  
  1.44      +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.43
  retrieving revision 1.44
  diff -u -u -r1.43 -r1.44
  --- util.c	7 Jan 2003 21:08:03 -0000	1.43
  +++ util.c	29 Jan 2003 05:07:18 -0000	1.44
  @@ -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