]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_proxy: Axe useless setting of *balancer to NULL in ap_proxy_pre_request()
authorYann Ylavic <ylavic@apache.org>
Wed, 15 Dec 2021 12:47:05 +0000 (12:47 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 15 Dec 2021 12:47:05 +0000 (12:47 +0000)
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

modules/proxy/proxy_util.c

index b77b92f7b8fb9e0d1723cdc7362f12909c0ff8a0..574ea65ca23af65416cf8956534c80df331c9b59 100644 (file)
@@ -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;
                 /*