From: Stefan Eissing Date: Fri, 11 Jun 2021 11:40:38 +0000 (+0000) Subject: * log-tags always win. X-Git-Tag: 2.5.0-alpha2-ci-test-only~919 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=121e0a7f2528e5d0bb97e67ae4efa65857f77e9d;p=thirdparty%2Fapache%2Fhttpd.git * log-tags always win. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1890696 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index 755f433b6e2..182bc7c9398 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -10273 +10275 diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index ab190ec8699..348956079a2 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -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 * any of our proposals (Apache itself up to 2.4.48 at least did that). */ 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].", alpn_note); 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, * but life always finds a way... */ 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 " "of our proposals [%s].", proto, alpn_note); proxy_ssl_check_peer_ok = FALSE;