]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix people->home links, propose new mem_cache_client_abort fix, vote and promote.
authorYann Ylavic <ylavic@apache.org>
Sat, 25 Jun 2016 21:27:43 +0000 (21:27 +0000)
committerYann Ylavic <ylavic@apache.org>
Sat, 25 Jun 2016 21:27:43 +0000 (21:27 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1750225 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 54d51c68e8fc189483c80f43d57ab150dd711328..43c248167ca0997bf98b8474d4779819053203f4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -103,28 +103,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
-  *) mod_substitute: Configure patterns merge order. PR 57641
-     trunk patch: http://svn.apache.org/r1684900
-                  http://svn.apache.org/r1687539 
-                  http://svn.apache.org/r1687680
-                  http://svn.apache.org/r1688331
-                  http://svn.apache.org/r1688339
-                  http://svn.apache.org/r1688340
-                  http://svn.apache.org/r1688343
-                  http://svn.apache.org/r1697013
-                  http://svn.apache.org/r1697015
-     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v5.patch
-     +1: ylavic, rpluem
-     rpluem: Doesn't that change the previous behaviour if SubstituteInheritBefore is not set?
-     ylavic: yes thanks, updated to v5 including r1697013 and r1697015,
-             the diff to v4 is:
-             http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v4_vs_v5.diff
-     wrowe notes that rollup 2.2.x patch is not found
-
   *) mod_proxy: Fix a race condition that caused a failed worker to be retried
      before the retry period is over
       Trunk version of patch:
@@ -132,14 +110,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/r1697323
       Backport version for 2.2.x of patch:
          http://people.apache.org/~rpluem/patches/proxy_race_retry_2.2.x_v2.diff
-      +1: rpluem, wrowe
+      +1: rpluem, wrowe, ylavic
 
   *) mod_proxy: save DNS lookups
       trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1462269
                    https://svn.apache.org/viewvc?view=revision&revision=1463455
       2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1511313
       2.2.x patch: http://people.apache.org/~rpluem/patches/proxy-dns-patch_2.2.x.diff
-      +1: rpluem, wrowe
+      +1: rpluem, wrowe, ylavic
 
   *) mod_proxy: Give ap_proxy_post_request as chance to act correctly on the status code
      by setting r->status temporarily to access_status. r->status might be different than
@@ -150,12 +128,41 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/r1597352
      Backport version for 2.2.x of patch:
         http://people.apache.org/~rpluem/patches/proxy_post_request_status_code.diff
-     +1: rpluem, wrowe
+     +1: rpluem, wrowe, ylavic
+
+  *) mime.types: Add common extension "m4a" for MPEG 4 Audio.
+     As a reference see Wikipedia:
+     https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A
+     PR: 57895
+     trunk patch: http://svn.apache.org/r1723567
+     2.2.x patch: trunk works, modulo CHANGES
+     +1: rjung, wrowe, ylavic
+
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+  *) mod_substitute: Configure patterns merge order. PR 57641
+     trunk patch: http://svn.apache.org/r1684900
+                  http://svn.apache.org/r1687539 
+                  http://svn.apache.org/r1687680
+                  http://svn.apache.org/r1688331
+                  http://svn.apache.org/r1688339
+                  http://svn.apache.org/r1688340
+                  http://svn.apache.org/r1688343
+                  http://svn.apache.org/r1697013
+                  http://svn.apache.org/r1697015
+     2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-SubstituteInheritBefore-v5.patch
+     +1: ylavic, rpluem
+     rpluem: Doesn't that change the previous behaviour if SubstituteInheritBefore is not set?
+     ylavic: yes thanks, updated to v5 including r1697013 and r1697015,
+             the diff to v4 is:
+             http://home.apache.org/~ylavic/patches/httpd-2.2.x-SubstituteInheritBefore-v4_vs_v5.diff
 
   *) mod_mem_cache: Don't cache incomplete responses when the client aborts the connection.
      Not applicable to trunk, mod_mem_cache doesn't exist there.
-     2.2.x patch: http://people.apache.org/~elu/mem_cache_client_abort.diff
-     +1: elu,
+     2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-mem_cache_client_abort-v2.patch
+     +1: ylavic
      ylavic: don't we know from the very beginning of store_body() if
              r->connection->aborted, so to fail there?
      rpluem: Agreed. I guess we can move this up to line 733 before the loop.
@@ -167,6 +174,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              client won't receive it completely.
      wrowe asks: Refreshed patch yet?  Will give this a week before moving to
                  the 'stalled' section below.
+     ylavic: Above proposal in v2.
 
   *) mod_proxy: don't recyle backend announced "Connection: close" connections
      to avoid reusing it should the close be effective after some new request
@@ -174,11 +182,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1678763
                   http://svn.apache.org/r1703807
                   http://svn.apache.org/r1703813
-     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_proxy-connection_close.patch
+     2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-mod_proxy-connection_close.patch
      +1: ylavic, rpluem
      ylavic: while at it, I also included r1678763 which is only an
              optimization, but allows to keep code in sync with 2.4/trunk.
-     wrowe notes this patch is missing 
 
   *) mod_ssl: Free dhparams and ecparams reading certificates at startup.
      This fixes issue when SSLCryptoDevice does not get unregistered because
@@ -188,15 +195,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1733088 [CHANGES]
      trunk patch: http://svn.apache.org/r1733089 [CHANGES]
      2.2.x patch: https://raw.githubusercontent.com/wrowe/patches/master/backport-free-dh-ec-params-2.2.x.patch 
-     +1: wrowe
-
-  *) mime.types: Add common extension "m4a" for MPEG 4 Audio.
-     As a reference see Wikipedia:
-     https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A
-     PR: 57895
-     trunk patch: http://svn.apache.org/r1723567
-     2.2.x patch: trunk works, modulo CHANGES
-     +1: rjung, wrowe [suggests treating this as a docs change, C-T-R]
+     +1: wrowe, ylavic
 
   *) mod_proxy_connect: The connect method doesn't work if the client is
      connecting to the apache proxy through an ssl socket. Fixed.