Merge r501364 from trunk:

* server/listen.c (ap_apply_accept_filter): Bump TCP_DEFER_ACCEPT
argument to 30 units-of-unspecified-nature.

Submitted by: Dean Gaudet <dean arctic.org>
Reviewed by: ylavic, trawick, covener

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

diff --git a/CHANGES b/CHANGES
index 0853c8d5373964c8560135513e2fc97ed05cc238..189ed749b75d6f48985c3aafa8e35e917d4b14af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache 2.2.28
 
 
+  *) core: Increase TCP_DEFER_ACCEPT socket option to from 1 to 30 seconds. 
+     PR 41270. [Dean Gaudet <dean arctic org>]
 
 Changes with Apache 2.2.27
 

diff --git a/STATUS b/STATUS
index 05fbefdf47b00d8819cbb170817953df727a205a..ed27fb4015aba2405a5c8fa45172d80171f8d757 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -99,11 +99,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: Increase TCP_DEFER_ACCEPT socket option from 1 to 30 seconds. PR 41270.
-     trunk patch: http://svn.apache.org/r501364
-     2.2.x patch: trunk works
-     +1: ylavic, trawick, covener
-
    * mod_cache: Don't remove stale cache entries that cannot be conditionally
      revalidated. This prevents the thundring herd protection from serving
      stale during a revalidation. Reverts most of r572626 which is also gone

diff --git a/server/listen.c b/server/listen.c
index b284d83b3c7cd137c79cba015174a227655821e3..6cc1c80ed37c6556deaae09c4d3c8781947ec703 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -225,7 +225,7 @@ static void ap_apply_accept_filter(apr_pool_t *p, ap_listen_rec *lis,
         }
 #else
 #ifdef APR_TCP_DEFER_ACCEPT
-        rv = apr_socket_opt_set(s, APR_TCP_DEFER_ACCEPT, 1);
+        rv = apr_socket_opt_set(s, APR_TCP_DEFER_ACCEPT, 30);
         if (rv != APR_SUCCESS && !APR_STATUS_IS_ENOTIMPL(rv)) {
             ap_log_perror(APLOG_MARK, APLOG_WARNING, rv, p,
                               "Failed to enable APR_TCP_DEFER_ACCEPT");