From: Jim Jagielski <jim@apache.org>
Date: Wed, 26 Jun 2013 13:01:00 +0000 (+0000)
Subject: Merge r1496429 from trunk:
X-Git-Tag: 2.4.5~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c62fd1aa1a196c36b0c18c74d66cb011cfbced5;p=apache

Merge r1496429 from trunk:

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

PR: 55121
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index 4aa95c2627..7cbae8ae4d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.5
 
+  *) core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
+     on Linux kernel versions 3.x and above.  PR 55121.  [Bradley Heilbrun
+     <apache heilbrun.org>]
+
   *) mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
      correctly. [Jens Låås <jelaas gmail.com>]
 
diff --git a/STATUS b/STATUS
index 189afcd135..e0067fa59f 100644
--- a/STATUS
+++ b/STATUS
@@ -91,11 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * 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.4.x patch: trunk patch works modulo CHANGES
-    +1: trawick, jorton, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/configure.in b/configure.in
index 40712c0baa..a4a2e1b42f 100644
--- a/configure.in
+++ b/configure.in
@@ -315,10 +315,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
       ;;