Permalink
Browse files

enable TLS-1.1 and TLS-1.2 since nginx-1.0.12

  • Loading branch information...
1 parent fa210fd commit 4a048dfd9a78d2ae053a01df6c151bfdc165064b @yaoweibin committed Jun 10, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 modules/ngx_tcp_ssl_module.c
@@ -24,7 +24,7 @@ static ngx_conf_bitmask_t ngx_tcp_ssl_protocols[] = {
{ ngx_string("SSLv2"), NGX_SSL_SSLv2 },
{ ngx_string("SSLv3"), NGX_SSL_SSLv3 },
{ ngx_string("TLSv1"), NGX_SSL_TLSv1 },
-#if defined(nginx_version) && nginx_version >= 1001013
+#if defined(nginx_version) && nginx_version >= 1000012
{ ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
{ ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
#endif
@@ -230,7 +230,7 @@ ngx_tcp_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1
-#if defined(nginx_version) && nginx_version >= 1001013
+#if defined(nginx_version) && nginx_version >= 1000012
|NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2
#endif
));

1 comment on commit 4a048df

@jgn
jgn commented on 4a048df Jun 11, 2012

Weibin Yao - works great! Thanks!

Please sign in to comment.