summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiayl@webrtc.org <jiayl@webrtc.org>2014-10-06 20:45:54 +0000
committerjiayl@webrtc.org <jiayl@webrtc.org>2014-10-06 20:45:54 +0000
commit5cc77017d808f4e9c2c53115eadbc951e675269c (patch)
treeb028bdec06f19cfa9f1b79e722dd61c0ec1fb32e
parentb5257f85d671d84a5292ea7bf55b3cc60650488a (diff)
downloadwebrtc-5cc77017d808f4e9c2c53115eadbc951e675269c.tar.gz
Merge webrtc r7301 to M39 branch.
TBR=juberti@webrtc.org BUG=414211 Review URL: https://webrtc-codereview.appspot.com/29679004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7375 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--base/opensslstreamadapter.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/base/opensslstreamadapter.cc b/base/opensslstreamadapter.cc
index 070a948b..133eb72b 100644
--- a/base/opensslstreamadapter.cc
+++ b/base/opensslstreamadapter.cc
@@ -695,6 +695,12 @@ void OpenSSLStreamAdapter::Cleanup() {
}
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;
}