diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:01:10 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:01:10 +0100 |
| commit | 67777601894ba779757daab0f062084ce03a1432 (patch) | |
| tree | ff30b6b1e1c033185251101ebf16ca281b82414a /lib/ssl/src/ssl.erl | |
| parent | 3e8a6c8bceea8552ef50bd8dcfc14a0f79c9f32e (diff) | |
| parent | 13971c224c42d1a583a41d37e809a380c932c60c (diff) | |
| download | otp-67777601894ba779757daab0f062084ce03a1432.tar.gz otp-67777601894ba779757daab0f062084ce03a1432.tar.bz2 otp-67777601894ba779757daab0f062084ce03a1432.zip | |
Merge branch 'ia/ssl/deprecated-r16'
* ia/ssl/deprecated-r16:
stdlib: Updated otp_internal to reflect removal of deprecated function
ssl & orber: Remove ssl:pid/1 (has been pointless since R14)
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 6224334a6e..09f2819ca8 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -28,14 +28,11 @@ cipher_suites/0, cipher_suites/1, suite_definition/1, close/1, shutdown/2, connect/3, connect/2, connect/4, connection_info/1, - controlling_process/2, listen/2, pid/1, peername/1, peercert/1, + controlling_process/2, listen/2, peername/1, peercert/1, recv/2, recv/3, send/2, getopts/2, setopts/2, sockname/1, versions/0, session_info/1, format_error/1, renegotiate/1, prf/5, clear_pem_cache/0, random_bytes/1, negotiated_next_protocol/1]). - --deprecated({pid, 1, next_major_release}). - -include("ssl_internal.hrl"). -include("ssl_record.hrl"). -include("ssl_cipher.hrl"). @@ -956,12 +953,3 @@ make_next_protocol_selector({server, AllProtocols, DefaultProtocol}) -> PreferredProtocol -> PreferredProtocol end end. - -%% Only used to remove exit messages from old ssl -%% First is a nonsense clause to provide some -%% backward compatibility for orber that uses this -%% function in a none recommended way, but will -%% work correctly if a valid pid is returned. -%% Deprcated to be removed in r16 -pid(#sslsocket{})-> - whereis(ssl_connection_sup). |