From 96a087a1a68d276d9ffa8fc474e78f691ab73bf9 Mon Sep 17 00:00:00 2001
From: gns333 <gns333@qq.com>
Date: Wed, 27 Jan 2021 19:01:20 +0800
Subject: [PATCH 1/3] Add clear_resolved_cache implementation (#893)

---
 .../network/protocol/http/policies/async_resolver.hpp  | 10 ++++++++--
 boost/network/protocol/http/policies/sync_resolver.hpp |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/boost/network/protocol/http/policies/async_resolver.hpp b/boost/network/protocol/http/policies/async_resolver.hpp
index c03cd5a36..4e508364a 100644
--- a/boost/network/protocol/http/policies/async_resolver.hpp
+++ b/boost/network/protocol/http/policies/async_resolver.hpp
@@ -36,18 +36,21 @@ struct async_resolver : std::enable_shared_from_this<async_resolver<Tag> > {
   typedef std::function<void(resolver_type &, string_type, std::uint16_t,
                              resolve_completion_function)> resolve_function;
 
+  void clear_resolved_cache() { clear_cache_.store(true); }
+
  protected:
   bool cache_resolved_;
+  std::atomic<bool> clear_cache_;
   endpoint_cache endpoint_cache_;
   std::shared_ptr<boost::asio::io_service> service_;
   std::shared_ptr<boost::asio::io_service::strand> resolver_strand_;
 
   explicit async_resolver(bool cache_resolved)
-      : cache_resolved_(cache_resolved), endpoint_cache_() {}
+      : cache_resolved_(cache_resolved), clear_cache_(false), endpoint_cache_() {}
 
   void resolve(resolver_type &resolver_, string_type const &host,
                std::uint16_t port, resolve_completion_function once_resolved) {
-    if (cache_resolved_) {
+    if (cache_resolved_ && !clear_cache_.load()) {
       typename endpoint_cache::iterator iter =
           endpoint_cache_.find(boost::to_lower_copy(host));
       if (iter != endpoint_cache_.end()) {
@@ -74,6 +77,9 @@ struct async_resolver : std::enable_shared_from_this<async_resolver<Tag> > {
     typename endpoint_cache::iterator iter;
     bool inserted = false;
     if (!ec && cache_resolved_) {
+      if (clear_cache_.exchange(false)) {
+        endpoint_cache_.clear();
+      }
       std::tie(iter, inserted) = endpoint_cache_.insert(std::make_pair(
           host, std::make_pair(endpoint_iterator, resolver_iterator())));
       once_resolved(ec, iter->second);
diff --git a/boost/network/protocol/http/policies/sync_resolver.hpp b/boost/network/protocol/http/policies/sync_resolver.hpp
index 7c9c2c7f4..09d373b87 100644
--- a/boost/network/protocol/http/policies/sync_resolver.hpp
+++ b/boost/network/protocol/http/policies/sync_resolver.hpp
@@ -27,19 +27,26 @@ struct sync_resolver {
   typedef std::pair<resolver_iterator, resolver_iterator>
       resolver_iterator_pair;
 
+  void clear_resolved_cache() { clear_cache_.store(true); }
+
  protected:
   typedef typename string<Tag>::type string_type;
   typedef std::unordered_map<string_type, resolver_iterator_pair>
       resolved_cache;
   resolved_cache endpoint_cache_;
   bool cache_resolved_;
+  std::atomic<bool> clear_cache_;
 
-  explicit sync_resolver(bool cache_resolved) : cache_resolved_(cache_resolved) {}
+  explicit sync_resolver(bool cache_resolved)
+      : cache_resolved_(cache_resolved), clear_cache_(false) {}
 
   resolver_iterator_pair resolve(resolver_type& resolver_,
                                  string_type  /*unused*/const& hostname,
                                  string_type const& port) {
     if (cache_resolved_) {
+      if (clear_cache_.exchange(false)) {
+        endpoint_cache_.clear();
+	  }
       typename resolved_cache::iterator cached_iterator =
           endpoint_cache_.find(hostname);
       if (cached_iterator == endpoint_cache_.end()) {

From d42fb59a64a60f8495179b71d88bf32e93448133 Mon Sep 17 00:00:00 2001
From: Randy Li <hizukiayaka@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:04:59 +0800
Subject: [PATCH 2/3] Fixup asio old service removed after boost 1.69 (#901)

BOOST_ASIO_ENABLE_OLD_SERVICES option and all those header
files are removed from boost asio 1.70.

Signed-off-by: Hsia-Jun(Randy) Li <randy.li@synaptics.com>
Co-authored-by: Hsia-Jun(Randy) Li <randy.li@synaptics.com>
---
 boost/network/protocol/stream_handler.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp
index 62c97ec4a..cd98b6875 100644
--- a/boost/network/protocol/stream_handler.hpp
+++ b/boost/network/protocol/stream_handler.hpp
@@ -13,12 +13,12 @@
 #include <memory>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/basic_socket.hpp>
+#include <boost/asio/basic_stream_socket.hpp>
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/handler_type_requirements.hpp>
 #include <boost/asio/detail/push_options.hpp>
 #include <boost/asio/detail/throw_error.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/asio/stream_socket_service.hpp>
 #include <cstddef>
 
 #ifdef BOOST_NETWORK_ENABLE_HTTPS

From 552ce94bd91c055f11ba524adf0ca0712063d711 Mon Sep 17 00:00:00 2001
From: jalegido <jalegido@users.noreply.github.com>
Date: Thu, 7 Sep 2023 14:06:56 +0200
Subject: [PATCH 3/3] Compatibility with boost 1.83 (#902)

Co-authored-by: jjll <jjll@gmv.com>
---
 libs/network/src/server_request_parsers_impl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/network/src/server_request_parsers_impl.cpp b/libs/network/src/server_request_parsers_impl.cpp
index 9a539b1ae..d3670e924 100644
--- a/libs/network/src/server_request_parsers_impl.cpp
+++ b/libs/network/src/server_request_parsers_impl.cpp
@@ -12,6 +12,7 @@
 #include <boost/spirit/include/qi.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/network/protocol/http/message/header.hpp>
+#include <boost/regex/pending/unicode_iterator.hpp>
 
 namespace boost {
 namespace spirit {
@@ -22,7 +23,7 @@ typedef std::basic_string<uint32_t> u32_string;
 template <>  // <typename Attrib, typename T, typename Enable>
 struct assign_to_container_from_value<std::string, u32_string, void> {
   static void call(u32_string const& val, std::string& attr) {
-    u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(),
+    boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(),
                                                    end = val.end();
     for (; begin != end; ++begin) attr += *begin;
   }