From c5af2e7fcc6a4cd81ceb6bffce62f525334a74a7 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Fri, 22 Feb 2019 04:58:26 -0800
Subject: [PATCH] Fixes to some CI targets

---
 Jamfile                                          | 2 +-
 include/boost/beast/core/detect_ssl.hpp          | 5 +++--
 include/boost/beast/websocket/impl/handshake.hpp | 2 ++
 test/beast/core/basic_stream.cpp                 | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Jamfile b/Jamfile
index 701aa045..e1764cb2 100644
--- a/Jamfile
+++ b/Jamfile
@@ -115,7 +115,7 @@ project /boost/beast
     <target-os>solaris:<define>__EXTENSIONS__
     <target-os>solaris:<library>socket
     <target-os>solaris:<library>nsl
-    <target-os>windows:<define>_WIN32_WINNT=0x0501
+    <target-os>windows:<define>_WIN32_WINNT=0x0601
     <target-os>windows,<toolset>cw:<library>ws2_32
     <target-os>windows,<toolset>cw:<library>mswsock
     <target-os>windows,<toolset>gcc:<library>ws2_32
diff --git a/include/boost/beast/core/detect_ssl.hpp b/include/boost/beast/core/detect_ssl.hpp
index 98aad395..47621080 100644
--- a/include/boost/beast/core/detect_ssl.hpp
+++ b/include/boost/beast/core/detect_ssl.hpp
@@ -495,8 +495,9 @@ public:
         DetectHandler_&& handler,
         AsyncReadStream& stream,
         DynamicBuffer& buffer)
-        : async_op_base<DetectHandler_,
-            executor_type<AsyncReadStream>>(
+        : beast::async_op_base<
+            DetectHandler_,
+            beast::executor_type<AsyncReadStream>>(
                 std::forward<DetectHandler_>(handler),
                 stream.get_executor())
         , stream_(stream)
diff --git a/include/boost/beast/websocket/impl/handshake.hpp b/include/boost/beast/websocket/impl/handshake.hpp
index 59e5efe5..47dfb546 100644
--- a/include/boost/beast/websocket/impl/handshake.hpp
+++ b/include/boost/beast/websocket/impl/handshake.hpp
@@ -41,6 +41,8 @@ class stream<NextLayer, deflateSupported>::handshake_op
 {
     struct data
     {
+        data() = default; // for msvc
+
         // VFALCO This really should be two separate
         //        composed operations, to save on memory
         http::request<http::empty_body> req;
diff --git a/test/beast/core/basic_stream.cpp b/test/beast/core/basic_stream.cpp
index 516aab74..2f2b50dc 100644
--- a/test/beast/core/basic_stream.cpp
+++ b/test/beast/core/basic_stream.cpp
@@ -157,7 +157,7 @@ struct test_acceptor
         a.set_option(
             net::socket_base::reuse_address(true));
         a.bind(ep);
-        a.listen(1);
+        a.listen(net::socket_base::max_listen_connections);
         ep = a.local_endpoint();
         a.async_accept(
             [](error_code, net::ip::tcp::socket)