diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-06-20 11:02:51 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-06-20 11:02:51 +0200 |
| commit | 00dee07f0480994a303e16c803d367c34c2a7f26 (patch) | |
| tree | 71d20efcdaf02a4752b7449b0eabe887762375ce /lib | |
| parent | c2388ad41790c266b0e78724b95ec92d2951b43a (diff) | |
| parent | c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a (diff) | |
| download | otp-00dee07f0480994a303e16c803d367c34c2a7f26.tar.gz otp-00dee07f0480994a303e16c803d367c34c2a7f26.tar.bz2 otp-00dee07f0480994a303e16c803d367c34c2a7f26.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssl: Fix pem cache bug
Diffstat (limited to 'lib')
| -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. |