]> granicus.if.org Git - apache/commitdiff
Merged*3.
authorJoe Orton <jorton@apache.org>
Tue, 10 Oct 2017 17:57:07 +0000 (17:57 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 10 Oct 2017 17:57:07 +0000 (17:57 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1811750 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 6abbd367ffa464d14764eb04fbf11bbf72b01a24..a549c6703601e3d4b89e8efea3a3f47c315a9689 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -128,12 +128,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_authz_dbd: Fix a segmentation fault if AuthzDBDQuery is not set.
-     PR 61546
-     trunk patch: http://svn.apache.org/r1809209
-     2.4.x patch: svn merge -c 1809209 ^/httpd/httpd/trunk .
-     +1: jailletc36 (by inspection), ylavic, elukey
-
    *) mod_http2: Fix race condition on request body handlign.
       2.4.x patch: svn merge -c 1804096,1807238,1809981,1810088,1810089 ^/httpd/httpd/trunk .
       +1: icing, steffenal, ylavic
@@ -145,18 +139,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c 1808746,1809028 ^/httpd/httpd/trunk .
       +1: elukey, ylavic, wrowe
 
-  *) mod_rewrite: Add support for running external mapping programs
-     as non-root user.
-     trunk patch: https://svn.apache.org/r1664565
-     2.4.x patch: trunk works modulo docs, CHANGES
-     +1: jorton, wrowe, ylavic
-
-  *) core: Rewrite Content-Length filter to avoid arbitrary memory
-     consumption for streaming responses (e.g. large CGI scripts)
-     trunk patch: https://svn.apache.org/r1808230
-     2.4.x patch: trunk works
-     +1: jorton, wrowe, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]