Repository: trafficserver Updated Branches: refs/heads/master 5dca12438 -> e25f0ac09
[TS-2503] : fix build failure Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e25f0ac0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e25f0ac0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e25f0ac0 Branch: refs/heads/master Commit: e25f0ac0975e93bd1a3512b0bda9aeba7ce0b7b5 Parents: 5dca124 Author: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Authored: Fri Oct 17 21:08:44 2014 +0000 Committer: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Committed: Fri Oct 17 21:08:44 2014 +0000 ---------------------------------------------------------------------- iocore/net/SSLNetVConnection.cc | 6 +++--- iocore/net/SSLUtils.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e25f0ac0/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index c37a63d..e84008f 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -760,6 +760,8 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, i SSLNetVConnection::SSLNetVConnection(): ssl(NULL), sslHandshakeBeginTime(0), + sslLastWriteTime(0), + sslTotalBytesSent(0), hookOpRequested(TS_SSL_HOOK_OP_DEFAULT), sslHandShakeComplete(false), sslClientConnection(false), @@ -770,9 +772,7 @@ SSLNetVConnection::SSLNetVConnection(): sslPreAcceptHookState(SSL_HOOKS_INIT), sslSNIHookState(SNI_HOOKS_INIT), npnSet(NULL), - npnEndpoint(NULL), - sslLastWriteTime(0), - sslTotalBytesSent(0) + npnEndpoint(NULL) { } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e25f0ac0/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 286ba69..b36b473 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -1796,7 +1796,7 @@ SSLWriteBuffer(SSL * ssl, const void * buf, int64_t nbytes, int64_t& nwritten) nwritten = ret; BIO *bio = SSL_get_wbio(ssl); if (bio != NULL) { - BIO_flush(bio); + (void)BIO_flush(bio); } return SSL_ERROR_NONE; }
