make COMPATIBILITY entries explicit

[apache] / STATUS

diff --git a/STATUS b/STATUS
index 0a57f09cfdf33148207fd9c385244dab5bbc74be..53735f4ae4df53e870f44b7756ffabbeab42bce6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -5,11 +5,6 @@ The current version of this file can be found at:
 
   * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/STATUS
 
-Documentation status is maintained separately and can be found at:
-
-  * docs/STATUS in this source tree, or
-  * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/docs/STATUS
-
 The current development branch of this software can be found at:
 
   * http://svn.apache.org/repos/asf/httpd/httpd/trunk
@@ -21,10 +16,11 @@ Consult the following STATUS files for information on related projects:
   * http://svn.apache.org/repos/asf/apr/apr-util/branches/1.4.x/STATUS
   * http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x/STATUS
   * http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x/STATUS
+  * http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/STATUS
+  * http://svn.apache.org/repos/asf/apr/apr-util/branches/1.6.x/STATUS
 
 Patches considered for backport are noted in their branches' STATUS:
 
-  * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/STATUS
   * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS
   * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/STATUS
 
@@ -34,7 +30,8 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
-    2.4.26  : In development.
+    2.4.27  : In development. Jim proposes a T&R on July 6, 2017.
+    2.4.26  : Tagged on June 13, 2017. Released on June 19, 2017.
     2.4.25  : Tagged on December 16, 2016. Released on December 21, 2016.
     2.4.24  : Tagged on December 16, 2016, not released.
     2.4.23  : Tagged on June 30, 2016. Released on July 05, 2016.
@@ -107,7 +104,7 @@ CURRENT RELEASE NOTES:
     then merge into branches/2.4.x, as applicable.
 
   * Current exceptions for RTC for this branch:
-    . http/2 - mod_http2
+    . mod_proxy_http2
     . mod_lua
     . documentation
     . non-Unix build
@@ -115,13 +112,10 @@ CURRENT RELEASE NOTES:
 
 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 ]
 
@@ -187,26 +181,21 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1774538
                   http://svn.apache.org/r1779354
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mpm_event-wakeup-v7.1.patch
-     +1: ylavic
-
-  *) MPMs unix: Place signals handlers and helpers out of DSOs to avoid a
-     possible crash if a signal is caught during (graceful) restart. PR 60487.
-     trunk patch: http://svn.apache.org/r1783849
-     2.4.x patch: svn merge -c 1783849 ^/httpd/httpd/trunk .
-                  (trunk works, modulo CHANGES)
-     +1: ylavic
-
-  *) proxy_wstunnel: Restore ability to process other Upgrade: protocols which was
-     blocked in r1674632/r1674661.
-     trunk patch: http://svn.apache.org/r1792092
-                  http://svn.apache.org/r1796864
-     2.4.x patch: svn merge -c  1792092,1796864 ^/httpd/httpd/trunk .
-     +1: covener, jim
-
-
+     +1: ylavic, icing
+
+   *) prefork: This fixes race-condition in signals handling when httpd is
+               runnning on foreground and user hits ctrl+c
+     trunk patch: http://svn.apache.org/r1618555
+     2.4.x patch: svn merge -c 1618555 ^/httpd/httpd/trunk .
+     +1: ylavic 
+     jailetc36: untested because I'm unsure on how to reproduce the race, but
+                the patch description looks straighforward.
+                If confirmed, it would worth, IMHO, a CHANGE entry and maybe a
+                2.2.x backport.
+     
 
 PATCHES/ISSUES THAT ARE BEING WORKED
-  [ New entried should be added at the START of the list ]
+  [ New entries should be added at the START of the list ]
 
   *) mod_ssl: Return 502 instead of 500 when SSL peer check or 
      proxy_post_handshake hook fails.