Commit e3255ed7 authored by Joe Orton's avatar Joe Orton
Browse files

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
parent 0a75a7ab

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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]

server/listen.c

+1 −1
Original line number Diff line number Diff line
@@ -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,