diff options
author | Sara Golemon <sara.golemon@mongodb.com> | 2019-01-03 21:52:05 +0000 |
---|---|---|
committer | Sara Golemon <sara.golemon@mongodb.com> | 2019-01-03 21:52:17 +0000 |
commit | f27c375287f7c69067d5ba437533622dbecf41c9 (patch) | |
tree | 2abb8fea0fbc94390883bd4377ca8367d7b7cbca /src/mongo/util | |
parent | bb9114dc71bfcf42422471f7789eca00881b8864 (diff) | |
download | mongo-f27c375287f7c69067d5ba437533622dbecf41c9.tar.gz |
Revert "SERVER-35393 Flush output buffer before attempting new writes"
This reverts commit 99ac27f83e67aca7e9244c3aadb3026492e45da3.
Diffstat (limited to 'src/mongo/util')
-rw-r--r-- | src/mongo/util/net/ssl/detail/impl/engine_apple.ipp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp b/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp index ddc32f332f8..5d877983f52 100644 --- a/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp +++ b/src/mongo/util/net/ssl/detail/impl/engine_apple.ipp @@ -279,10 +279,6 @@ engine::want engine::write(const asio::const_buffer& data, if (!verifyConnected(_ssl.get(), &ec)) { return want::want_nothing; } - if (_outbuf.size()) { - bytes_transferred = 0; - return data.size() ? want::want_output_and_retry : want::want_output; - } const auto status = ::SSLWrite(_ssl.get(), data.data(), data.size(), &bytes_transferred); if (status == ::errSSLWouldBlock) { return (bytes_transferred < data.size()) ? want::want_output_and_retry : want::want_nothing; @@ -290,9 +286,7 @@ engine::want engine::write(const asio::const_buffer& data, if (status != ::errSecSuccess) { ec = errorCode(status); } - // Just in case the next asio output is incomplete, - // make sure it comes back into this method for a flush. - return _outbuf.size() ? want::want_output_and_retry : want::want_nothing; + return _outbuf.size() ? want::want_output : want::want_nothing; } asio::mutable_buffer engine::get_output(const asio::mutable_buffer& data) { |