From: Jim Jagielski <jim@apache.org>
Date: Thu, 25 Aug 2016 12:51:05 +0000 (+0000)
Subject: Merge r1756611, r1748155 from trunk:
X-Git-Tag: 2.4.24~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60885075eca80634f28fdeb7226111c6807ab9e1;p=apache

Merge r1756611, r1748155 from trunk:

mod_dav: follow up to r1746207:  fix typo (missing '/') for closing tag.



mod_dav: making mod_dav.h compile with clang again
Submitted by: ylavic, icing
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index c37f063293..6739007732 100644
--- a/STATUS
+++ b/STATUS
@@ -117,14 +117,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) 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
-
   *) ab: Set the Server Name Indication (SNI) extension on outgoing TLS
      connections (unless -I is specified), according to the Host header (if
      any) or the requested URL's hostname otherwise.
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 01a7d29300..aed987dca8 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 3aaae2e565..63fd990463 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
 {