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

* log-tags always win.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1890696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2021-06-11 11:40:38 +00:00
parent 06a3e22e28
commit 121e0a7f25
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1 +1 @@
10273 10275

4
modules/ssl/ssl_engine_io.c
View File

@@ -1419,7 +1419,7 @@ static apr_status_t ssl_io_filter_handshake(ssl_filter_ctx_t *filter_ctx)
* it does not support ALPN (old server) or that it does not support * it does not support ALPN (old server) or that it does not support
* any of our proposals (Apache itself up to 2.4.48 at least did that). */ * any of our proposals (Apache itself up to 2.4.48 at least did that). */
if (!alpn_empty_ok) { if (!alpn_empty_ok) {
ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c, APLOGNO() ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c, APLOGNO(10273)
"SSL Proxy: Peer did not select any of our ALPN protocols [%s].", "SSL Proxy: Peer did not select any of our ALPN protocols [%s].",
alpn_note); alpn_note);
proxy_ssl_check_peer_ok = FALSE; proxy_ssl_check_peer_ok = FALSE;
@@ -1436,7 +1436,7 @@ static apr_status_t ssl_io_filter_handshake(ssl_filter_ctx_t *filter_ctx)
/* From a conforming peer, this should never happen, /* From a conforming peer, this should never happen,
* but life always finds a way... */ * but life always finds a way... */
proto = apr_pstrndup(c->pool, selected, slen); proto = apr_pstrndup(c->pool, selected, slen);
ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c, APLOGNO() ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c, APLOGNO(10274)
"SSL Proxy: Peer proposed ALPN protocol %s which is none " "SSL Proxy: Peer proposed ALPN protocol %s which is none "
"of our proposals [%s].", proto, alpn_note); "of our proposals [%s].", proto, alpn_note);
proxy_ssl_check_peer_ok = FALSE; proxy_ssl_check_peer_ok = FALSE;