arrfab / rpms / httpd

Forked from rpms/httpd 5 years ago
Clone

Blame SOURCES/httpd-2.4.6-r1650655.patch

0943f8
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
0943f8
index c37a09b..2121892 100644
0943f8
--- a/modules/proxy/proxy_util.c
0943f8
+++ b/modules/proxy/proxy_util.c
0943f8
@@ -1733,6 +1733,9 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
0943f8
 
0943f8
     memset(wshared, 0, sizeof(proxy_worker_shared));
0943f8
 
0943f8
+    if (uri.port && uri.port == ap_proxy_port_of_scheme(uri.scheme)) {
0943f8
+        uri.port = 0;
0943f8
+    }
0943f8
     ptr = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD);
0943f8
     if (PROXY_STRNCPY(wshared->name, ptr) != APR_SUCCESS) {
0943f8
         return apr_psprintf(p, "worker name (%s) too long", ptr);
0943f8
@@ -2688,6 +2691,13 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
0943f8
                              worker->s->hostname);
0943f8
                 break;
0943f8
             }
0943f8
+
0943f8
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02823)
0943f8
+                         "%s: connection established with Unix domain socket "
0943f8
+                         "%s (%s)",
0943f8
+                         proxy_function,
0943f8
+                         conn->uds_path,
0943f8
+                         worker->s->hostname);
0943f8
         }
0943f8
         else
0943f8
 #endif
0943f8
@@ -2780,6 +2790,12 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
0943f8
                 backend_addr = backend_addr->next;
0943f8
                 continue;
0943f8
             }
0943f8
+
0943f8
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02824)
0943f8
+                         "%s: connection established with %pI (%s)",
0943f8
+                         proxy_function,
0943f8
+                         backend_addr,
0943f8
+                         worker->s->hostname);
0943f8
         }
0943f8
 
0943f8
         /* Set a timeout on the socket */