You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2015/02/16 16:30:14 UTC
trafficserver git commit: TS-3375 - Fix issue that would not insert
certificate based on name if IP address was specified.
Repository: trafficserver
Updated Branches:
refs/heads/master b299f75c6 -> 53d5c6dfb
TS-3375 - Fix issue that would not insert certificate based on name if IP address was specified.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/53d5c6df
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/53d5c6df
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/53d5c6df
Branch: refs/heads/master
Commit: 53d5c6dfb814da98129a0879b683fde9c5f8452a
Parents: b299f75
Author: shinrich <sh...@yahoo-inc.com>
Authored: Mon Feb 16 09:27:55 2015 -0600
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Mon Feb 16 09:27:55 2015 -0600
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/53d5c6df/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index c97b35a..4bf88fd 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1779,7 +1779,9 @@ ssl_store_ssl_context(
// this code is updated to reconfigure the SSL certificates, it will need some sort of
// refcounting or alternate way of avoiding double frees.
Debug("ssl", "importing SNI names from %s", (const char *)certpath);
- inserted = inserted || ssl_index_certificate(lookup, SSLCertContext(ctx, sslMultCertSettings.opt), certpath);
+ if (ssl_index_certificate(lookup, SSLCertContext(ctx, sslMultCertSettings.opt), certpath)) {
+ inserted = true;
+ }
if (inserted) {
if (SSLConfigParams::init_ssl_ctx_cb) {