1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
https://bugs.gentoo.org/886585
https://github.com/badaix/snapcast/commit/853c3f622ff2262b56681ee04dd20b4266c72493
https://github.com/badaix/snapcast/issues/1082
From 853c3f622ff2262b56681ee04dd20b4266c72493 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 21 Dec 2022 11:31:29 +0000
Subject: [PATCH] server/control_session_http: update for boost 1.81.0
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
--- a/server/control_session_http.cpp
+++ b/server/control_session_http.cpp
@@ -127,8 +127,8 @@ boost::beast::string_view mime_type(boost::beast::string_view path)
std::string path_cat(boost::beast::string_view base, boost::beast::string_view path)
{
if (base.empty())
- return path.to_string();
- std::string result = base.to_string();
+ return static_cast<std::string>(path);
+ std::string result = static_cast<std::string>(base);
char constexpr path_separator = '/';
if (result.back() == path_separator)
result.resize(result.size() - 1);
@@ -171,7 +171,7 @@ void ControlSessionHttp::handle_request(http::request<Body, http::basic_fields<A
res.set(http::field::server, HTTP_SERVER_NAME);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
- res.body() = why.to_string();
+ res.body() = static_cast<std::string>(why);
res.prepare_payload();
return res;
};
@@ -182,7 +182,7 @@ void ControlSessionHttp::handle_request(http::request<Body, http::basic_fields<A
res.set(http::field::server, HTTP_SERVER_NAME);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
- res.body() = "The resource '" + target.to_string() + "' was not found.";
+ res.body() = "The resource '" + static_cast<std::string>(target) + "' was not found.";
res.prepare_payload();
return res;
};
@@ -204,7 +204,7 @@ void ControlSessionHttp::handle_request(http::request<Body, http::basic_fields<A
res.set(http::field::server, HTTP_SERVER_NAME);
res.set(http::field::content_type, "text/html");
res.keep_alive(req.keep_alive());
- res.body() = "An error occurred: '" + what.to_string() + "'";
+ res.body() = "An error occurred: '" + static_cast<std::string>(what) + "'";
res.prepare_payload();
return res;
};
|
