commit 37e1846d732815dfaa1ef1e5f84e4bcc52eb66e4
author andresp@webrtc.org <andresp@webrtc.org> Thu Sep 25 07:30:14 2014 +0000
committer andresp@webrtc.org <andresp@webrtc.org> Thu Sep 25 07:30:14 2014 +0000
tree c2614008a159d5c607aed69ff5930fa79aa93442
parent fe1eafb71a8c3be8fa0e2a100955bffebfba6947

Revert "Call SSL_shutdown in OpenSSLStreamAdapter::Cleanup." (rev 7293).

Breaks windows bot as it was already showing on the try jobs on the

BUG=crbug/414211
R=jiayl@webrtc.org,juberti@webrtc.org
TBR=jiayl@webrtc.org,juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/26599004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7294 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/base/opensslstreamadapter.cc

diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
index 133eb72..070a948 100644
--- a/webrtc/base/opensslstreamadapter.cc
+++ b/webrtc/base/opensslstreamadapter.cc
@@ -695,12 +695,6 @@
   }
 
   if (ssl_) {
-    int ret = SSL_shutdown(ssl_);
-    if (ret < 0) {
-      LOG(LS_WARNING) << "SSL_shutdown failed, error = "
-                      << SSL_get_error(ssl_, ret);
-    }
-
     SSL_free(ssl_);
     ssl_ = NULL;
   }

webrtc/base/sslstreamadapter_unittest.cc

diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc
index 0538314..f7dcb71 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -691,13 +691,6 @@
   TestHandshake();
 };
 
-// Test that closing the connection on one side updates the other side.
-TEST_F(SSLStreamAdapterTestTLS, TestTLSClose) {
-  TestHandshake();
-  client_ssl_->Close();
-  EXPECT_EQ_WAIT(rtc::SS_CLOSED, server_ssl_->GetState(), handshake_wait_);
-};
-
 // Test transfer -- trivial
 TEST_F(SSLStreamAdapterTestTLS, TestTLSTransfer) {
   TestHandshake();