diff options
Diffstat (limited to 'databases/foundationdb/files/patch-flow_Net2.actor.cpp')
| -rw-r--r-- | databases/foundationdb/files/patch-flow_Net2.actor.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/databases/foundationdb/files/patch-flow_Net2.actor.cpp b/databases/foundationdb/files/patch-flow_Net2.actor.cpp index 427f0fe9ab93..fa8da1eb24a6 100644 --- a/databases/foundationdb/files/patch-flow_Net2.actor.cpp +++ b/databases/foundationdb/files/patch-flow_Net2.actor.cpp @@ -1,6 +1,6 @@ ---- flow/Net2.actor.cpp.orig 2018-08-01 01:25:10 UTC +--- flow/Net2.actor.cpp.orig 2019-01-09 22:28:32 UTC +++ flow/Net2.actor.cpp -@@ -56,7 +56,7 @@ uint64_t compatibleProtocolVersionMask = +@@ -56,7 +56,7 @@ uint64_t compatibleProtocolVersionMask = 0xfffffffffff uint64_t minValidProtocolVersion = 0x0FDB00A200060001LL; @@ -9,13 +9,3 @@ #include <execinfo.h> volatile double net2liveness = 0; -@@ -403,8 +403,7 @@ private: - - void init() { - // Socket settings that have to be set after connect or accept succeeds -- boost::asio::socket_base::non_blocking_io nbio(true); -- socket.io_control(nbio); -+ socket.non_blocking(true); - socket.set_option(boost::asio::ip::tcp::no_delay(true)); - } - |