Commit f492e06e authored by Paul Querna's avatar Paul Querna
Browse files

Move up two accepted patches


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@415141 13f79535-47bb-0310-9956-ffa450edef68
parent 7e91273a
Loading
Loading
Loading
Loading
+19 −19
Changes for STATUS: 19 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -85,6 +85,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          http://issues.apache.org/bugzilla/attachment.cgi?id=18355
      +1: chrisd, trawick, niq

    * configure: Add "--with-included-apr" flag to force use of
    bundled version of APR/APR-util rather than any installed
    versions found on the system (as preferred by find_ap?.m4).
       http://svn.apache.org/viewvc?rev=395211&view=rev
       http://svn.apache.org/viewvc?rev=410828&view=rev
      Merged version of both for 2.2.x:
       http://people.apache.org/~jorton/ap_withinc.diff
    +1: jorton, rpluem, pquerna

    * mod_cache: Make caching of reverse SSL proxies possible again.
      PR 39593.
        Trunk version of patch:
          http://svn.apache.org/viewvc?rev=407357&view=rev
          http://svn.apache.org/viewvc?rev=408154&view=rev
          http://svn.apache.org/viewvc?rev=408729&view=rev
        2.2.x version of patch:
          Trunk version works
      +1: rpluem, jim, pquerna

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

    * Add optional 'scheme://' part to ServerName directive for cases
@@ -108,25 +127,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      http://svn.apache.org/viewcvs.cgi?rev=396310&view=rev
      +1 niq, rpluem

    * configure: Add "--with-included-apr" flag to force use of
    bundled version of APR/APR-util rather than any installed
    versions found on the system (as preferred by find_ap?.m4).
       http://svn.apache.org/viewvc?rev=395211&view=rev
       http://svn.apache.org/viewvc?rev=410828&view=rev
      Merged version of both for 2.2.x:
       http://people.apache.org/~jorton/ap_withinc.diff
    +1: jorton, rpluem, pquerna

    * mod_cache: Make caching of reverse SSL proxies possible again.
      PR 39593.
        Trunk version of patch:
          http://svn.apache.org/viewvc?rev=407357&view=rev
          http://svn.apache.org/viewvc?rev=408154&view=rev
          http://svn.apache.org/viewvc?rev=408729&view=rev
        2.2.x version of patch:
          Trunk version works
      +1: rpluem, jim, pquerna

    * mod_cache: Do not overwrite the Content-Type in the cache, for
      successfully revalidated cached objects. PR 39647.
        Trunk version of patch: