diff options
| author | Henrik Nord <[email protected]> | 2011-08-25 10:58:33 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-25 10:58:33 +0200 |
| commit | 756a93ca2064b9e0eba3d82a7bd37aeae0f39be1 (patch) | |
| tree | ffbbbfd2749a522c7b1f70ee4f7b1fa0a5e189f3 /lib/ssl/src/ssl_connection.erl | |
| parent | 48eb259aa2d6c7c5d1ddebbfbcefae5e3dafc49c (diff) | |
| parent | d48eaa0731017e5cdadca0af77ac14cd949b6c67 (diff) | |
| download | otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.tar.gz otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.tar.bz2 otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 21b021afb0..79570c520a 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -131,7 +131,7 @@ recv(Pid, Length, Timeout) -> pid(), tuple(), timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% -%% Description: Connect to a ssl server. +%% Description: Connect to an ssl server. %%-------------------------------------------------------------------- connect(Host, Port, Socket, Options, User, CbInfo, Timeout) -> try start_fsm(client, Host, Port, Socket, Options, User, CbInfo, @@ -145,7 +145,7 @@ connect(Host, Port, Socket, Options, User, CbInfo, Timeout) -> pid(), tuple(), timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% -%% Description: Performs accept on a ssl listen socket. e.i. performs +%% Description: Performs accept on an ssl listen socket. e.i. performs %% ssl handshake. %%-------------------------------------------------------------------- ssl_accept(Port, Socket, Opts, User, CbInfo, Timeout) -> @@ -185,7 +185,7 @@ socket_control(Socket, Pid, CbModule) -> %%-------------------------------------------------------------------- -spec close(pid()) -> ok | {error, reason()}. %% -%% Description: Close a ssl connection +%% Description: Close an ssl connection %%-------------------------------------------------------------------- close(ConnectionPid) -> case sync_send_all_state_event(ConnectionPid, close) of |