Changeset 6200f6f in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Jan 22, 2019, 2:27:36 AM (12 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

8adfa57

Parents:

39a27cf

Message:

Switch server based on early SNI only if a name was found

File:

• src/gnutls_hooks.c (modified) (2 diffs)

src/gnutls_hooks.c

@@ -193 +193 @@
     }
 
-    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
+    ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctxt->c,
                   "%s: Found %d protocol upgrade(s) for ALPN: %s",
                   __func__, pupgrades->nelts,
@@ -1054 +1054 @@
                                    GNUTLS_EXT_RAW_FLAG_TLS_CLIENT_HELLO);
     if (ret == 0 && ctxt->sni_name != NULL)
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
+    {
+        ap_log_cerror(APLOG_MARK, APLOG_TRACE1, APR_SUCCESS, ctxt->c,
                       "%s found SNI name: '%s'",
                       __func__, ctxt->sni_name);
 
-    /* try to find a virtual host for that name */
-    mgs_srvconf_rec *tsc = mgs_find_sni_server(ctxt);
-    if (tsc != NULL)
-    {
-        /* Found a TLS vhost based on the SNI, configure the
-         * connection context. */
-        ctxt->sc = tsc;
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
-                      "%s: Selected virtual host %s from early SNI, "
-                      "connection server is still %s.",
-                      __func__, ctxt->sc->s->server_hostname,
-                      ctxt->c->base_server->server_hostname);
+        /* try to find a virtual host for that name */
+        mgs_srvconf_rec *tsc = mgs_find_sni_server(ctxt);
+        if (tsc != NULL)
+        {
+            /* Found a TLS vhost based on the SNI, configure the
+             * connection context. */
+            ctxt->sc = tsc;
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
+                          "%s: Selected virtual host %s from early SNI, "
+                          "connection server is %s.",
+                          __func__, ctxt->sc->s->server_hostname,
+                          ctxt->c->base_server->server_hostname);
+        }
     }