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: don't add the default port to the name of proxy workers. PR 57259.

Browse Source 
ap_proxy_port_of_scheme() knows more default ports than apr_unparse_uri().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1644503 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2014-12-10 18:45:24 +00:00
parent d35b8319c0
commit 0c5d74a177
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.0 Changes with Apache 2.5.0
*) mod_proxy_ajp: Fix handling of the default port (8009) in the
ProxyPass and <Proxy> configurations. PR 57259. [Yann Ylavic].
*) mod_ssl: Fix renegotiation failures redirected to an ErrorDocument. *) mod_ssl: Fix renegotiation failures redirected to an ErrorDocument.
PR 57334. [Yann Ylavic]. PR 57334. [Yann Ylavic].

2
docs/log-message-tags/next-number
View File

@@ -1 +1 @@
2823 2825

16
modules/proxy/proxy_util.c
View File

@@ -1732,6 +1732,9 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
memset(wshared, 0, sizeof(proxy_worker_shared)); memset(wshared, 0, sizeof(proxy_worker_shared));
if (uri.port && uri.port == ap_proxy_port_of_scheme(uri.scheme)) {
uri.port = 0;
}
ptr = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD); ptr = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD);
if (PROXY_STRNCPY(wshared->name, ptr) != APR_SUCCESS) { if (PROXY_STRNCPY(wshared->name, ptr) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(02808) ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(02808)
@@ -2725,6 +2728,13 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
worker->s->hostname); worker->s->hostname);
break; break;
} }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02823)
"%s: connection established with Unix domain socket "
"%s (%s)",
proxy_function,
conn->uds_path,
worker->s->hostname);
} }
else else
#endif #endif
@@ -2817,6 +2827,12 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
backend_addr = backend_addr->next; backend_addr = backend_addr->next;
continue; continue;
} }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02824)
"%s: connection established with %pI (%s)",
proxy_function,
backend_addr,
worker->s->hostname);
} }
/* Set a timeout on the socket */ /* Set a timeout on the socket */