Merge "Revert part of commit a13ca93"

Juniper · Oct 25, 2016 · 1474bf4 · 1474bf4
2 parents 930e542 + 47c3953
commit 1474bf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/io/ssl_session.cc b/src/io/ssl_session.cc
@@ -98,7 +98,7 @@ void SslSession::AsyncReadSome() {
     }
 
     if (established()) {
-        ssl_socket_->async_read_some(null_buffers(),
+        socket()->async_read_some(null_buffers(),
             bind(&TcpSession::AsyncReadHandler, TcpSessionPtr(this)));
     }
 }

diff --git a/src/io/test/ssl_server_test.cc b/src/io/test/ssl_server_test.cc
@@ -389,7 +389,7 @@ TEST_F(SslEchoServerTest, msg_send_recv) {
     client = NULL;
 }
 
-TEST_F(SslEchoServerTest, large_msg_send_recv) {
+TEST_F(SslEchoServerTest, DISABLED_large_msg_send_recv) {
 
     SetUpImmedidate();
     SslClient *client = new SslClient(evm_.get(), false, true);