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: Axe useless setting of *balancer to NULL in ap_proxy_pre_request()

Browse Source 
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
This commit is contained in:
Yann Ylavic
2021-12-15 12:47:05 +00:00
parent 590eb5905d
commit cb7f57ee7d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/proxy/proxy_util.c
View File

@@ -2328,7 +2328,6 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker,
ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
"%s: found worker %s for %s", "%s: found worker %s for %s",
(*worker)->s->scheme, (*worker)->s->name, *url); (*worker)->s->scheme, (*worker)->s->name, *url);
*balancer = NULL;
if (!forward && !fix_uds_filename(r, url)) { if (!forward && !fix_uds_filename(r, url)) {
return HTTP_INTERNAL_SERVER_ERROR; return HTTP_INTERNAL_SERVER_ERROR;
} }
@@ -2338,7 +2337,6 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker,
if (conf->forward) { if (conf->forward) {
ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
"*: found forward proxy worker for %s", *url); "*: found forward proxy worker for %s", *url);
*balancer = NULL;
*worker = conf->forward; *worker = conf->forward;
access_status = OK; access_status = OK;
/* /*
@@ -2352,8 +2350,8 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker,
else if (r->proxyreq == PROXYREQ_REVERSE) { else if (r->proxyreq == PROXYREQ_REVERSE) {
if (conf->reverse) { if (conf->reverse) {
ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
"*: using default reverse proxy worker for %s (no keepalive)", *url); "*: using default reverse proxy worker for %s "
*balancer = NULL; "(no keepalive)", *url);
*worker = conf->reverse; *worker = conf->reverse;
access_status = OK; access_status = OK;
/* /*