Просмотр исходного кода

Use ssl:handshake instead of ssl:ssl_accept

This makes Ranch require OTP-21+.
Loïc Hoguin 6 лет назад
Родитель
Сommit
281c409f70
2 измененных файлов с 3 добавлено и 9 удалено
  1. 2 2
      Makefile
  2. 1 7
      src/ranch_ssl.erl

+ 2 - 2
Makefile

@@ -24,10 +24,10 @@ dep_ct_helper = git https://github.com/ninenines/ct_helper master
 dep_ci.erlang.mk = git https://github.com/ninenines/ci.erlang.mk master
 DEP_EARLY_PLUGINS = ci.erlang.mk
 
-AUTO_CI_OTP ?= OTP-19+
+AUTO_CI_OTP ?= OTP-21+
 AUTO_CI_HIPE ?= OTP-LATEST
 # AUTO_CI_ERLLVM ?= OTP-LATEST
-AUTO_CI_WINDOWS ?= OTP-19+
+AUTO_CI_WINDOWS ?= OTP-21+
 
 # Standard targets.
 

+ 1 - 7
src/ranch_ssl.erl

@@ -15,10 +15,6 @@
 -module(ranch_ssl).
 -behaviour(ranch_transport).
 
--ifdef(OTP_RELEASE).
--compile({nowarn_deprecated_function, [{ssl, ssl_accept, 3}]}).
--endif.
-
 -export([name/0]).
 -export([secure/0]).
 -export([messages/0]).
@@ -139,9 +135,7 @@ accept_ack(CSocket, Timeout) ->
 -spec handshake(inet:socket() | ssl:sslsocket(), opts(), timeout())
 	-> {ok, ssl:sslsocket()} | {error, any()}.
 handshake(CSocket, Opts, Timeout) ->
-	case ssl:ssl_accept(CSocket, Opts, Timeout) of
-		ok ->
-			{ok, CSocket};
+	case ssl:handshake(CSocket, Opts, Timeout) of
 		{ok, NewSocket} ->
 			{ok, NewSocket};
 		Error = {error, _} ->