Commit 75d89aa7 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

get the last worker in a given child initialized properly 

by getting a new pool for its own proc_info structure instead
of overlaying the pool in the proc_info structure for the
prior thread

we also move through the SERVER_STARTING scoreboard state for this
worker, though this isn't as important as with the other workers,
for which a new thread must be created (potentially time consuming)


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

server/mpm/threaded/threaded.c

+3 −1
Original line number Diff line number Diff line
@@ -678,7 +678,6 @@ static void child_main(int child_num_arg) 
	 * because it let's us deal with tid better.

	 */

    }

    apr_pool_create(&my_info->tpool, pchild);

    my_info = (proc_info *)malloc(sizeof(proc_info));

    if (my_info == NULL) {

        ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf,
@@ -688,6 +687,9 @@ static void child_main(int child_num_arg) 
    my_info->pid = my_child_num;

    my_info->tid = i;

    my_info->sd = 0;

    apr_pool_create(&my_info->tpool, pchild);

    ap_update_child_status(my_child_num, i, SERVER_STARTING, 

                           (request_rec *) NULL);

    worker_thread(my_info);

}