Commit ed686a4e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

threaded: Fix the resetting of MaxClients when it isn't a multiple 

of the number of threads per process.


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

CHANGES

+4 −4
Original line number Diff line number Diff line 
Changes with Apache 2.0.29-dev



  *) Really reset the MaxClients value in worker when the

     configured value is not a multiple of the number of threads

     per child.  We said we did previously but we forgot to.

     [Jeff Trawick]

  *) Really reset the MaxClients value in worker and threaded

     when the configured value is not a multiple of the number 

     of threads per child.  We said we did previously but we 

     forgot to. [Jeff Trawick]



  *) Add Debian layout.  [Daniel Stone <daniel@sfarc.net>]

server/mpm/threaded/threaded.c

+1 −0
Original line number Diff line number Diff line
@@ -1523,6 +1523,7 @@ static const char *set_server_limit (cmd_parms *cmd, void *dummy, 
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

                    " for a maximum of %d child processes,",

                    ap_daemons_limit);

       max_clients = ap_daemons_limit * ap_threads_per_child;

    }

    if (ap_daemons_limit > HARD_SERVER_LIMIT) {

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,