From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 25 Aug 2016 11:26:46 +0000 (+0000)
Subject: * Vote and promote
X-Git-Tag: 2.4.24~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd37eadf975283e78702537ea298afb963bbf771;p=thirdparty%2Fapache%2Fhttpd.git

* Vote and promote

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

diff --git a/STATUS b/STATUS
index 1b6ec214f86..ada3c926a68 100644
--- a/STATUS
+++ b/STATUS
@@ -146,6 +146,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: wrowe, ylavic, sf
 
+  *) mod_dav: fix typo (missing '/') in closing tag (follow up to r1756560
+     which backported r1746207 in 2.4.24). Plus r1748155 to fix compiling with
+     clang.
+     trunk patch: http://svn.apache.org/r1756611
+                  http://svn.apache.org/r1748155
+     2.4.x patch: trunk works
+     +1: ylavic, sf, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -231,20 +239,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1750392.patch
      +1: ylavic
 
-  *) mod_dav: fix typo (missing '/') in closing tag (follow up to r1756560
-     which backported r1746207 in 2.4.24). Plus r1748155 to fix compiling with
-     clang.
-     trunk patch: http://svn.apache.org/r1756611
-                  http://svn.apache.org/r1748155
-     2.4.x patch: trunk works
-     +1: ylavic, sf
-
   *) mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
      triggering mod_proxy_connect's AH01018 once the tunnel is established.
      trunk patch: http://svn.apache.org/r1754391
                   http://svn.apache.org/r1754399
      2.4.x patch: trunk works (module CHANGES)
-     +1: ylavic
+     +1: ylavic, rpluem
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 01a7d29300e..aed987dca8d 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -375,7 +375,7 @@ static int dav_error_response_tag(request_rec *r,
         else {
             ap_rprintf(r,
                     ">" DEBUG_CR
-                    "<D:%s>%s<D:%s>" DEBUG_CR,
+                    "<D:%s>%s</D:%s>" DEBUG_CR,
                     err->tagname, err->childtags, err->tagname);
         }
     }
diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 93b9b4e27d0..e354e8b44ba 100644
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -486,7 +486,7 @@ typedef struct
 } dav_get_props_result;
 
 /* holds the contents of a <response> element */
-typedef struct dav_response
+struct dav_response
 {
     const char *href;           /* always */
     const char *desc;           /* optional description at <response> level */
@@ -497,7 +497,7 @@ typedef struct dav_response
     int status;
 
     struct dav_response *next;
-} dav_response;
+};
 
 typedef struct
 {