Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1564311 - /httpd/httpd/branches/2.4.x/STATUS
Date: Tue, 04 Feb 2014 14:20:57 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20140204142057.123FC238899C@eris.apache.org>

Author: jim
Date: Tue Feb  4 14:20:56 2014
New Revision: 1564311

URL: http://svn.apache.org/r1564311
Log:
ipromote

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1564311&r1=1564310&r2=1564311&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Feb  4 14:20:56 2014
@@ -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