Merge pull request #28 from 5cript/feat/boost_compat_update

Fixed code to work with newer boost beast.
5cript · Dec 4, 2024 · f1ff891 · f1ff891
2 parents c47f730 + ad12913
commit f1ff891
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 42 deletions.
diff --git a/include/roar/beast/forward.hpp b/include/roar/beast/forward.hpp
diff --git a/include/roar/directory_server/directory_server.hpp b/include/roar/directory_server/directory_server.hpp
@@ -481,7 +481,7 @@ namespace Roar::Detail
             else
             {
                 RangeFileBody::value_type body;
-                boost::beast::error_code ec;
+                std::error_code ec;
                 body.open(fileAndStatus.file.string().c_str(), std::ios_base::in, ec);
                 if (ec)
                     return session.sendStandardResponse(

diff --git a/include/roar/error.hpp b/include/roar/error.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <roar/beast/forward.hpp>
-
 #include <boost/system/system_error.hpp>
 
 #include <string>

diff --git a/include/roar/request.hpp b/include/roar/request.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <boost/utility/string_view_fwd.hpp>
 #include <roar/mechanics/cookie.hpp>
 #include <roar/authorization/basic_auth.hpp>
 #include <roar/authorization/digest_auth.hpp>
@@ -95,12 +96,13 @@ namespace Roar
 
         void target(std::string_view target)
         {
-            static_cast<beast_request*>(this)->target(target);
+            static_cast<beast_request*>(this)->target(boost::string_view{target.data(), target.size()});
             parseTarget();
         }
         std::string_view target() const
         {
-            return static_cast<beast_request const*>(this)->target();
+            auto target = static_cast<beast_request const*>(this)->target();
+            return std::string_view{target.data(), target.size()};
         }
 
         Request<BodyT>& host(std::string&& host)
@@ -345,7 +347,8 @@ namespace Roar
             auto spacePos = iter->value().find(' ');
             if (spacePos == std::string::npos)
                 return std::nullopt;
-            return authorizationSchemeFromString(iter->value().substr(0, spacePos));
+            auto boostView = iter->value().substr(0, spacePos);
+            return authorizationSchemeFromString(std::string_view{boostView.data(), boostView.size()});
         }
 
         /**
@@ -362,7 +365,8 @@ namespace Roar
                 return std::nullopt;
             if (value.substr(0, spacePos) != "Basic")
                 return std::nullopt;
-            return BasicAuth::fromBase64(value.substr(spacePos + 1, value.size() - spacePos - 1));
+            auto boostView = value.substr(spacePos + 1, value.size() - spacePos - 1);
+            return BasicAuth::fromBase64(std::string_view{boostView.data(), boostView.size()});
         }
 
         Request<BodyT>& basicAuth(BasicAuth const& auth)
@@ -385,7 +389,8 @@ namespace Roar
                 return std::nullopt;
             if (value.substr(0, spacePos) != "Digest")
                 return std::nullopt;
-            return DigestAuth::fromParameters(value.substr(spacePos + 1));
+            auto boostView = value.substr(spacePos + 1);
+            return DigestAuth::fromParameters(std::string_view{boostView.data(), boostView.size()});
         }
 
         Request<BodyT>& digestAuth(DigestAuth const& auth)

diff --git a/include/roar/server.hpp b/include/roar/server.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <roar/directory_server/directory_server.hpp>
-#include <roar/beast/forward.hpp>
 #include <roar/routing/proto_route.hpp>
 #include <roar/error.hpp>
 #include <roar/session/session.hpp>

diff --git a/include/roar/session/factory.hpp b/include/roar/session/factory.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <roar/beast/forward.hpp>
 #include <roar/detail/pimpl_special_functions.hpp>
 #include <roar/ssl/make_ssl_context.hpp>
 #include <roar/standard_response_provider.hpp>

diff --git a/include/roar/session/session.hpp b/include/roar/session/session.hpp
@@ -5,7 +5,6 @@
 #include <roar/error.hpp>
 #include <roar/websocket/websocket_session.hpp>
 #include <roar/response.hpp>
-#include <roar/beast/forward.hpp>
 #include <roar/detail/pimpl_special_functions.hpp>
 #include <roar/literals/memory.hpp>
 #include <roar/routing/proto_route.hpp>

diff --git a/test/test_http_server.hpp b/test/test_http_server.hpp
@@ -63,7 +63,7 @@ namespace Roar::Tests
             return session.sendStandardResponse(status::bad_request, "Cannot parse ranges.");
 
         RangeFileBody::value_type body;
-        boost::beast::error_code ec;
+        std::error_code ec;
         body.open(tempDir_.path() / "index.txt", std::ios_base::in, ec);
         if (ec)
             return session.sendStandardResponse(status::internal_server_error, "Cannot open file for reading.");