Changeset 4963516 in mod_gnutls


Ignore:
Timestamp:
Nov 6, 2018, 1:36:22 AM (13 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_hooks.c

    rd4c1a4e r4963516  
    183183    const apr_array_header_t *pupgrades = NULL;
    184184    apr_status_t ret =
    185         ap_get_protocol_upgrades(ctxt->c, NULL, ctxt->c->base_server,
     185        ap_get_protocol_upgrades(ctxt->c, NULL, ctxt->sc->s,
    186186                                 /*report_all*/ 0, &pupgrades);
    187187    if (ret != APR_SUCCESS)
     
    254254        apr_pstrndup(ctxt->c->pool, (char*) alpn_proto.data, alpn_proto.size);
    255255    const char *selected =
    256         ap_select_protocol(ctxt->c, NULL, ctxt->c->base_server,
    257                            client_protos);
     256        ap_select_protocol(ctxt->c, NULL, ctxt->sc->s, client_protos);
    258257
    259258    /* ap_select_protocol() will return NULL if none of the ALPN
     
    288287                  __func__, selected);
    289288    apr_status_t status = ap_switch_protocol(ctxt->c, NULL,
    290                                              ctxt->c->base_server,
     289                                             ctxt->sc->s,
    291290                                             selected);
    292291    if (status != APR_SUCCESS)
Note: See TracChangeset for help on using the changeset viewer.