www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Cleanup: Remove checking for pre 2.0.46 MMN. It is

Browse Source 
obvious that the new mod_proxy will never be
backported to the 2.0 branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mladen Turk
2006-07-31 09:33:28 +00:00
parent 2d63cb2faa
commit 0658003dba
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/proxy/mod_proxy.h
View File

@@ -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, PROXY_DECLARE(void) ap_proxy_backend_broke(request_rec *r,
apr_bucket_brigade *brigade); 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" #define PROXY_LBMETHOD "proxylbmethod"
/* The number of dynamic workers that can be added when reconfiguring. /* The number of dynamic workers that can be added when reconfiguring.

6
modules/proxy/proxy_util.c
View File

@@ -1625,11 +1625,7 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
proxy_worker *worker, proxy_worker *worker,
server_rec *s) server_rec *s)
{ {
#if PROXY_HAS_SCOREBOARD
lb_score *score = NULL; lb_score *score = NULL;
#else
void *score = NULL;
#endif
if (worker->s && PROXY_WORKER_IS_INITIALIZED(worker)) { if (worker->s && PROXY_WORKER_IS_INITIALIZED(worker)) {
/* The worker share is already initialized */ /* The worker share is already initialized */
@@ -1638,7 +1634,6 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
worker->name); worker->name);
return; return;
} }
#if PROXY_HAS_SCOREBOARD
/* Get scoreboard slot */ /* Get scoreboard slot */
if (ap_scoreboard_image) { if (ap_scoreboard_image) {
score = ap_get_scoreboard_lb(worker->id); score = ap_get_scoreboard_lb(worker->id);
@@ -1653,7 +1648,6 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
worker->id, getpid(), worker->name); worker->id, getpid(), worker->name);
} }
} }
#endif
if (!score) { if (!score) {
score = apr_pcalloc(conf->pool, sizeof(proxy_worker_stat)); score = apr_pcalloc(conf->pool, sizeof(proxy_worker_stat));
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,