Updated Branches: refs/heads/master ea9799496 -> 06a970c15
TS-841: Fix the NPN build Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/06a970c1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/06a970c1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/06a970c1 Branch: refs/heads/master Commit: 06a970c15572f3a6e4b8af8bdcfd526fca8e053a Parents: ea97994 Author: James Peach <[email protected]> Authored: Tue Feb 21 20:22:31 2012 -0800 Committer: James Peach <[email protected]> Committed: Tue Feb 21 20:22:31 2012 -0800 ---------------------------------------------------------------------- iocore/net/SSLNetVConnection.cc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a970c1/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index 76f6564..70ec535 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -505,18 +505,20 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err) sslHandShakeComplete = 1; #if TS_USE_TLS_NPN - const unsigned char * proto = NULL; - unsigned len = 0; - - SSL_get0_next_proto_negotiated(ssl, &proto, &len); - if (len) { - if (this->npnSet) { - this->npnEndpoint = this->npnSet->findEndpoint(proto, len); - this->npnSet = NULL; + { + const unsigned char * proto = NULL; + unsigned len = 0; + + SSL_get0_next_proto_negotiated(ssl, &proto, &len); + if (len) { + if (this->npnSet) { + this->npnEndpoint = this->npnSet->findEndpoint(proto, len); + this->npnSet = NULL; + } + Debug("ssl", "client selected next protocol %.*s", len, proto); + } else { + Debug("ssl", "client did not select a next protocol"); } - Debug("ssl", "client selected next protocol %.*s", len, proto); - } else { - Debug("ssl", "client did not select a next protocol"); } #endif /* TS_USE_TLS_NPN */
