diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2018-10-11 12:35:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2018-10-11 12:35:08 +0200 |
| commit | 72f13b54829879f05fae656494067ce92455b856 (patch) | |
| tree | 8853f53e7124b51b4bab233e7a10841b8d1a844f | |
| parent | b0e23e7b54909be811a962cc1cf075cfbea403b9 (diff) | |
| parent | 6163856b3bd78d1948a8e9e91e646d6c169aa310 (diff) | |
| download | erlang-72f13b54829879f05fae656494067ce92455b856.tar.gz | |
Merge branch 'ingela/ssl/merge-fix' into maint
* ingela/ssl/merge-fix:
ssl: Fix up incorrect automatic merge
| -rw-r--r-- | lib/ssl/src/tls_sender.erl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl index e9383998ce..8d1938cee7 100644 --- a/lib/ssl/src/tls_sender.erl +++ b/lib/ssl/src/tls_sender.erl @@ -111,13 +111,6 @@ setopts(Pid, Opts) -> call(Pid, {set_opts, Opts}). %%-------------------------------------------------------------------- --spec setopts(pid(), [{packet, integer() | atom()}]) -> ok | {error, term()}. -%% Description: Send application data -%%-------------------------------------------------------------------- -setopts(Pid, Opts) -> - call(Pid, {set_opts, Opts}). - -%%-------------------------------------------------------------------- -spec renegotiate(pid()) -> {ok, WriteState::map()} | {error, closed}. %% Description: So TLS connection process can synchronize the %% encryption state to be used when handshaking. |