Changeset 2f10643 in mod_gnutls
- Timestamp:
- Apr 10, 2018, 12:48:05 PM (5 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, master, proxy-ticket, upstream
- Children:
- 9cee2e9
- Parents:
- e7cf823
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_hooks.c
re7cf823 r2f10643 1060 1060 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); 1061 1061 1062 if (c->master) 1063 { 1064 ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, 1065 "%s declined secondary connection", __func__); 1066 return DECLINED; 1067 } 1068 1062 1069 mgs_srvconf_rec *sc = (mgs_srvconf_rec *) 1063 1070 ap_get_module_config(c->base_server->module_config, &gnutls_module); … … 1065 1072 ap_get_module_config(c->conn_config, &gnutls_module); 1066 1073 1067 if ((sc && (!sc->enabled)) || (ctxt && ctxt->enabled == GNUTLS_ENABLED_FALSE)) 1074 if ((sc && (!sc->enabled)) 1075 || (ctxt && ctxt->enabled == GNUTLS_ENABLED_FALSE)) 1068 1076 { 1069 1077 ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, "%s declined connection", … … 1117 1125 apr_table_t *env = r->subprocess_env; 1118 1126 1119 ctxt = ap_get_module_config(r->connection->conn_config, 1120 &gnutls_module); 1127 ctxt = get_effective_gnutls_ctxt(r->connection); 1121 1128 1122 1129 if (!ctxt || ctxt->enabled != GNUTLS_ENABLED_TRUE || ctxt->session == NULL) … … 1198 1205 1199 1206 _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__); 1200 ctxt = 1201 ap_get_module_config(r->connection->conn_config, 1202 &gnutls_module); 1207 ctxt = get_effective_gnutls_ctxt(r->connection); 1203 1208 1204 1209 if (!ctxt || ctxt->session == NULL) { … … 1930 1935 if (sc->enabled != GNUTLS_ENABLED_FALSE) 1931 1936 { 1932 mgs_handle_t* ctxt = 1933 ap_get_module_config(r->connection->conn_config, &gnutls_module); 1937 mgs_handle_t* ctxt = get_effective_gnutls_ctxt(r->connection); 1934 1938 if (ctxt && ctxt->session != NULL) 1935 1939 {
Note: See TracChangeset
for help on using the changeset viewer.