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/12 19:49:51 UTC
svn commit: r1610010 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/ssl/ssl_engine_kernel.c
Author: trawick
Date: Sat Jul 12 17:49:50 2014
New Revision: 1610010
URL: http://svn.apache.org/r1610010
Log:
merge r1608284 from trunk:
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.
Submitted by: trawick
Reviewed by: covener, minfrin
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1608284
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1610010&r1=1610009&r2=1610010&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Jul 12 17:49:50 2014
@@ -111,13 +111,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
*) mod_dav: Fix improper encoding in PROPFIND responses. PR 56480.
+1: breser, ylavic, covener
- * mod_ssl: 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.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1608284
- 2.4.x patch: Trunk patch works after "svn resolved docs/log-message-tags"
- +1: trawick, covener, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c?rev=1610010&r1=1610009&r2=1610010&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c Sat Jul 12 17:49:50 2014
@@ -1922,10 +1922,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)
@@ -1955,6 +1955,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;