diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-12-02 10:24:56 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-12-02 10:24:56 +0100 |
| commit | c3d9d667e028284d6f96f8e260d094f1775182ea (patch) | |
| tree | f88229efc098d69e798132acc540835e11e24571 /lib/ssl/src/ssl_socket.erl | |
| parent | f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f (diff) | |
| parent | 239ce1c4781fe4fc25c55795573654453887f507 (diff) | |
| download | otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.gz otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.bz2 otp-c3d9d667e028284d6f96f8e260d094f1775182ea.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_socket.erl')
| -rw-r--r-- | lib/ssl/src/ssl_socket.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_socket.erl b/lib/ssl/src/ssl_socket.erl index 4778db2333..1b6e637cd3 100644 --- a/lib/ssl/src/ssl_socket.erl +++ b/lib/ssl/src/ssl_socket.erl @@ -1,13 +1,14 @@ -module(ssl_socket). -include("ssl_internal.hrl"). +-include("ssl_api.hrl"). --export([socket/3, setopts/3, getopts/3, peername/2, sockname/2, port/2]). +-export([socket/4, setopts/3, getopts/3, peername/2, sockname/2, port/2]). -socket(Pid, Transport, Socket) -> +socket(Pid, Transport, Socket, ConnectionCb) -> #sslsocket{pid = Pid, %% "The name "fd" is keept for backwards compatibility - fd = {Transport, Socket}}. + fd = {Transport, Socket, ConnectionCb}}. setopts(gen_tcp, Socket, Options) -> inet:setopts(Socket, Options); |