diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-10-13 12:28:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-10-13 12:28:12 +0200 |
| commit | d2f700dea89d43edeb0a41d2ddfb64d9a4c20004 (patch) | |
| tree | 1446f3477aa8142b072bf58cf7dd760843025d70 /lib/ssl/src/ssl_session_cache.erl | |
| parent | 527922fc932fff13a6a2bed7f13de4148e26885f (diff) | |
| parent | a60c126e813cdef73ff6fbd4dc5414f385d2c8c6 (diff) | |
| download | otp-d2f700dea89d43edeb0a41d2ddfb64d9a4c20004.tar.gz otp-d2f700dea89d43edeb0a41d2ddfb64d9a4c20004.tar.bz2 otp-d2f700dea89d43edeb0a41d2ddfb64d9a4c20004.zip | |
Merge branch 'ia/ssl/seperate-clinet-server-session-table/OTP-11365'
* ia/ssl/seperate-clinet-server-session-table/OTP-11365:
ssl: Separate session cache for client and server
Diffstat (limited to 'lib/ssl/src/ssl_session_cache.erl')
| -rw-r--r-- | lib/ssl/src/ssl_session_cache.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_session_cache.erl b/lib/ssl/src/ssl_session_cache.erl index 5c6ee3c54c..b011732f2c 100644 --- a/lib/ssl/src/ssl_session_cache.erl +++ b/lib/ssl/src/ssl_session_cache.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2012. All Rights Reserved. +%% Copyright Ericsson AB 2008-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -31,8 +31,8 @@ %%-------------------------------------------------------------------- %% Description: Return table reference. Called by ssl_manager process. %%-------------------------------------------------------------------- -init(_) -> - ets:new(cache_name(), [ordered_set, protected]). +init(Options) -> + ets:new(cache_name(proplists:get_value(role, Options)), [ordered_set, protected]). %%-------------------------------------------------------------------- %% Description: Handles cache table at termination of ssl manager. @@ -87,5 +87,5 @@ select_session(Cache, PartialKey) -> %%-------------------------------------------------------------------- %%% Internal functions %%-------------------------------------------------------------------- -cache_name() -> - ssl_otp_session_cache. +cache_name(Name) -> + list_to_atom(atom_to_list(Name) ++ "_ssl_otp_session_cache"). |