Repository: thrift Updated Branches: refs/heads/master 7bc943196 -> bede86a03
THRIFT-3944 TSSLSocket has dead code in checkHandshake Client: C++ This closes #1110 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bede86a0 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bede86a0 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bede86a0 Branch: refs/heads/master Commit: bede86a032789ea9d8ed7a7d9c684d3fc86ade5c Parents: 7bc9431 Author: tpcwang <tpc.w...@gmail.com> Authored: Thu Oct 6 10:41:44 2016 -0700 Committer: James E. King, III <jk...@apache.org> Committed: Sat Apr 1 10:14:16 2017 -0400 ---------------------------------------------------------------------- lib/cpp/src/thrift/transport/TSSLSocket.cpp | 15 --------------- 1 file changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/bede86a0/lib/cpp/src/thrift/transport/TSSLSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp index 4c7be6d..edcfb9d 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp @@ -446,21 +446,6 @@ void TSSLSocket::checkHandshake() { ssl_ = ctx_->createSSL(); - //set read and write bios to non-blocking - BIO* wbio = BIO_new(BIO_s_mem()); - if (wbio == NULL) { - throw TSSLException("SSL_get_wbio returns NULL"); - } - BIO_set_nbio(wbio, 1); - - BIO* rbio = BIO_new(BIO_s_mem()); - if (rbio == NULL) { - throw TSSLException("SSL_get_rbio returns NULL"); - } - BIO_set_nbio(rbio, 1); - - SSL_set_bio(ssl_, rbio, wbio); - SSL_set_fd(ssl_, static_cast<int>(socket_)); int rc; if (server()) {
