git commit: TS-1332: Silence spurious error when adding SSL certificates with alternate names

[jp...@apache.org]

Updated Branches:
  refs/heads/master 19bcca20c -> b512fef66


TS-1332: Silence spurious error when adding SSL certificates with alternate names

When a certificate has the name hostname for the CN and the DNS
alternative name, we get a spurious error message from the hash
collision. The error is spurious, so it's ok to just silence it.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b512fef6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b512fef6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b512fef6

Branch: refs/heads/master
Commit: b512fef66fd3f2118517eb5ac6b3a879cfa2caaa
Parents: 19bcca2
Author: James Peach <jp...@apache.org>
Authored: Sun Jul 8 16:11:57 2012 -0700
Committer: James Peach <jp...@apache.org>
Committed: Sun Jul 8 16:11:57 2012 -0700

----------------------------------------------------------------------
 CHANGES                     |    2 ++
 iocore/net/SSLCertLookup.cc |    2 +-
 lib/ts/Trie.h               |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b512fef6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4223f01..5261560 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.0
+  *) [TS-1332] Silence spurious error when adding SSL certificates with alternate names
+
   *) [TS-1087] TSHttpTxnOutgoingAddrSet forward declaration does not match implementation
 
   *) [TS-1319] Large cache (> 16TB) not working

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b512fef6/iocore/net/SSLCertLookup.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc
index aef62c9..8c323a5 100644
--- a/iocore/net/SSLCertLookup.cc
+++ b/iocore/net/SSLCertLookup.cc
@@ -501,7 +501,7 @@ SSLContextStorage::insert(SSL_CTX * ctx, const char * name)
     }
 
     Debug("indexed wildcard certificate for '%s' as '%s'", name, reversed);
-    this->wildcards.Insert(reversed, new SslEntry(ctx), 0 /* rank */, -1 /* keylen */);
+    return this->wildcards.Insert(reversed, new SslEntry(ctx), 0 /* rank */, -1 /* keylen */);
   } else {
     ink_hash_table_insert(this->hostnames, name, (void *)ctx);
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b512fef6/lib/ts/Trie.h
----------------------------------------------------------------------
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index 64d80a2..eed9207 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -142,7 +142,7 @@ Trie<T>::Insert(const char *key, T* value, int rank, int key_len /* = -1 */)
   }
 
   if (curr_node->occupied) {
-    Error("Cannot insert duplicate!");
+    Debug("Trie::Insert", "Cannot insert duplicate!");
     return false;
   }