You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/09/01 14:10:11 UTC
svn commit: r991507 - /httpd/httpd/trunk/server/scoreboard.c
Author: trawick
Date: Wed Sep 1 12:10:11 2010
New Revision: 991507
URL: http://svn.apache.org/viewvc?rev=991507&view=rev
Log:
running_gen was only set to an interesting value on a path
where it wasn't used before returning from the function; axe it
Modified:
httpd/httpd/trunk/server/scoreboard.c
Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=991507&r1=991506&r2=991507&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Wed Sep 1 12:10:11 2010
@@ -315,7 +315,6 @@ apr_status_t ap_cleanup_scoreboard(void
*/
int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
{
- int running_gen = 0;
int i;
#if APR_HAS_SHARED_MEMORY
apr_status_t rv;
@@ -324,7 +323,6 @@ int ap_create_scoreboard(apr_pool_t *p,
pfn_ap_logio_get_last_bytes = APR_RETRIEVE_OPTIONAL_FN(ap_logio_get_last_bytes);
if (ap_scoreboard_image) {
- running_gen = ap_scoreboard_image->global->running_generation;
ap_scoreboard_image->global->restart_time = apr_time_now();
memset(ap_scoreboard_image->parent, 0,
sizeof(process_score) * server_limit);
@@ -366,7 +364,7 @@ int ap_create_scoreboard(apr_pool_t *p,
}
ap_scoreboard_image->global->sb_type = sb_type;
- ap_scoreboard_image->global->running_generation = running_gen;
+ ap_scoreboard_image->global->running_generation = 0;
ap_scoreboard_image->global->restart_time = apr_time_now();
apr_pool_cleanup_register(p, NULL, ap_cleanup_scoreboard, apr_pool_cleanup_null);