From: Jim Jagielski <jim@apache.org>
Date: Tue, 4 Feb 2014 14:20:56 +0000 (+0000)
Subject: ipromote
X-Git-Tag: 2.4.8~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c27c0f81e113128d193ef333a17441c2e480eba;p=apache

ipromote


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

diff --git a/STATUS b/STATUS
index acda3e0882..7b11b384c7 100644
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * WinNT MPM: If ap_run_pre_connection() fails or sets c->aborted, don't
+     save the socket for reuse by the next worker as if it were an
+     APR_SO_DISCONNECTED socket. Restores 2.2 behavior.
+     trunk patch: http://svn.apache.org/r1523387
+     2.4.x patch: trunk works
+     +1: trawick, covener, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -177,13 +184,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch:  trunk works mod/ next_number
      +1: jim
 
-   * WinNT MPM: If ap_run_pre_connection() fails or sets c->aborted, don't
-     save the socket for reuse by the next worker as if it were an
-     APR_SO_DISCONNECTED socket. Restores 2.2 behavior.
-     trunk patch: http://svn.apache.org/r1523387
-     2.4.x patch: trunk works
-     +1: trawick, covener, jim
-
    * mod_ssl: Remove the hardcoded algorithm-type dependency for the
      SSLCertificateFile and SSLCertificateKeyFile directives, and deprecate
      SSLCertificateChainFile. A detailed list of the changes is included