From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 27 Jun 2013 16:59:04 +0000 (+0000)
Subject: core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
X-Git-Tag: 2.2.25~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03a7901a4dca3cd827560ffc57821ca5e5f8a744;p=thirdparty%2Fapache%2Fhttpd.git

core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.

PR: 55121
Backports: r1496429
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick, wrowe, rjung



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

diff --git a/CHANGES b/CHANGES
index da953a7dc07..d2f1d7c9a07 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,6 +42,10 @@ Changes with Apache 2.2.25
      result in a 412 Precondition Failed. PR54610 [Timothy Wood
      <tjw omnigroup.com>]
 
+  *) core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
+     on Linux kernel versions 3.x and above.  PR 55121.  [Bradley Heilbrun
+     <apache heilbrun.org>]
+
 Changes with Apache 2.2.24
 
   *) SECURITY: CVE-2012-3499 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index ba7e322e16f..7e2b40580d0 100644
--- a/STATUS
+++ b/STATUS
@@ -112,12 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.2.x patch: trunk patch works (minus CHANGES)
     +1: minfrin, wrowe, rjung
 
-  * core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
-    on Linux kernel versions 3.x and above.  (PR 55121)
-    trunk patch: http://svn.apache.org/r1496429
-    2.2.x patch: trunk patch works modulo CHANGES
-    +1: trawick, wrowe, rjung
-
   * mod_ssl/proxy: enable the SNI extension for backend TLS connections
     [Kaspar Brand]
     2.2.x patch: http://people.apache.org/~rjung/patches/r1175416-2.0-v2.patch
diff --git a/configure.in b/configure.in
index d21c2847e09..cc6ca13e400 100644
--- a/configure.in
+++ b/configure.in
@@ -275,10 +275,11 @@ case $host in
       ;;
   *-linux-*)
       case `uname -r` in
-        2.[[2-9]]* ) 
-            APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
+        # Unserialized accept() was not recommended until Linux 2.2.
+        [[01]].* | 2.[[01]]* )
             ;;
         * )
+            APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
             ;;
       esac
       ;;