diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2014-01-28 15:33:49 -0800 |
|---|---|---|
| committer | Piotr Sikora <piotr@cloudflare.com> | 2014-01-28 15:33:49 -0800 |
| commit | 4ae889c9f2c6c79402630aa2197bfbdd8cc42fd5 (patch) | |
| tree | e120558450e8d2832bc2eeefc0864997e770c1d9 /src/http/ngx_http.c | |
| parent | d3e0bf306b86ac08b828886e75b8c30218a16377 (diff) | |
| download | nginx-4ae889c9f2c6c79402630aa2197bfbdd8cc42fd5.tar.gz nginx-4ae889c9f2c6c79402630aa2197bfbdd8cc42fd5.tar.bz2 | |
SSL: support ALPN (IETF's successor to NPN).
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index f030baa71..c3ac7266c 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1349,11 +1349,13 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, } } -#if (NGX_HTTP_SPDY && NGX_HTTP_SSL && !defined TLSEXT_TYPE_next_proto_neg) +#if (NGX_HTTP_SPDY && NGX_HTTP_SSL \ + && !defined TLSEXT_TYPE_application_layer_protocol_negotiation \ + && !defined TLSEXT_TYPE_next_proto_neg) if (lsopt->spdy && lsopt->ssl) { ngx_conf_log_error(NGX_LOG_WARN, cf, 0, - "nginx was built without OpenSSL NPN support, " - "SPDY is not enabled for %s", lsopt->addr); + "nginx was built without OpenSSL ALPN or NPN " + "support, SPDY is not enabled for %s", lsopt->addr); } #endif |