You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2021/12/15 12:47:06 UTC
svn commit: r1895986 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: ylavic
Date: Wed Dec 15 12:47:05 2021
New Revision: 1895986
URL: http://svn.apache.org/viewvc?rev=1895986&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1895986&r1=1895985&r2=1895986&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Dec 15 12:47:05 2021
@@ -2328,7 +2328,6 @@ PROXY_DECLARE(int) ap_proxy_pre_request(
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(
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(
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;
/*