From: Jacob Champion <jchampion@apache.org>
Date: Tue, 30 Aug 2016 00:19:25 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.24~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d37a2c25d7b72583d2c5234e809dbaa57946d1b;p=thirdparty%2Fapache%2Fhttpd.git

Propose.

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

diff --git a/STATUS b/STATUS
index f3a19d0e6c3..70e7ba55f93 100644
--- a/STATUS
+++ b/STATUS
@@ -208,6 +208,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: trunk works modulo CHANGES
      +1 covener
 
+   * mpm_winnt: disable the 'data' accept filter entirely to prevent denial of
+     service. PR 59970.
+     trunk patch: http://svn.apache.org/r1758307
+                  http://svn.apache.org/r1758308
+                  http://svn.apache.org/r1758309
+                  http://svn.apache.org/r1758311
+     2.4.x patch: trunk works (modulo CHANGES and APLOGNO's next-number)
+     +1: jchampion
+
+   * mpm_winnt: always zero out OVERLAPPED structs when recycling them.
+     trunk patch: http://svn.apache.org/r1758310
+     2.4.x patch: trunk works
+     +1: jchampion
+
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if