Commit 38daa344 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 1485d646

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -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.

modules/dav/main/mod_dav.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

modules/dav/main/mod_dav.h

+2 −2
Original line number Diff line number Diff line
@@ -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

{