Commit 7827ab7c authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Update mod_substitute proposal with r1687680 and v2. 

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

STATUS

+4 −3
Original line number Diff line number Diff line
@@ -204,14 +204,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
  *) mod_substitute: Configure patterns merge order. PR 57641

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

                  http://svn.apache.org/r1687539 

     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore.patch

                  http://svn.apache.org/r1687680

     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v2.patch

     +1: ylavic

     ylavic: added r1687539 and discarded minfrin's vote (we must preserve

             the current behaviour).  SubstituteInheritBefore allows to

             configure the merge order; the default is Off in trunk (2.5+),

             but still On in 2.4.x thanks to the changes in the backport patch

             only (dcfg->inherit_before = 1 by default, and the doc is updated

             accordingly).

             only => over->inherit_before = (base->inherit_before != 0) instead

			 of (base->inherit_before > 0), plus the doc updated accordingly.



  *) core: Avoid a possible truncation of the faulty header included in the

     HTML response when LimitRequestFieldSize is reached.