You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/08/19 13:37:24 UTC
svn commit: r1515367 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
support/fcgistarter.c
Author: trawick
Date: Mon Aug 19 11:37:24 2013
New Revision: 1515367
URL: http://svn.apache.org/r1515367
Log:
fcgistarter: Specify SO_REUSEADDR to allow starting a server
with old connections in TIME_WAIT.
Submitted by: trawick
Reviewed by: covener, sf
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/support/fcgistarter.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1515050
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1515367&r1=1515366&r2=1515367&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Aug 19 11:37:24 2013
@@ -2,6 +2,9 @@
Changes with Apache 2.4.7
+ *) fcgistarter: Specify SO_REUSEADDR to allow starting a server
+ with old connections in TIME_WAIT. [Jeff Trawick]
+
*) core: Add open_htaccess hook which, in conjunction with dirwalk_stat
and post_perdir_config (introduced in 2.4.5), allows mpm-itk to be
used without patches to httpd core. [Stefan Fritsch]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1515367&r1=1515366&r2=1515367&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Aug 19 11:37:24 2013
@@ -127,12 +127,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk patch works
+1: jim, druggeri, sf
- * fcgistarter: Specify SO_REUSEADDR to allow starting a server with old
- connections in TIME_WAIT.
- trunk: http://svn.apache.org/r1515050
- 2.4.x patch: trunk patch works
- +1: trawick, covener, sf
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/support/fcgistarter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/fcgistarter.c?rev=1515367&r1=1515366&r2=1515367&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/fcgistarter.c (original)
+++ httpd/httpd/branches/2.4.x/support/fcgistarter.c Mon Aug 19 11:37:24 2013
@@ -133,6 +133,11 @@ int main(int argc, const char * const ar
exit_error(rv, "apr_socket_create");
}
+ rv = apr_socket_opt_set(skt, APR_SO_REUSEADDR, 1);
+ if (rv) {
+ exit_error(rv, "apr_socket_opt_set(APR_SO_REUSEADDR)");
+ }
+
rv = apr_socket_bind(skt, skaddr);
if (rv) {
exit_error(rv, "apr_socket_bind");