httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main mod_dav.c
Date Thu, 08 Feb 2001 11:31:08 GMT
gstein      01/02/08 03:31:07

  Modified:    modules/dav/main mod_dav.c
  Log:
  *) make sure the status line is set on custom responses
  *) allow CHECKOUT on version resources
  
  Revision  Changes    Path
  1.45      +5 -1      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.44
  retrieving revision 1.45
  diff -u -u -r1.44 -r1.45
  --- mod_dav.c	2001/02/08 07:43:59	1.44
  +++ mod_dav.c	2001/02/08 11:31:02	1.45
  @@ -352,6 +352,7 @@
   static int dav_error_response(request_rec *r, int status, const char *body)
   {
       r->status = status;
  +    r->status_line = ap_get_status_line(status);
       r->content_type = "text/html";
   
       /* since we're returning DONE, ensure the request body is consumed. */
  @@ -3328,6 +3329,8 @@
               else {
                   const ap_xml_elem *child = aset->first_child;
   
  +                activities = apr_make_array(r->pool, 1, sizeof(const char *));
  +
                   for (; child != NULL; child = child->next) {
                       if (child->ns == AP_XML_NS_DAV_ID
                           && strcmp(child->name, "href") == 0) {
  @@ -3367,7 +3370,8 @@
       /* Check the state of the resource: must be a file or collection,
        * must be versioned, and must not already be checked out.
        */
  -    if (resource->type != DAV_RESOURCE_TYPE_REGULAR) {
  +    if (resource->type != DAV_RESOURCE_TYPE_REGULAR
  +        && resource->type != DAV_RESOURCE_TYPE_VERSION) {
   	return dav_error_response(r, HTTP_CONFLICT,
   				  "Cannot checkout this type of resource.");
       }
  
  
  

Mime
View raw message