diff options
| author | Bill Stoddard <stoddard@apache.org> | 2002-02-19 22:09:27 +0100 |
|---|---|---|
| committer | Bill Stoddard <stoddard@apache.org> | 2002-02-19 22:09:27 +0100 |
| commit | b1e828a3bfce35578acbde18857d03b2f7e797f4 (patch) | |
| tree | e9373fc52a5c99828dbe1c9ca1baa3a70714ee06 /modules/generators/mod_status.c | |
| parent | Here goes: now committing the transformed version of the xml docs. This is (diff) | |
| download | apache2-b1e828a3bfce35578acbde18857d03b2f7e797f4.tar.xz apache2-b1e828a3bfce35578acbde18857d03b2f7e797f4.zip | |
This fixes a bug in mod_status on Windows where restart time was not
properly initialized.
Move ap_restart_time into the scoreboard global area so the child process
on non-forking platforms can have access to it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93502 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/generators/mod_status.c')
| -rw-r--r-- | modules/generators/mod_status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 6970243d54..81a813ff78 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -358,7 +358,7 @@ static int status_handler(request_rec *r) } /* up_time in seconds */ - up_time = (apr_uint32_t) ((nowtime - ap_restart_time)/APR_USEC_PER_SEC); + up_time = (apr_uint32_t) ((nowtime - ap_scoreboard_image->global->restart_time)/APR_USEC_PER_SEC); if (!short_report) { ap_rputs(DOCTYPE_HTML_3_2 @@ -373,7 +373,7 @@ static int status_handler(request_rec *r) ap_rvputs(r, "<dt>Current Time: ", ap_ht_time(r->pool, nowtime, DEFAULT_TIME_FORMAT, 0), "</dt>\n", NULL); ap_rvputs(r, "<dt>Restart Time: ", - ap_ht_time(r->pool, ap_restart_time, DEFAULT_TIME_FORMAT, 0), + ap_ht_time(r->pool, ap_scoreboard_image->global->restart_time, DEFAULT_TIME_FORMAT, 0), "</dt>\n", NULL); ap_rprintf(r, "<dt>Parent Server Generation: %d</dt>\n", (int) ap_my_generation); ap_rputs("<dt>Server uptime: ", r); |