You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/07/06 20:58:20 UTC
svn commit: r1608284 - in /httpd/httpd/trunk:
docs/log-message-tags/next-number modules/ssl/ssl_engine_kernel.c
Author: trawick
Date: Sun Jul 6 18:58:19 2014
New Revision: 1608284
URL: http://svn.apache.org/r1608284
Log:
The SNI callback already logs a debug message when the vhost
is found or no vhost matches. Log one when no name is provided
by the client.
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.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=1608284&r1=1608283&r2=1608284&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Sun Jul 6 18:58:19 2014
@@ -1 +1 @@
-2645
+2646
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1608284&r1=1608283&r2=1608284&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Sun Jul 6 18:58:19 2014
@@ -1900,10 +1900,10 @@ int ssl_callback_ServerNameIndication(SS
{
const char *servername =
SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+ conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);
- if (servername) {
- conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);
- if (c) {
+ if (c) {
+ if (servername) {
if (ap_vhost_iterate_given_conn(c, ssl_find_vhost,
(void *)servername)) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02043)
@@ -1933,6 +1933,11 @@ int ssl_callback_ServerNameIndication(SS
*/
}
}
+ else {
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02645)
+ "Server name not provided via TLS extension "
+ "(using default/first virtual host)");
+ }
}
return SSL_TLSEXT_ERR_NOACK;