Merge pull request #1637 from Kampbell/rollback-fix-1605-since-it-breaks-HTTPSClientSessionTest-testCachedSession

Rollback fix #1605 since it breaks the unit test
This commit is contained in:
Günter Obiltschnig 2017-03-21 19:06:58 +01:00 committed by GitHub
commit 66234c25f9

View File

@ -229,10 +229,15 @@ void SecureSocketImpl::shutdown()
// OpenSSL and/or browser versions, and things
// seem to work better now.
int rc = SSL_shutdown(_pSSL);
#if FIXME
#1605: try to do a proper SSL_shutdown()
This fix for the issue above breaks the
HTTPSClientSessionTest::testCachedSession() Unit test
if (rc == 0 && _pSocket->getBlocking())
{
rc = SSL_shutdown(_pSSL);
}
#endif
if (rc < 0) handleError(rc);
if (_pSocket->getBlocking())
{