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 4aa95c2627070bd56c7e76784088a58949a506c0..7cbae8ae4d1320ad5fd99e5fec10b2507c5cc165 100644 (file)
--- 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 189afcd1353dc5229c4282be81a9ea912f0a9005..e0067fa59f799a09564321bb4f900647798074f2 100644 (file)
--- 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 40712c0baa039b15b9e999e7a69de446d3ef005c..a4a2e1b42fd9ec68b92326847789d6de675e624b 100644 (file)
--- 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
       ;;