diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-31 11:42:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-31 11:42:07 +0200 |
| commit | e813241e103aa74d4daf025564b259f3fb9aca5a (patch) | |
| tree | 91a83b8735d66b91b382409748b398c023b5dce3 /lib/ssl/src/ssl_session.erl | |
| parent | 03b7d0ab7b998ab498349ebbffda01daadabab8c (diff) | |
| parent | bf8f3e3d5d928dfc63408439379d7a39880e730b (diff) | |
| download | otp-e813241e103aa74d4daf025564b259f3fb9aca5a.tar.gz otp-e813241e103aa74d4daf025564b259f3fb9aca5a.tar.bz2 otp-e813241e103aa74d4daf025564b259f3fb9aca5a.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Use inet and gen_* dialyzer specs
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 85c9fcb61c..a0643f616c 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(), port_num(), #ssl_options{}}, db_handle(), atom(), +-spec id({host(), inet:port_num(), #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(port_num(), binary(), #ssl_options{}, db_handle(), +-spec id(inet:port_num(), binary(), #ssl_options{}, db_handle(), atom(), seconds(), binary()) -> binary(). %% %% Description: Should be called by the server side to get an id |