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: r1608298 - in /httpd/httpd/branches/2.2.x: ./ CHANGES
 STATUS
 server/listen.c
Date: Sun, 06 Jul 2014 21:49:07 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
Message-Id: <20140706214907.C011923889FA@eris.apache.org>

Author: covener
Date: Sun Jul  6 21:49:06 2014
New Revision: 1608298

URL: http://svn.apache.org/r1608298
Log:
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


Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/listen.c

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r501364

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1608298&r1=1608297&r2=1608298&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Jul  6 21:49:06 2014
@@ -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
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1608298&r1=1608297&r2=1608298&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Jul  6 21:49:06 2014
@@ -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

Modified: httpd/httpd/branches/2.2.x/server/listen.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/listen.c?rev=1608298&r1=1608297&r2=1608298&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/listen.c (original)
+++ httpd/httpd/branches/2.2.x/server/listen.c Sun Jul  6 21:49:06 2014
@@ -225,7 +225,7 @@ static void ap_apply_accept_filter(apr_p
         }
 #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");