You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2009/11/09 22:32:10 UTC
svn commit: r834245 - in /httpd/httpd/trunk: CHANGES
modules/dav/main/mod_dav.c
Author: sf
Date: Mon Nov 9 21:32:10 2009
New Revision: 834245
URL: http://svn.apache.org/viewvc?rev=834245&view=rev
Log:
mod_dav_fs: Include uri when logging a PUT error due to connection abort.
PR: 38149
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/dav/main/mod_dav.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=834245&r1=834244&r2=834245&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Nov 9 21:32:10 2009
@@ -10,7 +10,10 @@
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
Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.c?rev=834245&r1=834244&r2=834245&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Mon Nov 9 21:32:10 2009
@@ -982,7 +982,10 @@
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 @@
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;
}