Commit 0025de6e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Fix brokenness when ThreadsPerChild is higher than the built-in 

limit.  We left ap_threads_per_child at the higher value which
led to segfaults when doing certain scoreboard operations.


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

CHANGES

+6 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.19-dev



  *) Fix brokenness when ThreadsPerChild is higher than the built-in

     limit.  We left ap_threads_per_child at the higher value which

     led to segfaults when doing certain scoreboard operations.

     [Jeff Trawick]



  *) Fix seg faults and/or missing output from mod_include.  The

     default_handler was using the subrequest pool for files and

     MMAPs, even though the associated APR structures typically

server/mpm/threaded/threaded.c

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

                     " HARD_THREAD_LIMIT define in %s.",

                     AP_MPM_HARD_LIMITS_FILE);

        ap_threads_per_child = HARD_THREAD_LIMIT;

    }

    else if (ap_threads_per_child < 1) {

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