aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-05-24 12:27:49 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-05-24 12:27:49 +0200
commit102f7fd76efa911bf4c2cdbe5fffa3363a5f7074 (patch)
tree8aeb43135555f28d880915e1abae07e8f2b644d0
parent0b0d240d03c6c65e5f23dbd55ef0fa8ca17d4644 (diff)
parentaab1e1d1290b827b09287cadfa5fbb40c916b437 (diff)
downloadotp-102f7fd76efa911bf4c2cdbe5fffa3363a5f7074.tar.gz
otp-102f7fd76efa911bf4c2cdbe5fffa3363a5f7074.tar.bz2
otp-102f7fd76efa911bf4c2cdbe5fffa3363a5f7074.zip
Merge branch 'ia/ssl/ets-table-cleanup' into dev
* ia/ssl/ets-table-cleanup: Corrected last argument to timer:apply_after also corrected a dilyzer spec
-rw-r--r--lib/ssl/src/ssl.erl2
-rw-r--r--lib/ssl/src/ssl_manager.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 0ced6707eb..a5e8e7e5c2 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -415,7 +415,7 @@ getopts(#sslsocket{} = Socket, Options) ->
ssl_broker:getopts(Socket, Options).
%%--------------------------------------------------------------------
--spec setopts(#sslsocket{}, [proplist:property()]) -> ok | {error, reason()}.
+-spec setopts(#sslsocket{}, [proplists:property()]) -> ok | {error, reason()}.
%%
%% Description: Sets options
%%--------------------------------------------------------------------
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 5a2d0c9496..1bbb03bdde 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -270,14 +270,14 @@ handle_cast({invalidate_session, Host, Port,
#state{session_cache = Cache,
session_cache_cb = CacheCb} = State) ->
CacheCb:update(Cache, {{Host, Port}, ID}, Session#session{is_resumable = false}),
- timer:apply_after(?CLEAN_SESSION_DB, CacheCb, delete, {{Host, Port}, ID}),
+ timer:apply_after(?CLEAN_SESSION_DB, CacheCb, delete, [{{Host, Port}, ID}]),
{noreply, State};
handle_cast({invalidate_session, Port, #session{session_id = ID} = Session},
#state{session_cache = Cache,
session_cache_cb = CacheCb} = State) ->
CacheCb:update(Cache, {Port, ID}, Session#session{is_resumable = false}),
- timer:apply_after(?CLEAN_SESSION_DB, CacheCb, delete, {Port, ID}),
+ timer:apply_after(?CLEAN_SESSION_DB, CacheCb, delete, [{Port, ID}]),
{noreply, State};
handle_cast({recache_pem, File, LastWrite, Pid, From},