Commit 3c55bae1 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promote 


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

STATUS

+8 −7
Original line number Diff line number Diff line
@@ -123,6 +123,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, jim, covener



  *) http: Respond with "408 Request Timeout" when a timeout occurs while

     reading the request body.  PR 60313.

     trunk patch: http://svn.apache.org/r1739201

     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1739201.patch

                  (w/o the APR_EGENERAL case added in r1482918, not in 2.4.x)

     +1: ylavic, covener, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]
@@ -215,13 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     +1: jim, ylavic

     ylavic: r1756553 and r1649491 have a CHANGES entry.



  *) http: Respond with "408 Request Timeout" when a timeout occurs while

     reading the request body.  PR 60313.

     trunk patch: http://svn.apache.org/r1739201

     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1739201.patch

                  (w/o the APR_EGENERAL case added in r1482918, not in 2.4.x)

     +1: ylavic, covener, jim



  *) core: avoid adding multiple subrequest filters when there are nested 

     subrequests.  PR58292

     trunk patch:  http://svn.apache.org/r1698334