TS-3788: Update CHANGES and clang-format
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4060f77a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4060f77a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4060f77a Branch: refs/heads/5.3.x Commit: 4060f77a64fc74a8e6d7af2301e36ac5aecb01e4 Parents: f0f22ce Author: Phil Sorber <[email protected]> Authored: Wed Sep 2 13:26:27 2015 -0600 Committer: Phil Sorber <[email protected]> Committed: Wed Sep 2 20:06:19 2015 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ iocore/net/SSLNetVConnection.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4060f77a/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8d22d93..3dbff50 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.2 + *) [TS-3788] SNI Callbacks stall after TS-3667 fix. + *) [TS-3618] Crashes in traffic_cop on shutdown / restart. *) [TS-3823] Fix ASAN build support. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4060f77a/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index f6bd6b3..276ac25 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -1052,7 +1052,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;
