diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-06-20 11:01:20 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-06-20 11:01:20 +0200 |
| commit | c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a (patch) | |
| tree | fd28b780755bcb972e5b29dc9ee8b52844b2e195 /lib/ssl | |
| parent | 67d2e30e77db74d0852421c21362d1a9374780e1 (diff) | |
| parent | d7d9cc3db6e8fb49306abfee503cf89da606f51d (diff) | |
| download | otp-c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a.tar.gz otp-c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a.tar.bz2 otp-c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a.zip | |
Merge branch 'ia/ssl/pem-cache-bug' into maint
* ia/ssl/pem-cache-bug:
ssl: Fix pem cache bug
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index a18cb70e2d..3e947af2c9 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -107,10 +107,10 @@ connection_init(Trustedcerts, Role) -> cache_pem_file(File, DbHandle) -> MD5 = crypto:md5(File), case ssl_certificate_db:lookup_cached_pem(DbHandle, MD5) of - [Content] -> - {ok, Content}; [{Content,_}] -> {ok, Content}; + [Content] -> + {ok, Content}; undefined -> call({cache_pem, {MD5, File}}) end. |