diff options
| author | Loïc Hoguin <essen@ninenines.eu> | 2016-11-24 19:25:50 +0100 |
|---|---|---|
| committer | Loïc Hoguin <essen@ninenines.eu> | 2016-11-24 19:25:50 +0100 |
| commit | 94b3770ccfd810d4980fbedb74e4127cf0656fc2 (patch) | |
| tree | 876fb9a1f09ed5892cdce9b273454116222066e9 | |
| parent | 8cd63bc0769016191126995761965f61909ae311 (diff) | |
| download | ranch-94b3770ccfd810d4980fbedb74e4127cf0656fc2.tar.gz ranch-94b3770ccfd810d4980fbedb74e4127cf0656fc2.tar.bz2 ranch-94b3770ccfd810d4980fbedb74e4127cf0656fc2.zip | |
Don't attempt to start ssl anymore
Ranch now depends on SSL. Users embedding listeners in
their supervision tree are expected to depend on SSL too
if they are using it.
| -rw-r--r-- | src/ranch.erl | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/ranch.erl b/src/ranch.erl index 31c4761..24b87a5 100644 --- a/src/ranch.erl +++ b/src/ranch.erl @@ -48,8 +48,6 @@ start_listener(Ref, NumAcceptors, Transport, TransOpts, Protocol, ProtoOpts) when is_integer(NumAcceptors) andalso is_atom(Transport) andalso is_atom(Protocol) -> _ = code:ensure_loaded(Transport), - %% @todo Remove in Ranch 2.0 and simply require ssl. - _ = ensure_ssl(Transport), case erlang:function_exported(Transport, name, 0) of false -> {error, badarg}; @@ -103,18 +101,10 @@ stop_listener(Ref) -> child_spec(Ref, NumAcceptors, Transport, TransOpts, Protocol, ProtoOpts) when is_integer(NumAcceptors) andalso is_atom(Transport) andalso is_atom(Protocol) -> - %% @todo Remove in Ranch 2.0 and simply require ssl. - _ = ensure_ssl(Transport), {{ranch_listener_sup, Ref}, {ranch_listener_sup, start_link, [ Ref, NumAcceptors, Transport, TransOpts, Protocol, ProtoOpts ]}, permanent, infinity, supervisor, [ranch_listener_sup]}. -%% @todo Remove in Ranch 2.0 and simply require ssl. -ensure_ssl(ranch_ssl) -> - require([crypto, asn1, public_key, ssl]); -ensure_ssl(_) -> - ok. - -spec accept_ack(ref()) -> ok. accept_ack(Ref) -> receive {shoot, Ref, Transport, Socket, AckTimeout} -> |