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 mod_dav.c
Date Wed, 21 May 2003 15:47:03 GMT
jerenkrantz    2003/05/21 08:47:02

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               modules/dav/main Tag: APACHE_2_0_BRANCH mod_dav.c
  Log:
  mod_dav providers define a 'can_be_activity' callback.  Unfortunately,
  mod_dav isn't calling it before creating an activity.  This is a
  required precondition (along with the resource not existing), as
  defined in the deltaV RFC (3253), section 13.5.
  
  * mod_dav.c (dav_method_make_activity): if available, call provider's
    'can_be_activity' callback as a precondition to making an activity.
  
  Submitted by: Ben Collins-Sussman <sussman@collab.net>
  Reviewed by: Sander Striker, Justin Erenkrantz, Greg Stein
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.110 +6 -2      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.109
  retrieving revision 1.988.2.110
  diff -u -u -r1.988.2.109 -r1.988.2.110
  --- CHANGES	21 May 2003 11:39:49 -0000	1.988.2.109
  +++ CHANGES	21 May 2003 15:47:00 -0000	1.988.2.110
  @@ -1,11 +1,15 @@
   Changes with Apache 2.0.46
   
  +  *) Fix for mod_dav.  Call the 'can_be_activity' callback, if provided,
  +     when a MKACTIVITY request comes in.
  +     [Ben Collins-Sussman <sussman@collab.net>]
  +
     *) Perform run-time query in apxs for apr and apr-util's includes.
        [Justin Erenkrantz] 
  -     
  +
     *) run libtool from the apr install directory (in case that is different
        from the apache install directory) [Jeff Trawick]
  -     
  +
     *) configure.in: Play nice with libtool-1.5. [Wilfredo Sanchez]
   
     *) If mod_mime_magic does not know the content-type, do not attempt to
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.91.2.2  +9 -0      httpd-2.0/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
  retrieving revision 1.91.2.1
  retrieving revision 1.91.2.2
  diff -u -u -r1.91.2.1 -r1.91.2.2
  --- mod_dav.c	3 Feb 2003 17:31:34 -0000	1.91.2.1
  +++ mod_dav.c	21 May 2003 15:47:01 -0000	1.91.2.2
  @@ -4068,6 +4068,15 @@
           return dav_handle_err(r, err, NULL);
       }
   
  +    /* the provider must say whether the resource can be created as
  +       an activity, i.e. whether the location is ok.  */
  +    if (vsn_hooks->can_be_activity != NULL
  +        && !(*vsn_hooks->can_be_activity)(resource)) {
  +      err = dav_new_error(r->pool, HTTP_FORBIDDEN, 0,
  +                          "<DAV:activity-location-ok/>");
  +      return dav_handle_err(r, err, NULL);
  +    }
  +
       /* ### what about locking? */
   
       /* attempt to create the activity */
  
  
  

Mime
View raw message