diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-31 22:10:03 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-31 22:10:03 +0200 |
| commit | 9894c51f3be4362a4d5edc05bf7e977a5e16bd26 (patch) | |
| tree | 76aeff18c6f0b1f19ff91776779dd53077f7a310 /lib/ssl/src/ssl.erl | |
| parent | 3817722d82b5ca2bdc880bb5f463a94c382eddaa (diff) | |
| parent | 396ec26494008e18b573707986e32733e468346d (diff) | |
| download | otp-9894c51f3be4362a4d5edc05bf7e977a5e16bd26.tar.gz otp-9894c51f3be4362a4d5edc05bf7e977a5e16bd26.tar.bz2 otp-9894c51f3be4362a4d5edc05bf7e977a5e16bd26.zip | |
Merge branch 'ia/ssl/accept-with-options'
* ia/ssl/accept-with-options:
ssl: Add possibility to specify ssl options when calling ssl:ssl_accept
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index a88bf45293..743753bf7d 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -195,7 +195,8 @@ transport_accept(#sslsocket{pid = {ListenSocket, -spec ssl_accept(#sslsocket{} | port(), timeout()| [ssl_option() | transport_option()]) -> ok | {ok, #sslsocket{}} | {error, reason()}. --spec ssl_accept(port(), [ssl_option()| transport_option()], timeout()) -> + +-spec ssl_accept(#sslsocket{} | port(), [ssl_option()] | [ssl_option()| transport_option()], timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% %% Description: Performs accept on an ssl listen socket. e.i. performs @@ -210,6 +211,15 @@ ssl_accept(#sslsocket{} = Socket, Timeout) -> ssl_accept(ListenSocket, SslOptions) when is_port(ListenSocket) -> ssl_accept(ListenSocket, SslOptions, infinity). +ssl_accept(#sslsocket{} = Socket, [], Timeout) -> + ssl_accept(#sslsocket{} = Socket, Timeout); +ssl_accept(#sslsocket{} = Socket, SslOptions, Timeout) -> + try + {ok, #config{ssl = SSL}} = handle_options(SslOptions, server), + ssl_connection:handshake(Socket, SSL, Timeout) + catch + Error = {error, _Reason} -> Error + end; ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) -> {Transport,_,_,_} = proplists:get_value(cb_info, SslOptions, {gen_tcp, tcp, tcp_closed, tcp_error}), |