Changeset 4963516 in mod_gnutls

Timestamp:

Nov 6, 2018, 1:36:22 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

a26d3f6

Parents:

d4c1a4e

Message:

Use server back reference for ALPN handling

Necessary because during the handshake the conn_rec for the connection
can't have the right base_server yet.

File:

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

src/gnutls_hooks.c

@@ -183 +183 @@
     const apr_array_header_t *pupgrades = NULL;
     apr_status_t ret =
-        ap_get_protocol_upgrades(ctxt->c, NULL, ctxt->c->base_server,
+        ap_get_protocol_upgrades(ctxt->c, NULL, ctxt->sc->s,
                                  /*report_all*/ 0, &pupgrades);
     if (ret != APR_SUCCESS)
@@ -254 +254 @@
         apr_pstrndup(ctxt->c->pool, (char*) alpn_proto.data, alpn_proto.size);
     const char *selected =
-        ap_select_protocol(ctxt->c, NULL, ctxt->c->base_server,
-                           client_protos);
+        ap_select_protocol(ctxt->c, NULL, ctxt->sc->s, client_protos);
 
     /* ap_select_protocol() will return NULL if none of the ALPN
@@ -288 +287 @@
                   __func__, selected);
     apr_status_t status = ap_switch_protocol(ctxt->c, NULL,
-                                             ctxt->c->base_server,
+                                             ctxt->sc->s,
                                              selected);
     if (status != APR_SUCCESS)