From 6816e9ff0f50c0cac694e4991e8e4c36b549cf8b Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 1 Feb 2012 13:36:37 +0000 Subject: [PATCH] Align 2.4 w/ trunk... since 2.4.0 was never released, API change is OK. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239125 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_mmn.h | 3 ++- include/scoreboard.h | 1 - server/scoreboard.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 7df163b7c7..319dc45ffc 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -384,6 +384,7 @@ * ap_proxy_strmatch_path, ap_proxy_strmatch_domain, * ap_proxy_table_unmerge(), proxy_lb_workers. * 20120109.0 (2.4.1-dev) Changes sizeof(overrides_t) in core config. + * 20120109.1 (2.4.1-dev) remove sb_type in global_score. */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -391,7 +392,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120109 #endif -#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/scoreboard.h b/include/scoreboard.h index 8165d57ed3..3145005647 100644 --- a/include/scoreboard.h +++ b/include/scoreboard.h @@ -120,7 +120,6 @@ struct worker_score { typedef struct { int server_limit; int thread_limit; - ap_scoreboard_e sb_type; ap_generation_t running_generation; /* the generation of children which * should still be serving requests. */ diff --git a/server/scoreboard.c b/server/scoreboard.c index b3d553f437..42019955c0 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -330,7 +330,7 @@ int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) ap_init_scoreboard(sb_mem); } - ap_scoreboard_image->global->sb_type = scoreboard_type = sb_type; + scoreboard_type = sb_type; ap_scoreboard_image->global->running_generation = 0; ap_scoreboard_image->global->restart_time = apr_time_now(); -- 2.50.1