diff options
| author | Loïc Hoguin <[email protected]> | 2019-05-09 10:18:53 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2021-04-17 16:32:02 +0200 |
| commit | 281c409f702c36c79564f0a257308724e7917b39 (patch) | |
| tree | 7e7b8316909cba9d057d38d1f86fc8b8aca280ea | |
| parent | 3190aef88aea04d6dce8545fe9b4574288903f44 (diff) | |
| download | ranch-281c409f702c36c79564f0a257308724e7917b39.tar.gz ranch-281c409f702c36c79564f0a257308724e7917b39.tar.bz2 ranch-281c409f702c36c79564f0a257308724e7917b39.zip | |
Use ssl:handshake instead of ssl:ssl_accept
This makes Ranch require OTP-21+.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/ranch_ssl.erl | 8 |
2 files changed, 3 insertions, 9 deletions
@@ -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. diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index 03eb5ee..f769868 100644 --- a/src/ranch_ssl.erl +++ b/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, _} -> |