summaryrefslogtreecommitdiffstats
path: root/modules/dav
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2013-05-14 20:58:06 +0200
committerGraham Leggett <minfrin@apache.org>2013-05-14 20:58:06 +0200
commit9bc9d79079bbeeb65f46c59ab6aa40588cbde9ff (patch)
tree2c032a4866a01a4b8e040e6cb668360a7fd75cd7 /modules/dav
parenthunk 1: C89 please; (diff)
downloadapache2-9bc9d79079bbeeb65f46c59ab6aa40588cbde9ff.tar.xz
apache2-9bc9d79079bbeeb65f46c59ab6aa40588cbde9ff.zip
core: Stop the HTTP_IN filter from attempting to write error buckets
to the output filters, which is bogus in the proxy case. Create a clean mapping from APR codes to HTTP status codes, and use it where needed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482522 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/dav')
-rw-r--r--modules/dav/main/mod_dav.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 6094049858..1d204e048f 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -1001,9 +1001,11 @@ static int dav_method_put(request_rec *r)
}
else {
/* XXX: should this actually be HTTP_BAD_REQUEST? */
- http_err = HTTP_INTERNAL_SERVER_ERROR;
- msg = apr_psprintf(r->pool, "An error occurred while reading"
- " the request body (URI: %s)", msg);
+ http_err = ap_map_http_request_error(rc,
+ HTTP_INTERNAL_SERVER_ERROR);
+ msg = apr_psprintf(r->pool,
+ "An error occurred while reading"
+ " the request body (URI: %s)", msg);
}
err = dav_new_error(r->pool, http_err, 0, rc, msg);
break;