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/01/30 21:38:36 UTC
trafficserver git commit: TS-3319: Fix ifdef to compile on RHEL 5
Repository: trafficserver
Updated Branches:
refs/heads/master 2a8bb593f -> d1d6fc716
TS-3319: Fix ifdef to compile on RHEL 5
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d1d6fc71
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d1d6fc71
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d1d6fc71
Branch: refs/heads/master
Commit: d1d6fc716b0ffa8d89e3116fcdc3e5ef3f31ff5a
Parents: 2a8bb59
Author: shinrich <sh...@yahoo-inc.com>
Authored: Fri Jan 30 14:38:14 2015 -0600
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Fri Jan 30 14:38:14 2015 -0600
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d1d6fc71/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index e16b7e3..211a34a 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1681,12 +1681,14 @@ ssl_callback_info(const SSL *ssl, int where, int ret)
static void
setSslHandshakeCallbacks(SSL_CTX *ctx) {
+#if TS_USE_TLS_SNI
// Make sure the callbacks are set
#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
SSL_CTX_set_cert_cb(ctx, ssl_cert_callback, NULL);
#else
SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_callback);
#endif
+#endif
}
static SSL_CTX *