You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/03/14 04:16:49 UTC
[2/3] git commit: TS-1134: TSNetAcceptNamedProtocol() should fail if
we don't have NPN support.
TS-1134: TSNetAcceptNamedProtocol() should fail if we don't have NPN support.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2534c45b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2534c45b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2534c45b
Branch: refs/heads/master
Commit: 2534c45b03e86ecdd5a0d383b4f51157448fbdbe
Parents: e3d16ef
Author: James Peach <jp...@apache.org>
Authored: Wed Feb 29 21:01:29 2012 -0800
Committer: James Peach <jp...@apache.org>
Committed: Tue Mar 13 20:16:05 2012 -0700
----------------------------------------------------------------------
proxy/InkAPI.cc | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2534c45b/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index c5ceeb6..cb52a56 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -6424,6 +6424,8 @@ extern bool ssl_unregister_protocol(const char *, Continuation *);
TSReturnCode
TSNetAcceptNamedProtocol(TSCont contp, const char * protocol)
{
+#if TS_USE_TLS_NPN
+
sdk_assert(protocol != NULL);
sdk_assert(contp != NULL);
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
@@ -6434,6 +6436,14 @@ TSNetAcceptNamedProtocol(TSCont contp, const char * protocol)
}
return TS_SUCCESS;
+
+#else /* TS_USE_TLS_NPN */
+
+ NOWARN_UNUSED(contp);
+ NOWARN_UNUSED(protocol);
+ return TS_ERROR;
+
+#endif /* TS_USE_TLS_NPN */
}
/* DNS Lookups */