mod_dav_fs: Include uri when logging a PUT error due to connection abort.

PR: 38149

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834245 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 73878422d25e8791967cb88810a09ad0b7599a65..0ebac2be3bb135d8286b896eee476dcd5295e686 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,10 @@ Changes with Apache 2.3.3
      mod_proxy_ftp: NULL pointer dereference on error paths.
      [Stefan Fritsch <sf fritsch.de>, Joe Orton]
 
-  *) mod_dav_fs; Return 409 instead of 500 for a LOCK request if the parent
+  *) mod_dav_fs: Include uri when logging a PUT error due to connection abort.
+     PR 38149. [Stefan Fritsch]
+
+  *) mod_dav_fs: Return 409 instead of 500 for a LOCK request if the parent
      resource does not exist or is not a collection. PR 43465. [Stefan Fritsch]
 
   *) mod_dav_fs: Return 409 instead of 500 for Litmus test case copy_nodestcoll

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index bdc14448c013e3a71e4ec237fd96f2baa814d034..1e6f303c561c0bea8aac3824142921af1a794ff8 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -982,7 +982,10 @@ static int dav_method_put(request_rec *r)
 
             if (rc != APR_SUCCESS) {
                 err = dav_new_error(r->pool, HTTP_INTERNAL_SERVER_ERROR, 0,
-                                    "Could not get next bucket brigade");
+                                    apr_psprintf(r->pool,
+                                                 "Could not get next bucket "
+                                                 "brigade (URI: %s)",
+                                                 ap_escape_html(r->pool, r->uri)));
                 break;
             }
 
@@ -1005,8 +1008,10 @@ static int dav_method_put(request_rec *r)
                 rc = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);
                 if (rc != APR_SUCCESS) {
                     err = dav_new_error(r->pool, HTTP_BAD_REQUEST, 0,
-                                        "An error occurred while reading "
-                                        "the request body.");
+                                        apr_psprintf(r->pool,
+                                                    "An error occurred while reading"
+                                                    " the request body (URI: %s)",
+                                                    ap_escape_html(r->pool, r->uri)));
                     break;
                 }