You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2015/04/12 22:11:40 UTC
thrift git commit: THRIFT-3061 eliminate potential for client to hang
SSLSocket close
Repository: thrift
Updated Branches:
refs/heads/master b1783a572 -> 932c3ee66
THRIFT-3061 eliminate potential for client to hang SSLSocket close
This closes #423
commit 5cb13f25ee6d292f2fde0051a2b7ee56b7884055
Author: Jim King <ji...@simplivity.com>
Date: 2015-04-03T18:56:27Z
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/932c3ee6
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/932c3ee6
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/932c3ee6
Branch: refs/heads/master
Commit: 932c3ee66e8bddf3619e063683a6047e7673b76c
Parents: b1783a5
Author: Roger Meier <ro...@apache.org>
Authored: Sun Apr 12 22:11:04 2015 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Apr 12 22:11:04 2015 +0200
----------------------------------------------------------------------
lib/cpp/src/thrift/transport/TSSLSocket.cpp | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/932c3ee6/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 b9a8d8e..e33dd48 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
@@ -244,9 +244,6 @@ void TSSLSocket::open() {
void TSSLSocket::close() {
if (ssl_ != NULL) {
int rc = SSL_shutdown(ssl_);
- if (rc == 0) {
- rc = SSL_shutdown(ssl_);
- }
if (rc < 0) {
int errno_copy = THRIFT_GET_SOCKET_ERROR;
string errors;