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_internal.hrl | |
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_internal.hrl')
-rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index cc66246068..6bf1edc452 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -28,8 +28,7 @@ -type reply() :: term(). -type msg() :: term(). -type from() :: term(). --type host() :: string() | tuple(). --type port_num() :: integer(). +-type host() :: inet:ip_address() | inet:hostname(). -type session_id() :: 0 | binary(). -type tls_version() :: {integer(), integer()}. -type tls_atom_version() :: sslv3 | tlsv1. |