diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:45:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:45:36 +0200 |
| commit | 7db84033da5880f2e3501865749a8c166fe2d358 (patch) | |
| tree | d15699586cd14c5dabbe2354bb9e5fa68ce0850c /lib/ssl/src/ssl_session.erl | |
| parent | 6a113a60dba9fd6c4d736b9e56c52f3494a15027 (diff) | |
| parent | eff93daf5f3f8d917414b89335ab4c8af5afe686 (diff) | |
| download | otp-7db84033da5880f2e3501865749a8c166fe2d358.tar.gz otp-7db84033da5880f2e3501865749a8c166fe2d358.tar.bz2 otp-7db84033da5880f2e3501865749a8c166fe2d358.zip | |
Merge branch 'ia/ssl/inet-spec-corrections' into dev
* ia/ssl/inet-spec-corrections:
Corrected spec name errors: ip_adress -> ip_address port_num -> port_number
Diffstat (limited to 'lib/ssl/src/ssl_session.erl')
| -rw-r--r-- | lib/ssl/src/ssl_session.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl index a0643f616c..bf738649f6 100644 --- a/lib/ssl/src/ssl_session.erl +++ b/lib/ssl/src/ssl_session.erl @@ -48,7 +48,7 @@ is_new(_ClientSuggestion, _ServerDecision) -> true. %%-------------------------------------------------------------------- --spec id({host(), inet:port_num(), #ssl_options{}}, db_handle(), atom(), +-spec id({host(), inet:port_number(), #ssl_options{}}, db_handle(), atom(), undefined | binary()) -> binary(). %% %% Description: Should be called by the client side to get an id @@ -63,7 +63,7 @@ id(ClientInfo, Cache, CacheCb, OwnCert) -> end. %%-------------------------------------------------------------------- --spec id(inet:port_num(), binary(), #ssl_options{}, db_handle(), +-spec id(inet:port_number(), binary(), #ssl_options{}, db_handle(), atom(), seconds(), binary()) -> binary(). %% %% Description: Should be called by the server side to get an id |