www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Remove NPN support and focus on ALPN (RFC 7301)

Browse Source 
* modules/ssl/mod_ssl.c, modules/ssl/mod_ssl.h: drop
  modssl_register_npn optional function and related declarations.

* modules/ssl/ssl_engine_init.c (ssl_init_ctx_callbacks):
  no longer set NPN advertisement callback.

* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): remove
  NPN handling.

* modules/ssl/ssl_engine_kernel.c (ssl_callback_AdvertiseNextProtos):
  remove callback.

* modules/ssl/ssl_private.h: remove NPN prototypes, set
  HAVE_TLS_ALPN (OpenSSL 1.0.2 and later) with feature-based detection.

Rename SSLAlpnPreference to SSLALPNPreference, and add documentation.

Previous commits related to NPN and ALPN, for reference purposes:

r1332643 - Add support for TLS Next Protocol Negotiation
r1487772 - mod_ssl: Redesign NPN (Next Protocol Negotiation) API
           to avoid use of hooks API and inter-module hard linkage
r1670397 - ALPN support, based on mod_spdy/mod_h2 patch set
r1670434 - More ALPN goodness

(plus some minor tweaks: r1670578, r1670440, r1670578,
 r1670738, r1675459, and r1675549)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676004 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2015-04-25 09:46:09 +00:00
parent a5a2b609ab
commit 6dd2a90084
11 changed files with 192 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ssl/ssl_engine_init.c
View File

@@ -651,11 +651,6 @@ static void ssl_init_ctx_callbacks(server_rec *s,
SSL_CTX_set_alpn_select_cb(
ctx, ssl_callback_alpn_select, NULL);
#endif
#ifdef HAVE_TLS_NPN
SSL_CTX_set_next_protos_advertised_cb(
ctx, ssl_callback_AdvertiseNextProtos, NULL);
#endif
}
static apr_status_t ssl_init_ctx_verify(server_rec *s,