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/07/22 22:30:21 UTC
trafficserver git commit: Clang format and fix compiler warning.
Repository: trafficserver
Updated Branches:
refs/heads/master ed48c9053 -> 8b41ab79e
Clang format and fix compiler warning.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8b41ab79
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b41ab79
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b41ab79
Branch: refs/heads/master
Commit: 8b41ab79e37b23c9445491fcf1a233a4b20d7a03
Parents: ed48c90
Author: shinrich <sh...@yahoo-inc.com>
Authored: Wed Jul 22 15:30:01 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Wed Jul 22 15:30:01 2015 -0500
----------------------------------------------------------------------
iocore/net/SSLNetVConnection.cc | 2 +-
plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc | 1 -
proxy/spdy/SpdyClientSession.cc | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b41ab79/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 0ecad71..ed04ed3 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -1178,7 +1178,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
// No data at the moment, hang tight
SSLDebugVC(this, "SSL handshake: EAGAIN");
return SSL_HANDSHAKE_WANT_READ;
- } else if (retval < 0) {
+ } else if (retval < 0) {
// An error, make us go away
SSLDebugVC(this, "SSL handshake error: read_retval=%d", retval);
return EVENT_ERROR;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b41ab79/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index 790d741..022cdcb 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -482,7 +482,6 @@ TSPluginInit(int argc, const char *argv[])
TSCont cb_pa = 0; // pre-accept callback continuation
TSCont cb_lc = 0; // life cycle callback continuuation
TSCont cb_sni = 0; // SNI callback continuuation
- TSCont cb_sni2 = 0; // SNI callback continuuation
static const struct option longopt[] = {{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b41ab79/proxy/spdy/SpdyClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index fe5c732..e0a0844 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -94,7 +94,6 @@ SpdyClientSession::init(NetVConnection *netvc)
{
int r;
- //this->mutex = new_ProxyMutex();
this->mutex = netvc->mutex;
this->vc = netvc;
this->req_map.clear();