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

mod_proxy: Provide an RFC1035 compliant version of the hostname in the

Browse Source 
proxy_worker_shared structure. PR62085


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824176 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2018-02-13 21:22:05 +00:00
parent 965dae9007
commit fac7f995b0
9 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.1 Changes with Apache 2.5.1
*) mod_proxy: Provide an RFC1035 compliant version of the hostname in the
proxy_worker_shared structure. PR62085 [Graham Leggett]
*) mod_proxy: Worker schemes and hostnames which are too large are no *) mod_proxy: Worker schemes and hostnames which are too large are no
longer fatal errors; it is logged and the truncated values are stored. longer fatal errors; it is logged and the truncated values are stored.

2
modules/proxy/balancers/mod_lbmethod_heartbeat.c
View File

@@ -300,7 +300,7 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer,
for (i = 0; i < balancer->workers->nelts; i++) { for (i = 0; i < balancer->workers->nelts; i++) {
worker = &APR_ARRAY_IDX(balancer->workers, i, proxy_worker *); worker = &APR_ARRAY_IDX(balancer->workers, i, proxy_worker *);
server = apr_hash_get(servers, (*worker)->s->hostname, APR_HASH_KEY_STRING); server = apr_hash_get(servers, (*worker)->s->hostname_ex, APR_HASH_KEY_STRING);
if (!server) { if (!server) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(01214) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(01214)

8
modules/proxy/mod_proxy.c
View File

@@ -2879,7 +2879,7 @@ static int proxy_status_hook(request_rec *r, int flags)
char fbuf[50]; char fbuf[50];
if (!(flags & AP_STATUS_SHORT)) { if (!(flags & AP_STATUS_SHORT)) {
ap_rvputs(r, "<tr>\n<td>", (*worker)->s->scheme, "</td>", NULL); ap_rvputs(r, "<tr>\n<td>", (*worker)->s->scheme, "</td>", NULL);
ap_rvputs(r, "<td>", (*worker)->s->hostname, "</td><td>", NULL); ap_rvputs(r, "<td>", (*worker)->s->hostname_ex, "</td><td>", NULL);
ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, *worker), NULL); ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, *worker), NULL);
ap_rvputs(r, "</td><td>", (*worker)->s->route, NULL); ap_rvputs(r, "</td><td>", (*worker)->s->route, NULL);
ap_rvputs(r, "</td><td>", (*worker)->s->redirect, NULL); ap_rvputs(r, "</td><td>", (*worker)->s->redirect, NULL);
@@ -2971,7 +2971,8 @@ static void child_init(apr_pool_t *p, server_rec *s)
ap_proxy_define_worker(p, &forward, NULL, NULL, "http://www.apache.org", 0); ap_proxy_define_worker(p, &forward, NULL, NULL, "http://www.apache.org", 0);
conf->forward = forward; conf->forward = forward;
PROXY_STRNCPY(conf->forward->s->name, "proxy:forward"); PROXY_STRNCPY(conf->forward->s->name, "proxy:forward");
PROXY_STRNCPY(conf->forward->s->hostname, "*"); PROXY_STRNCPY(conf->forward->s->hostname, "*"); /* for compatibility */
PROXY_STRNCPY(conf->forward->s->hostname_ex, "*");
PROXY_STRNCPY(conf->forward->s->scheme, "*"); PROXY_STRNCPY(conf->forward->s->scheme, "*");
conf->forward->hash.def = conf->forward->s->hash.def = conf->forward->hash.def = conf->forward->s->hash.def =
ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_DEFAULT); ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_DEFAULT);
@@ -2988,7 +2989,8 @@ static void child_init(apr_pool_t *p, server_rec *s)
if (!reverse) { if (!reverse) {
ap_proxy_define_worker(p, &reverse, NULL, NULL, "http://www.apache.org", 0); ap_proxy_define_worker(p, &reverse, NULL, NULL, "http://www.apache.org", 0);
PROXY_STRNCPY(reverse->s->name, "proxy:reverse"); PROXY_STRNCPY(reverse->s->name, "proxy:reverse");
PROXY_STRNCPY(reverse->s->hostname, "*"); PROXY_STRNCPY(reverse->s->hostname, "*"); /* for compatibility */
PROXY_STRNCPY(reverse->s->hostname_ex, "*");
PROXY_STRNCPY(reverse->s->scheme, "*"); PROXY_STRNCPY(reverse->s->scheme, "*");
reverse->hash.def = reverse->s->hash.def = reverse->hash.def = reverse->s->hash.def =
ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_DEFAULT); ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_DEFAULT);

5
modules/proxy/mod_proxy.h
View File

@@ -355,6 +355,8 @@ PROXY_WORKER_HC_FAIL )
#define PROXY_BALANCER_MAX_STICKY_SIZE 64 #define PROXY_BALANCER_MAX_STICKY_SIZE 64
#define PROXY_WORKER_MAX_SECRET_SIZE 64 #define PROXY_WORKER_MAX_SECRET_SIZE 64
#define PROXY_RFC1035_HOSTNAME_SIZE 256
/* RFC-1035 mentions limits of 255 for host-names and 253 for domain-names, /* RFC-1035 mentions limits of 255 for host-names and 253 for domain-names,
* dotted together(?) this would fit the below size (+ trailing NUL). * dotted together(?) this would fit the below size (+ trailing NUL).
*/ */
@@ -390,7 +392,7 @@ typedef struct {
typedef struct { typedef struct {
char name[PROXY_WORKER_MAX_NAME_SIZE]; char name[PROXY_WORKER_MAX_NAME_SIZE];
char scheme[PROXY_WORKER_MAX_SCHEME_SIZE]; /* scheme to use ajp|http|https */ char scheme[PROXY_WORKER_MAX_SCHEME_SIZE]; /* scheme to use ajp|http|https */
char hostname[PROXY_WORKER_MAX_HOSTNAME_SIZE]; /* remote backend address */ char hostname[PROXY_WORKER_MAX_HOSTNAME_SIZE]; /* remote backend address (deprecated, use hostname_ex below) */
char route[PROXY_WORKER_MAX_ROUTE_SIZE]; /* balancing route */ char route[PROXY_WORKER_MAX_ROUTE_SIZE]; /* balancing route */
char redirect[PROXY_WORKER_MAX_ROUTE_SIZE]; /* temporary balancing redirection route */ char redirect[PROXY_WORKER_MAX_ROUTE_SIZE]; /* temporary balancing redirection route */
char flusher[PROXY_WORKER_MAX_SCHEME_SIZE]; /* flush provider used by mod_proxy_fdpass */ char flusher[PROXY_WORKER_MAX_SCHEME_SIZE]; /* flush provider used by mod_proxy_fdpass */
@@ -452,6 +454,7 @@ typedef struct {
unsigned int is_name_matchable:1; unsigned int is_name_matchable:1;
char secret[PROXY_WORKER_MAX_SECRET_SIZE]; /* authentication secret (e.g. AJP13) */ char secret[PROXY_WORKER_MAX_SECRET_SIZE]; /* authentication secret (e.g. AJP13) */
char upgrade[PROXY_WORKER_MAX_SCHEME_SIZE];/* upgrade protocol used by mod_proxy_wstunnel */ char upgrade[PROXY_WORKER_MAX_SCHEME_SIZE];/* upgrade protocol used by mod_proxy_wstunnel */
char hostname_ex[PROXY_RFC1035_HOSTNAME_SIZE]; /* RFC1035 compliant version of the remote backend address */
} proxy_worker_shared; } proxy_worker_shared;
#define ALIGNED_PROXY_WORKER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_worker_shared))) #define ALIGNED_PROXY_WORKER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_worker_shared)))

12
modules/proxy/mod_proxy_ajp.c
View File

@@ -217,7 +217,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00868) ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00868)
"request failed to %pI (%s)", "request failed to %pI (%s)",
conn->worker->cp->addr, conn->worker->cp->addr,
conn->worker->s->hostname); conn->worker->s->hostname_ex);
if (status == AJP_EOVERFLOW) if (status == AJP_EOVERFLOW)
return HTTP_BAD_REQUEST; return HTTP_BAD_REQUEST;
else { else {
@@ -299,7 +299,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00876) ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00876)
"send failed to %pI (%s)", "send failed to %pI (%s)",
conn->worker->cp->addr, conn->worker->cp->addr,
conn->worker->s->hostname); conn->worker->s->hostname_ex);
/* /*
* It is fatal when we failed to send a (part) of the request * It is fatal when we failed to send a (part) of the request
* body. * body.
@@ -339,7 +339,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00878) ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00878)
"read response failed from %pI (%s)", "read response failed from %pI (%s)",
conn->worker->cp->addr, conn->worker->cp->addr,
conn->worker->s->hostname); conn->worker->s->hostname_ex);
/* If we had a successful cping/cpong and then a timeout /* If we had a successful cping/cpong and then a timeout
* we assume it is a request that cause a back-end timeout, * we assume it is a request that cause a back-end timeout,
@@ -639,7 +639,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00892) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00892)
"got response from %pI (%s)", "got response from %pI (%s)",
conn->worker->cp->addr, conn->worker->cp->addr,
conn->worker->s->hostname); conn->worker->s->hostname_ex);
if (conf->error_override && ap_is_HTTP_ERROR(r->status)) { if (conf->error_override && ap_is_HTTP_ERROR(r->status)) {
/* clear r->status for override error, otherwise ErrorDocument /* clear r->status for override error, otherwise ErrorDocument
@@ -663,7 +663,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00893) ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00893)
"dialog to %pI (%s) failed", "dialog to %pI (%s) failed",
conn->worker->cp->addr, conn->worker->cp->addr,
conn->worker->s->hostname); conn->worker->s->hostname_ex);
/* /*
* If we already send data, signal a broken backend connection * If we already send data, signal a broken backend connection
* upwards in the chain. * upwards in the chain.
@@ -809,7 +809,7 @@ static int proxy_ajp_handler(request_rec *r, proxy_worker *worker,
backend->close = 1; backend->close = 1;
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00897) ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(00897)
"cping/cpong failed to %pI (%s)", "cping/cpong failed to %pI (%s)",
worker->cp->addr, worker->s->hostname); worker->cp->addr, worker->s->hostname_ex);
status = HTTP_SERVICE_UNAVAILABLE; status = HTTP_SERVICE_UNAVAILABLE;
retry++; retry++;
continue; continue;

4
modules/proxy/mod_proxy_balancer.c
View File

@@ -452,7 +452,7 @@ static void force_recovery(proxy_balancer *balancer, server_rec *s)
(*worker)->s->status &= ~PROXY_WORKER_IN_ERROR; (*worker)->s->status &= ~PROXY_WORKER_IN_ERROR;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01165) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01165)
"%s: Forcing recovery for worker (%s)", "%s: Forcing recovery for worker (%s)",
balancer->s->name, (*worker)->s->hostname); balancer->s->name, (*worker)->s->hostname_ex);
} }
} }
} }
@@ -1469,7 +1469,7 @@ static int balancer_handler(request_rec *r)
"</httpd:name>\n", NULL); "</httpd:name>\n", NULL);
ap_rvputs(r, " <httpd:scheme>", worker->s->scheme, ap_rvputs(r, " <httpd:scheme>", worker->s->scheme,
"</httpd:scheme>\n", NULL); "</httpd:scheme>\n", NULL);
ap_rvputs(r, " <httpd:hostname>", worker->s->hostname, ap_rvputs(r, " <httpd:hostname>", worker->s->hostname_ex,
"</httpd:hostname>\n", NULL); "</httpd:hostname>\n", NULL);
ap_rprintf(r, " <httpd:loadfactor>%.2f</httpd:loadfactor>\n", ap_rprintf(r, " <httpd:loadfactor>%.2f</httpd:loadfactor>\n",
(float)(worker->s->lbfactor)/100.0); (float)(worker->s->lbfactor)/100.0);

17
modules/proxy/mod_proxy_hcheck.c
View File

@@ -416,7 +416,7 @@ static void create_hcheck_req(wctx_t *wctx, proxy_worker *hc,
"OPTIONS * HTTP/1.0\r\n" "OPTIONS * HTTP/1.0\r\n"
"Host: %s:%d\r\n" "Host: %s:%d\r\n"
"\r\n", "\r\n",
hc->s->hostname, (int)hc->s->port); hc->s->hostname_ex, (int)hc->s->port);
break; break;
case HEAD: case HEAD:
@@ -434,7 +434,7 @@ static void create_hcheck_req(wctx_t *wctx, proxy_worker *hc,
(wctx->path ? wctx->path : ""), (wctx->path ? wctx->path : ""),
(wctx->path && *hc->s->hcuri ? "/" : "" ), (wctx->path && *hc->s->hcuri ? "/" : "" ),
(*hc->s->hcuri ? hc->s->hcuri : ""), (*hc->s->hcuri ? hc->s->hcuri : ""),
hc->s->hostname, (int)hc->s->port); hc->s->hostname_ex, (int)hc->s->port);
break; break;
default: default:
@@ -461,12 +461,13 @@ static proxy_worker *hc_get_hcworker(sctx_t *ctx, proxy_worker *worker,
: ap_proxy_port_of_scheme(worker->s->scheme)); : ap_proxy_port_of_scheme(worker->s->scheme));
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03248) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03248)
"Creating hc worker %pp for %s://%s:%d", "Creating hc worker %pp for %s://%s:%d",
worker, worker->s->scheme, worker->s->hostname, worker, worker->s->scheme, worker->s->hostname_ex,
(int)port); (int)port);
ap_proxy_define_worker(ctx->p, &hc, NULL, NULL, worker->s->name, 0); ap_proxy_define_worker(ctx->p, &hc, NULL, NULL, worker->s->name, 0);
apr_snprintf(hc->s->name, sizeof hc->s->name, "%pp", worker); apr_snprintf(hc->s->name, sizeof hc->s->name, "%pp", worker);
PROXY_STRNCPY(hc->s->hostname, worker->s->hostname); PROXY_STRNCPY(hc->s->hostname, worker->s->hostname); /* for compatibility */
PROXY_STRNCPY(hc->s->hostname_ex, worker->s->hostname_ex);
PROXY_STRNCPY(hc->s->scheme, worker->s->scheme); PROXY_STRNCPY(hc->s->scheme, worker->s->scheme);
PROXY_STRNCPY(hc->s->hcuri, worker->s->hcuri); PROXY_STRNCPY(hc->s->hcuri, worker->s->hcuri);
PROXY_STRNCPY(hc->s->hcexpr, worker->s->hcexpr); PROXY_STRNCPY(hc->s->hcexpr, worker->s->hcexpr);
@@ -498,7 +499,7 @@ static proxy_worker *hc_get_hcworker(sctx_t *ctx, proxy_worker *worker,
: ap_proxy_port_of_scheme(worker->s->scheme)); : ap_proxy_port_of_scheme(worker->s->scheme));
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03311) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03311)
"Updating hc worker %pp for %s://%s:%d", "Updating hc worker %pp for %s://%s:%d",
worker, worker->s->scheme, worker->s->hostname, worker, worker->s->scheme, worker->s->hostname_ex,
(int)port); (int)port);
hc->s->method = worker->s->method; hc->s->method = worker->s->method;
create_hcheck_req(wctx, hc, ctx->p); create_hcheck_req(wctx, hc, ctx->p);
@@ -519,12 +520,12 @@ static int hc_determine_connection(sctx_t *ctx, proxy_worker *worker,
*addr = worker->cp->addr; *addr = worker->cp->addr;
} }
else { else {
rv = apr_sockaddr_info_get(addr, worker->s->hostname, rv = apr_sockaddr_info_get(addr, worker->s->hostname_ex,
APR_UNSPEC, worker->s->port, 0, p); APR_UNSPEC, worker->s->port, 0, p);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03249) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03249)
"DNS lookup failure for: %s:%d", "DNS lookup failure for: %s:%d",
worker->s->hostname, (int)worker->s->port); worker->s->hostname_ex, (int)worker->s->port);
} }
} }
return (rv == APR_SUCCESS ? OK : !OK); return (rv == APR_SUCCESS ? OK : !OK);
@@ -579,7 +580,7 @@ static int hc_get_backend(const char *proxy_function, proxy_conn_rec **backend,
status = ap_proxy_acquire_connection(proxy_function, backend, hc, ctx->s); status = ap_proxy_acquire_connection(proxy_function, backend, hc, ctx->s);
if (status == OK) { if (status == OK) {
(*backend)->addr = hc->cp->addr; (*backend)->addr = hc->cp->addr;
(*backend)->hostname = hc->s->hostname; (*backend)->hostname = hc->s->hostname_ex;
if (strcmp(hc->s->scheme, "https") == 0) { if (strcmp(hc->s->scheme, "https") == 0) {
if (!ap_proxy_ssl_enable(NULL)) { if (!ap_proxy_ssl_enable(NULL)) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ctx->s, APLOGNO(03252) ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ctx->s, APLOGNO(03252)

2
modules/proxy/mod_proxy_http.c
View File

@@ -2108,7 +2108,7 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
backend->close = 1; backend->close = 1;
ap_log_rerror(APLOG_MARK, APLOG_INFO, status, r, APLOGNO(01115) ap_log_rerror(APLOG_MARK, APLOG_INFO, status, r, APLOGNO(01115)
"HTTP: 100-Continue failed to %pI (%s)", "HTTP: 100-Continue failed to %pI (%s)",
worker->cp->addr, worker->s->hostname); worker->cp->addr, worker->s->hostname_ex);
retry++; retry++;
continue; continue;
} else { } else {

39
modules/proxy/proxy_util.c
View File

@@ -1731,6 +1731,9 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(010118) ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(010118)
"Alert! worker hostname (%s) too long; truncated to: %s", uri.hostname, wshared->hostname); "Alert! worker hostname (%s) too long; truncated to: %s", uri.hostname, wshared->hostname);
} }
if (PROXY_STRNCPY(wshared->hostname_ex, uri.hostname) != APR_SUCCESS) {
return apr_psprintf(p, "worker hostname (%s) too long", uri.hostname);
}
wshared->flush_packets = flush_off; wshared->flush_packets = flush_off;
wshared->flush_wait = PROXY_FLUSH_WAIT; wshared->flush_wait = PROXY_FLUSH_WAIT;
wshared->is_address_reusable = 1; wshared->is_address_reusable = 1;
@@ -1921,7 +1924,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00930) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00930)
"initialized pool in child %" APR_PID_T_FMT " for (%s) min=%d max=%d smax=%d", "initialized pool in child %" APR_PID_T_FMT " for (%s) min=%d max=%d smax=%d",
getpid(), worker->s->hostname, worker->s->min, getpid(), worker->s->hostname_ex, worker->s->min,
worker->s->hmax, worker->s->smax); worker->s->hmax, worker->s->smax);
/* Set the acquire timeout */ /* Set the acquire timeout */
@@ -1938,7 +1941,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00931) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00931)
"initialized single connection worker in child %" APR_PID_T_FMT " for (%s)", "initialized single connection worker in child %" APR_PID_T_FMT " for (%s)",
getpid(), worker->s->hostname); getpid(), worker->s->hostname_ex);
} }
apr_global_mutex_unlock(proxy_mutex); apr_global_mutex_unlock(proxy_mutex);
@@ -1957,7 +1960,7 @@ static int ap_proxy_retry_worker(const char *proxy_function, proxy_worker *worke
if (PROXY_WORKER_IS(worker, PROXY_WORKER_STOPPED)) { if (PROXY_WORKER_IS(worker, PROXY_WORKER_STOPPED)) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(3305) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(3305)
"%s: Won't retry worker (%s): stopped", "%s: Won't retry worker (%s): stopped",
proxy_function, worker->s->hostname); proxy_function, worker->s->hostname_ex);
return DECLINED; return DECLINED;
} }
if ((worker->s->status & PROXY_WORKER_IGNORE_ERRORS) if ((worker->s->status & PROXY_WORKER_IGNORE_ERRORS)
@@ -1966,13 +1969,13 @@ static int ap_proxy_retry_worker(const char *proxy_function, proxy_worker *worke
worker->s->status &= ~PROXY_WORKER_IN_ERROR; worker->s->status &= ~PROXY_WORKER_IN_ERROR;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00932) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00932)
"%s: worker for (%s) has been marked for retry", "%s: worker for (%s) has been marked for retry",
proxy_function, worker->s->hostname); proxy_function, worker->s->hostname_ex);
return OK; return OK;
} }
else { else {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00933) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00933)
"%s: too soon to retry worker for (%s)", "%s: too soon to retry worker for (%s)",
proxy_function, worker->s->hostname); proxy_function, worker->s->hostname_ex);
return DECLINED; return DECLINED;
} }
} }
@@ -2194,7 +2197,7 @@ PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function,
if (!PROXY_WORKER_IS_USABLE(worker)) { if (!PROXY_WORKER_IS_USABLE(worker)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00940) ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00940)
"%s: disabled connection for (%s)", "%s: disabled connection for (%s)",
proxy_function, worker->s->hostname); proxy_function, worker->s->hostname_ex);
return HTTP_SERVICE_UNAVAILABLE; return HTTP_SERVICE_UNAVAILABLE;
} }
} }
@@ -2217,12 +2220,12 @@ PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function,
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(00941) ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(00941)
"%s: failed to acquire connection for (%s)", "%s: failed to acquire connection for (%s)",
proxy_function, worker->s->hostname); proxy_function, worker->s->hostname_ex);
return HTTP_SERVICE_UNAVAILABLE; return HTTP_SERVICE_UNAVAILABLE;
} }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00942) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00942)
"%s: has acquired connection for (%s)", "%s: has acquired connection for (%s)",
proxy_function, worker->s->hostname); proxy_function, worker->s->hostname_ex);
(*conn)->worker = worker; (*conn)->worker = worker;
(*conn)->close = 0; (*conn)->close = 0;
@@ -2237,7 +2240,7 @@ PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
{ {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00943) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00943)
"%s: has released connection for (%s)", "%s: has released connection for (%s)",
proxy_function, conn->worker->s->hostname); proxy_function, conn->worker->s->hostname_ex);
connection_cleanup(conn); connection_cleanup(conn);
return OK; return OK;
@@ -2833,7 +2836,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"%s: error creating Unix domain socket for " "%s: error creating Unix domain socket for "
"target %s", "target %s",
proxy_function, proxy_function,
worker->s->hostname); worker->s->hostname_ex);
break; break;
} }
conn->connection = NULL; conn->connection = NULL;
@@ -2846,7 +2849,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"%s (%s) failed", "%s (%s) failed",
proxy_function, proxy_function,
conn->uds_path, conn->uds_path,
worker->s->hostname); worker->s->hostname_ex);
break; break;
} }
@@ -2855,7 +2858,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"%s (%s)", "%s (%s)",
proxy_function, proxy_function,
conn->uds_path, conn->uds_path,
worker->s->hostname); worker->s->hostname_ex);
} }
else else
#endif #endif
@@ -2869,7 +2872,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"target %s", "target %s",
proxy_function, proxy_function,
backend_addr->family, backend_addr->family,
worker->s->hostname); worker->s->hostname_ex);
/* /*
* this could be an IPv6 address from the DNS but the * this could be an IPv6 address from the DNS but the
* local machine won't give us an IPv6 socket; hopefully the * local machine won't give us an IPv6 socket; hopefully the
@@ -2919,7 +2922,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
} }
ap_log_error(APLOG_MARK, APLOG_TRACE2, 0, s, ap_log_error(APLOG_MARK, APLOG_TRACE2, 0, s,
"%s: fam %d socket created to connect to %s", "%s: fam %d socket created to connect to %s",
proxy_function, backend_addr->family, worker->s->hostname); proxy_function, backend_addr->family, worker->s->hostname_ex);
if (conf->source_address_set) { if (conf->source_address_set) {
local_addr = apr_pmemdup(conn->scpool, conf->source_address, local_addr = apr_pmemdup(conn->scpool, conf->source_address,
@@ -2944,7 +2947,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"%s: attempt to connect to %pI (%s) failed", "%s: attempt to connect to %pI (%s) failed",
proxy_function, proxy_function,
backend_addr, backend_addr,
worker->s->hostname); worker->s->hostname_ex);
backend_addr = backend_addr->next; backend_addr = backend_addr->next;
continue; continue;
} }
@@ -2953,7 +2956,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"%s: connection established with %pI (%s)", "%s: connection established with %pI (%s)",
proxy_function, proxy_function,
backend_addr, backend_addr,
worker->s->hostname); worker->s->hostname_ex);
} }
/* Set a timeout on the socket */ /* Set a timeout on the socket */
@@ -2987,7 +2990,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
"via http CONNECT through %pI (%s) failed", "via http CONNECT through %pI (%s) failed",
proxy_function, proxy_function,
forward->target_host, forward->target_port, forward->target_host, forward->target_port,
backend_addr, worker->s->hostname); backend_addr, worker->s->hostname_ex);
backend_addr = backend_addr->next; backend_addr = backend_addr->next;
continue; continue;
} }
@@ -3009,7 +3012,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00959) ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00959)
"ap_proxy_connect_backend disabling worker for (%s) for %" "ap_proxy_connect_backend disabling worker for (%s) for %"
APR_TIME_T_FMT "s", APR_TIME_T_FMT "s",
worker->s->hostname, apr_time_sec(worker->s->retry)); worker->s->hostname_ex, apr_time_sec(worker->s->retry));
} }
} }
else { else {