Update vendor lib

Author: stdrc

CMakeLists.txt

@@ -13,10 +13,9 @@ include_directories(${VCPKG_INCLUDE_DIR})
 include_directories(src)
 
 add_definitions(-DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
-                -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS
-                -D_SCL_SECURE_NO_WARNINGS
                 -D_WIN32_WINNT=0x0501
                 -DWIN32_LEAN_AND_MEAN
+				-DNOMINMAX
                 -DCURL_STATICLIB)
 
 find_package(Boost REQUIRED COMPONENTS filesystem)

src/cqhttp/plugins/web/vendor/simple_web/.note

@@ -0,0 +1,2 @@
+Simple-Web-Server: v3.0.0-rc3
+Simple-WebSocket-Server: v2.0.0-rc4

src/cqhttp/plugins/web/vendor/simple_web/client_ws.hpp

@@ -13,11 +13,10 @@
 #include <openssl/ssl.h>
 
 namespace SimpleWeb {
-  typedef asio::ssl::stream<asio::ip::tcp::socket> HTTPS;
+  using HTTPS = asio::ssl::stream<asio::ip::tcp::socket>;
 
   template <>
   class Server<HTTPS> : public ServerBase<HTTPS> {
-    std::string session_id_context;
     bool set_session_id_context = false;
 
   public:
@@ -33,31 +32,32 @@ namespace SimpleWeb {
       }
     }
 
-    void start() override {
+  protected:
+    asio::ssl::context context;
+
+    void after_bind() override {
       if(set_session_id_context) {
         // Creating session_id_context from address:port but reversed due to small SSL_MAX_SSL_SESSION_ID_LENGTH
-        session_id_context = std::to_string(config.port) + ':';
+        auto session_id_context = std::to_string(acceptor->local_endpoint().port()) + ':';
         session_id_context.append(config.address.rbegin(), config.address.rend());
         SSL_CTX_set_session_id_context(context.native_handle(), reinterpret_cast<const unsigned char *>(session_id_context.data()),
-                                       std::min<size_t>(session_id_context.size(), SSL_MAX_SSL_SESSION_ID_LENGTH));
+                                       std::min<std::size_t>(session_id_context.size(), SSL_MAX_SSL_SESSION_ID_LENGTH));
       }
-      ServerBase::start();
     }
 
-  protected:
-    asio::ssl::context context;
-
     void accept() override {
-      auto session = std::make_shared<Session>(create_connection(*io_service, context));
+      auto connection = create_connection(*io_service, context);
 
-      acceptor->async_accept(session->connection->socket->lowest_layer(), [this, session](const error_code &ec) {
-        auto cancel_pair = session->connection->cancel_handlers_bool_and_lock();
-        if(cancel_pair.first)
+      acceptor->async_accept(connection->socket->lowest_layer(), [this, connection](const error_code &ec) {
+        auto lock = connection->handler_runner->continue_lock();
+        if(!lock)
           return;
 
         if(ec != asio::error::operation_aborted)
           this->accept();
 
+        auto session = std::make_shared<Session>(config.max_request_streambuf_size, connection);
+
         if(!ec) {
           asio::ip::tcp::no_delay option(true);
           error_code ec;
@@ -66,11 +66,11 @@ namespace SimpleWeb {
           session->connection->set_timeout(config.timeout_request);
           session->connection->socket->async_handshake(asio::ssl::stream_base::server, [this, session](const error_code &ec) {
             session->connection->cancel_timeout();
-            auto cancel_pair = session->connection->cancel_handlers_bool_and_lock();
-            if(cancel_pair.first)
+            auto lock = session->connection->handler_runner->continue_lock();
+            if(!lock)
               return;
             if(!ec)
-              this->read_request_and_content(session);
+              this->read(session);
             else if(this->on_error)
               this->on_error(session->request, ec);
           });