diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 66e27dcbf6..c6f8077af8 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -717,13 +717,6 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function, PROXY_DECLARE(void) ap_proxy_backend_broke(request_rec *r, apr_bucket_brigade *brigade); -/* Scoreboard */ -#if MODULE_MAGIC_NUMBER_MAJOR > 20020903 -#define PROXY_HAS_SCOREBOARD 1 -#else -#define PROXY_HAS_SCOREBOARD 0 -#endif - #define PROXY_LBMETHOD "proxylbmethod" /* The number of dynamic workers that can be added when reconfiguring. diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index ee3771857f..34eaae3669 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1625,11 +1625,7 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf, proxy_worker *worker, server_rec *s) { -#if PROXY_HAS_SCOREBOARD lb_score *score = NULL; -#else - void *score = NULL; -#endif if (worker->s && PROXY_WORKER_IS_INITIALIZED(worker)) { /* The worker share is already initialized */ @@ -1638,8 +1634,7 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf, worker->name); return; } -#if PROXY_HAS_SCOREBOARD - /* Get scoreboard slot */ + /* Get scoreboard slot */ if (ap_scoreboard_image) { score = ap_get_scoreboard_lb(worker->id); if (!score) { @@ -1653,7 +1648,6 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf, worker->id, getpid(), worker->name); } } -#endif if (!score) { score = apr_pcalloc(conf->pool, sizeof(proxy_worker_stat)); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,