httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main mod_dav.c
Date Mon, 07 Jun 2004 10:41:02 GMT
jorton      2004/06/07 03:41:02

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/dav/fs Tag: APACHE_2_0_BRANCH repos.c
               modules/dav/main Tag: APACHE_2_0_BRANCH mod_dav.c
  Log:
  Backport from HEAD:
  
    * modules/dav/fs/repos.c (dav_fs_create_collection): Give a 409 rather
    than a 403 if apr_dir_make fails with ENOENT.
  
    * modules/dav/main/mod_dav.c (dav_method_put): Fix segfault
    in auto-versioning error handling path.
  
  PR: 29034, 29148
  Reviewed by: Jeff Trawick, André Malo
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.298 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.297
  retrieving revision 1.988.2.298
  diff -d -w -u -r1.988.2.297 -r1.988.2.298
  --- CHANGES	7 Jun 2004 10:31:50 -0000	1.988.2.297
  +++ CHANGES	7 Jun 2004 10:41:00 -0000	1.988.2.298
  @@ -5,6 +5,10 @@
        (trusted) client certificate subject DN which exceeds 6K in length.
        [Joe Orton]
   
  +  *) mod_dav_fs: Fix MKCOL response for missing parent collections, which 
  +     caused issues for the Eclipse WebDAV extension.
  +     PR 29034.  [Joe Orton]
  +
     *) mod_deflate: Fix memory consumption (which was proportional to the
        response size).  PR 29318.  [Joe Orton]
   
  
  
  
  1.751.2.906 +1 -12     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.905
  retrieving revision 1.751.2.906
  diff -d -w -u -r1.751.2.905 -r1.751.2.906
  --- STATUS	7 Jun 2004 10:31:51 -0000	1.751.2.905
  +++ STATUS	7 Jun 2004 10:41:00 -0000	1.751.2.906
  @@ -204,17 +204,6 @@
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_auth_digest.c?r1=1.86&r2=1.87
          +1: geoff, nd
   
  -    *) mod_dav: Fix a segfault in an autoversioning error path.
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.106&r2=1.107
  -       PR: 29148
  -       +1: jorton, trawick, nd
  -
  -    *) mod_dav: Fix a 2518 compliance issue which affects Eclipse; give a 409 
  -       rather than a 403 for a MKCOL with a missing intermediate collection
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/fs/repos.c?r1=1.80&r2=1.81
  -       PR: 29034
  -       +1: jorton, trawick, nd
  -
       *) mod_dav: Send an EOS at the end of the multistatus brigade.
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.105&r2=1.106
          +1: jorton
  
  
  
  No                   revision
  No                   revision
  1.72.2.6  +5 -0      httpd-2.0/modules/dav/fs/repos.c
  
  Index: repos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/repos.c,v
  retrieving revision 1.72.2.5
  retrieving revision 1.72.2.6
  diff -d -w -u -r1.72.2.5 -r1.72.2.6
  --- repos.c	17 May 2004 14:13:50 -0000	1.72.2.5
  +++ repos.c	7 Jun 2004 10:41:01 -0000	1.72.2.6
  @@ -987,6 +987,11 @@
                                "There is not enough storage to create "
                                "this collection.");
       }
  +    else if (APR_STATUS_IS_ENOENT(status)) {
  +        return dav_new_error(ctx->pool, HTTP_CONFLICT, 0,
  +                             "Cannot create collection; intermediate "
  +                             "collection does not exist.");
  +    }
       else if (status != APR_SUCCESS) {
           /* ### refine this error message? */
           return dav_new_error(ctx->pool, HTTP_FORBIDDEN, 0,
  
  
  
  No                   revision
  No                   revision
  1.91.2.10 +1 -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.91.2.9
  retrieving revision 1.91.2.10
  diff -d -w -u -r1.91.2.9 -r1.91.2.10
  --- mod_dav.c	9 Feb 2004 20:53:15 -0000	1.91.2.9
  +++ mod_dav.c	7 Jun 2004 10:41:01 -0000	1.91.2.10
  @@ -1019,7 +1019,7 @@
   
       if (err2 != NULL) {
           /* just log a warning */
  -        err2 = dav_push_error(r->pool, err->status, 0,
  +        err2 = dav_push_error(r->pool, err2->status, 0,
                                 "The PUT was successful, but there "
                                 "was a problem automatically checking in "
                                 "the resource or its parent collection.",
  
  
  

Mime
View raw message