summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-07-01 17:42:26 +0000
committerGordon Sim <gsim@apache.org>2009-07-01 17:42:26 +0000
commit9892dd927a1dc1324d83f7f0ef6bb2f464dc6da1 (patch)
treeff6906f6231a5149a8f39890c723cc2e834eb573 /qpid/cpp
parentb93af15055f2f2b471d1c805cd0c45d89f912964 (diff)
downloadqpid-python-9892dd927a1dc1324d83f7f0ef6bb2f464dc6da1.tar.gz
Prevent broker thread blocking while SSL handshake completes.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@790291 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
index 8cbbc800e7..21ec8f7216 100644
--- a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
@@ -120,7 +120,6 @@ SslSocket::SslSocket(IOHandlePrivate* ioph, PRFileDesc* model) : IOHandle(ioph),
{
socket = SSL_ImportFD(model, PR_ImportTCPSocket(impl->fd));
NSS_CHECK(SSL_ResetHandshake(socket, true));
- NSS_CHECK(SSL_ForceHandshake(socket));
}
void SslSocket::setNonblocking() const
@@ -152,7 +151,6 @@ void SslSocket::connect(const std::string& host, uint16_t port) const
throw Exception(QPID_MSG("Could not resolve address for host."));
}
PR_CHECK(PR_Connect(socket, &address, PR_INTERVAL_NO_TIMEOUT));
- NSS_CHECK(SSL_ForceHandshake(socket));
}
void SslSocket::close() const