Mailing List Archive

Author: icing
Date: Fri Jun 11 11:40:38 2021
New Revision: 1890696

URL: http://svn.apache.org/viewvc?rev=1890696&view=rev
Log:
* log-tags always win.


Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1890696&r1=1890695&r2=1890696&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Fri Jun 11 11:40:38 2021
@@ -1 +1 @@
-10273
+10275

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1890696&r1=1890695&r2=1890696&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Fri Jun 11 11:40:38 2021
@@ -1419,7 +1419,7 @@ static apr_status_t ssl_io_filter_handsh
* 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_handsh
/* 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;