--- httpd\server\mpm\netware\mpm_netware.c Fri Apr 05 17:00:20 2002 +++ httpd-2.0.35\server\mpm\netware\mpm_netware.c Tue Apr 02 10:25:24 2002 @@ -204,10 +204,9 @@ #endif /* a clean exit from a child with proper cleanup */ -static void clean_child_exit(int code, int worker_num, apr_bucket_alloc_t *bucket_alloc) __attribute__ ((noreturn)); -static void clean_child_exit(int code, int worker_num, apr_bucket_alloc_t *bucket_alloc) +static void clean_child_exit(int code, int worker_num) __attribute__ ((noreturn)); +static void clean_child_exit(int code, int worker_num) { - apr_bucket_alloc_destroy(bucket_alloc); apr_thread_mutex_lock(worker_thread_count_mutex); worker_thread_count--; apr_thread_mutex_unlock(worker_thread_count_mutex); @@ -396,7 +395,7 @@ if ((ap_max_requests_per_child > 0 && requests_this_child++ >= ap_max_requests_per_child)) { - clean_child_exit(0, my_worker_num, bucket_alloc); + clean_child_exit(0, my_worker_num); } ap_update_child_status_from_indexes(0, my_worker_num, WORKER_READY, @@ -413,7 +412,7 @@ if (shutdown_pending || restart_pending || (ap_scoreboard_image->servers[0][my_worker_num].status == WORKER_IDLE_KILL)) { DBPRINT1 ("\nThread slot %d is shutting down\n", my_worker_num); apr_thread_mutex_unlock(accept_mutex); - clean_child_exit(0, my_worker_num, bucket_alloc); + clean_child_exit(0, my_worker_num); } /* If we just satisfied a request on listen port x, assume that more @@ -518,12 +517,12 @@ */ ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf, "apr_accept: giving up."); - clean_child_exit(APEXIT_CHILDFATAL, my_worker_num, bucket_alloc); + clean_child_exit(APEXIT_CHILDFATAL, my_worker_num); default: ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf, "apr_accept: (client socket)"); - clean_child_exit(1, my_worker_num, bucket_alloc); + clean_child_exit(1, my_worker_num); } } } @@ -545,7 +544,7 @@ } request_count++; } - clean_child_exit(0, my_worker_num, bucket_alloc); + clean_child_exit(0, my_worker_num); }