diff options
| author | Yann Ylavic <ylavic@apache.org> | 2021-12-15 12:47:05 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2021-12-15 12:47:05 +0000 |
| commit | cb7f57ee7d8f50c4e9b8eaa7fc31e4d4d6ea8480 (patch) | |
| tree | 72386936ee8207088ee2db129a35a31d0942c29c /modules/proxy | |
| parent | 590eb5905d44913395d19fa0f4d0e400b7b49f80 (diff) | |
| download | httpd-cb7f57ee7d8f50c4e9b8eaa7fc31e4d4d6ea8480.tar.gz | |
mod_proxy: Axe useless setting of *balancer to NULL in ap_proxy_pre_request()
It's already NULL per the enclosing "if" test.
Also, while at a non-functional change, break a close long log line to <80 col.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895986 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/proxy_util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index b77b92f7b8..574ea65ca2 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2328,7 +2328,6 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker, ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, "%s: found worker %s for %s", (*worker)->s->scheme, (*worker)->s->name, *url); - *balancer = NULL; if (!forward && !fix_uds_filename(r, url)) { return HTTP_INTERNAL_SERVER_ERROR; } @@ -2338,7 +2337,6 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker, if (conf->forward) { ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, "*: found forward proxy worker for %s", *url); - *balancer = NULL; *worker = conf->forward; access_status = OK; /* @@ -2352,8 +2350,8 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker, else if (r->proxyreq == PROXYREQ_REVERSE) { if (conf->reverse) { ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, - "*: using default reverse proxy worker for %s (no keepalive)", *url); - *balancer = NULL; + "*: using default reverse proxy worker for %s " + "(no keepalive)", *url); *worker = conf->reverse; access_status = OK; /* |