Merge r1527509 from trunk:

mod_dav: set r->status_line in dav_error_response.
It's used as argument in next ap_rvputs call. PR 55426.

Submitted by: jkaluza
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1634519 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b76cfd0d28fea7cb37df0c7d9edc432ad4bac9f5..f10f86943174cf7118d997e56e35130ba38cfac8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.11
 
+  *) mod_dav: Set r->status_line in dav_error_response. PR 55426.
+
   *) SECURITY: CVE-2014-3581 (cve.mitre.org)
      mod_cache: Avoid a crash when Content-Type has an empty value.
      PR 56924.  [Mark Montague <mark catseye.org>, Jan Kaluza]

diff --git a/STATUS b/STATUS
index 4efb37bcd440f0d7fae6cc39057452e7ba9a5864..f46e044610b9ea07efaff45bc1bcaa15df00bddc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -102,12 +102,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_dav: set r->status_line in dav_error_response.
-     It's used as argument in next ap_rvputs call. PR 55426.
-     trunk patch: http://svn.apache.org/r1527509
-     2.4.x patch: trunk works
-     +1: jkaluza, ylavic, rjung
-
    * mod_proxy: Make worker name truncation a non-fatal error.
      trunk patch: http://svn.apache.org/r1621367
                   http://svn.apache.org/r1621372

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 07a4e2c52be9716f3e429ea2ee460869e854b23a..72d621a7bddca088b344f249a0b8a66b82726ffc 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -315,6 +315,7 @@ static const char *dav_cmd_davmintimeout(cmd_parms *cmd, void *config,
 static int dav_error_response(request_rec *r, int status, const char *body)
 {
     r->status = status;
+    r->status_line = ap_get_status_line(status);
 
     ap_set_content_type(r, "text/html; charset=ISO-8859-1");