Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 5545:01e2a5bcdd8f
SSL: support ALPN (IETF's successor to NPN).
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
author | Piotr Sikora <piotr@cloudflare.com> |
---|---|
date | Tue, 28 Jan 2014 15:33:49 -0800 |
parents | 692afcea9d0d |
children | 3a72b1805c52 |
comparison
equal
deleted
inserted
replaced
5544:2f586f1684fa | 5545:01e2a5bcdd8f |
---|---|
1347 { | 1347 { |
1348 return NGX_ERROR; | 1348 return NGX_ERROR; |
1349 } | 1349 } |
1350 } | 1350 } |
1351 | 1351 |
1352 #if (NGX_HTTP_SPDY && NGX_HTTP_SSL && !defined TLSEXT_TYPE_next_proto_neg) | 1352 #if (NGX_HTTP_SPDY && NGX_HTTP_SSL \ |
1353 && !defined TLSEXT_TYPE_application_layer_protocol_negotiation \ | |
1354 && !defined TLSEXT_TYPE_next_proto_neg) | |
1353 if (lsopt->spdy && lsopt->ssl) { | 1355 if (lsopt->spdy && lsopt->ssl) { |
1354 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | 1356 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
1355 "nginx was built without OpenSSL NPN support, " | 1357 "nginx was built without OpenSSL ALPN or NPN " |
1356 "SPDY is not enabled for %s", lsopt->addr); | 1358 "support, SPDY is not enabled for %s", lsopt->addr); |
1357 } | 1359 } |
1358 #endif | 1360 #endif |
1359 | 1361 |
1360 addr = ngx_array_push(&port->addrs); | 1362 addr = ngx_array_push(&port->addrs); |
1361 if (addr == NULL) { | 1363 if (addr == NULL) { |