From 6e86e9a5634b48d9d1d2e9fcbd27be0ead46db03 Mon Sep 17 00:00:00 2001 From: Brian Havard Date: Sat, 23 Feb 2002 11:25:57 +0000 Subject: [PATCH] Handle shift of restart_time into scoreboard. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93547 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/mpmt_os2/mpmt_os2.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 61d75aafc5..bf2f4cc0e2 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -143,7 +143,6 @@ typedef struct { } listen_socket_t; typedef struct { - apr_time_t restart_time; HMTX accept_mutex; listen_socket_t listeners[1]; } parent_info_t; @@ -174,7 +173,6 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s ) ap_listen_rec *lr; int num_listeners = 0; - ap_restart_time = parent_info->restart_time; ap_mpm_accept_mutex = parent_info->accept_mutex; /* Set up a default listener if necessary */ @@ -291,8 +289,6 @@ static char master_main() return FALSE; } - ap_restart_time = apr_time_now(); - parent_info->restart_time = ap_restart_time; parent_info->accept_mutex = ap_mpm_accept_mutex; /* Allocate shared memory for scoreboard */ @@ -311,6 +307,7 @@ static char master_main() ap_init_scoreboard(sb_mem); } + ap_scoreboard_image->global->restart_time = apr_time_now(); ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf, "%s configured -- resuming normal operations", ap_get_server_version()); -- 2.50.1