diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ranch_ssl.erl | 15 | ||||
| -rw-r--r-- | src/ranch_tcp.erl | 11 |
2 files changed, 19 insertions, 7 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index dc29a18..31950e9 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -55,6 +55,7 @@ | {ip, inet:ip_address()} | {key, Der::binary()} | {keyfile, string()} + | {linger, {boolean(), non_neg_integer()}} | {next_protocols_advertised, [binary()]} | {nodelay, boolean()} | {password, string()} @@ -64,6 +65,8 @@ | {reuse_session, fun()} | {reuse_sessions, boolean()} | {secure_renegotiate, boolean()} + | {send_timeout, timeout()} + | {send_timeout_close, boolean()} | {verify, ssl:verify_type()} | {verify_fun, {fun(), InitialUserState::term()}}]. -export_type([opts/0]). @@ -145,16 +148,18 @@ listen(Opts) -> true = lists:keymember(cert, 1, Opts) orelse lists:keymember(certfile, 1, Opts), Opts2 = ranch:set_option_default(Opts, backlog, 1024), - Opts3 = ranch:set_option_default(Opts2, ciphers, unbroken_cipher_suites()), + Opts3 = ranch:set_option_default(Opts2, send_timeout, 30000), + Opts4 = ranch:set_option_default(Opts3, send_timeout_close, true), + Opts5 = ranch:set_option_default(Opts4, ciphers, unbroken_cipher_suites()), %% We set the port to 0 because it is given in the Opts directly. %% The port in the options takes precedence over the one in the %% first argument. - ssl:listen(0, ranch:filter_options(Opts3, + ssl:listen(0, ranch:filter_options(Opts5, [backlog, cacertfile, cacerts, cert, certfile, ciphers, fail_if_no_peer_cert, hibernate_after, ip, key, keyfile, - next_protocols_advertised, nodelay, password, port, raw, - reuse_session, reuse_sessions, - secure_renegotiate, verify, verify_fun], + linger, next_protocols_advertised, nodelay, password, port, raw, + reuse_session, reuse_sessions, secure_renegotiate, + send_timeout, send_timeout_close, verify, verify_fun], [binary, {active, false}, {packet, raw}, {reuseaddr, true}, {nodelay, true}])). diff --git a/src/ranch_tcp.erl b/src/ranch_tcp.erl index d5d5003..27ecb3e 100644 --- a/src/ranch_tcp.erl +++ b/src/ranch_tcp.erl @@ -40,10 +40,13 @@ -type opts() :: [{backlog, non_neg_integer()} | {ip, inet:ip_address()} + | {linger, {boolean(), non_neg_integer()}} | {nodelay, boolean()} | {port, inet:port_number()} | {raw, non_neg_integer(), non_neg_integer(), - non_neg_integer() | binary()}]. + non_neg_integer() | binary()} + | {send_timeout, timeout()} + | {send_timeout_close, boolean()}]. -export_type([opts/0]). %% @doc Name of this transport, <em>tcp</em>. @@ -77,10 +80,14 @@ messages() -> {tcp, tcp_closed, tcp_error}. -spec listen(opts()) -> {ok, inet:socket()} | {error, atom()}. listen(Opts) -> Opts2 = ranch:set_option_default(Opts, backlog, 1024), + Opts3 = ranch:set_option_default(Opts2, send_timeout, 30000), + Opts4 = ranch:set_option_default(Opts3, send_timeout_close, true), %% We set the port to 0 because it is given in the Opts directly. %% The port in the options takes precedence over the one in the %% first argument. - gen_tcp:listen(0, ranch:filter_options(Opts2, [backlog, ip, nodelay, port, raw], + gen_tcp:listen(0, ranch:filter_options(Opts4, + [backlog, ip, linger, nodelay, port, raw, + send_timeout, send_timeout_close], [binary, {active, false}, {packet, raw}, {reuseaddr, true}, {nodelay, true}])). |