From: Eric Covener <covener@apache.org>
Date: Mon, 9 Jan 2017 00:47:16 +0000 (+0000)
Subject: avoid SO_REUSEPORT w/o ListenCoresBucketsRatio
X-Git-Tag: 2.5.0-alpha~799
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b76545b78904c1a5cbf96d962b2c735bf4225d59;p=thirdparty%2Fapache%2Fhttpd.git

avoid SO_REUSEPORT w/o ListenCoresBucketsRatio

Can lead to unintended/confusing sharing between
multiple servers started by the same ID.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777923 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1dfa156b01b..fb9e3b2e6e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) Don't set SO_REUSEPORT unless ListenCoresBucketsRatio is greater
+     than zero.  [Eric Covener]
+
   *) mod_http2: streaming of request output now reacts timely to data
      from other streams becoming available. Same for new incoming requests.
      [Stefan Eissing]
diff --git a/server/listen.c b/server/listen.c
index 24a389bf4b9..9989b807486 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -146,7 +146,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server, int do_bind_
 #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,