Commit 94c0d6e9 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Revert errornous r1757659 

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

STATUS

+9 −9
Original line number Diff line number Diff line
@@ -146,14 +146,6 @@ 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 ]
@@ -239,12 +231,20 @@ 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, rpluem

     +1: ylavic





PATCHES/ISSUES THAT ARE BEING WORKED

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 */

struct dav_response

typedef struct dav_response

{

    const char *href;           /* always */

    const char *desc;           /* optional description at <response> level */
@@ -497,7 +497,7 @@ struct dav_response 
    int status;



    struct dav_response *next;

};

} dav_response;



typedef struct

{