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 Fri, 08 Mar 2002 01:22:20 GMT
gstein      02/03/07 17:22:20

  Modified:    modules/dav/main mod_dav.c
  Log:
  * mod_dav.c (dav_handle_err):  look through the error stack for some
      kind of errortag.  any buried errortag is better than a generic
      response.
  
  Submitted by: Ben Collins-Sussman <sussman@collab.net>
  
  Revision  Changes    Path
  1.72      +10 -5     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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- mod_dav.c	7 Mar 2002 19:53:31 -0000	1.71
  +++ mod_dav.c	8 Mar 2002 01:22:20 -0000	1.72
  @@ -593,14 +593,19 @@
       dav_log_err(r, err, APLOG_ERR);
   
       if (response == NULL) {
  +        dav_error *stackerr = err;
  +
           /* our error messages are safe; tell Apache this */
           apr_table_setn(r->notes, "verbose-error-to", "*");
   
  -        /* didn't get a multistatus response passed in, but we still
  -           might be able to generate a standard <D:error> response. */
  -        if (err->tagname) {
  -            return dav_error_response_tag(r, err);
  -        }
  +        /* Didn't get a multistatus response passed in, but we still
  +           might be able to generate a standard <D:error> response.
  +           Search the error stack for an errortag. */
  +        while (stackerr != NULL && stackerr->tagname == NULL)
  +            stackerr = stackerr->prev;
  +
  +        if (stackerr != NULL && stackerr->tagname != NULL)
  +            return dav_error_response_tag(r, stackerr);
   
           return err->status;
       }
  
  
  

Mime
View raw message