From 58ca8dab30cd78cc8efcf6a56f93a5d8541c888e Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 17 Mar 2017 08:30:16 +0000 Subject: [PATCH] Merge r1777923 from trunk: avoid SO_REUSEPORT w/o ListenCoresBucketsRatio Can lead to unintended/confusing sharing between multiple servers started by the same ID. Submitted by: covener Reviewed by: jorton, covener, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787301 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/listen.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 003ffe897c..c77d71e9e5 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.26 + *) Don't set SO_REUSEPORT unless ListenCoresBucketsRatio is greater + than zero. [Eric Covener] + *) mod_http2: moving session cleanup to pre_close hook to avoid races with modules already shut down and slave connections still operating. [Stefan Eissing] diff --git a/server/listen.c b/server/listen.c index 98cd117c56..d44c7c9f44 100644 --- a/server/listen.c +++ b/server/listen.c @@ -153,7 +153,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server) #endif #if defined(SO_REUSEPORT) - if (ap_have_so_reuseport) { + if (ap_have_so_reuseport && ap_listencbratio > 0) { int thesock; apr_os_sock_get(&thesock, s); if (setsockopt(thesock, SOL_SOCKET, SO_REUSEPORT, -- 2.50.1