diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-07 09:20:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-07 09:20:52 +0200 |
| commit | 4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d (patch) | |
| tree | 097374e0392e44f00ab1e54e697214fdbfc301f6 /lib/ssl/src/ssl_session.erl | |
| parent | e37663d48f048c5948f882a34e3ad761ca4db762 (diff) | |
| parent | 71e720e56888faa6da3856d5c5e08c8e983c9d5d (diff) | |
| download | otp-4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d.tar.gz otp-4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d.tar.bz2 otp-4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d.zip | |
Merge branch 'ia/ssl/server-verify-fun/OTP-8770' into dev
* ia/ssl/server-verify-fun/OTP-8770:
Handling of path validation errors by the application
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 6db13e5b7a..25e7445180 100644 --- a/lib/ssl/src/ssl_session.erl +++ b/lib/ssl/src/ssl_session.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2009. All Rights Reserved. +%% Copyright Ericsson AB 2007-2010. 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 @@ -113,7 +113,7 @@ select_session(Sessions, #ssl_options{ciphers = Ciphers, List -> hd(List) end. - + %% If we can not generate a not allready in use session ID in %% ?GEN_UNIQUE_ID_MAX_TRIES we make the new session uncacheable The %% value of ?GEN_UNIQUE_ID_MAX_TRIES is stolen from open SSL which |