mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
commit
44ac40421b
@ -0,0 +1,48 @@
|
|||||||
|
commit 438b83b0b93f2914b1830347b4e24722618d9ba4
|
||||||
|
Author: Rudi Heitbaum <rudi@heitbaum.com>
|
||||||
|
Date: Wed Dec 21 11:31:29 2022 +0000
|
||||||
|
|
||||||
|
server/control_session_http: update for boost 1.81.0
|
||||||
|
|
||||||
|
diff --git a/server/control_session_http.cpp b/server/control_session_http.cpp
|
||||||
|
index 385b3197..6522f5a9 100644
|
||||||
|
--- 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;
|
||||||
|
};
|
32
packages/addons/service/mpd/patches/mpd-1682.patch
Normal file
32
packages/addons/service/mpd/patches/mpd-1682.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From e4b055eb6d08c5c8f8d85828ce4005d410e462cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
||||||
|
<congdanhqx@gmail.com>
|
||||||
|
Date: Thu, 1 Dec 2022 08:29:23 +0700
|
||||||
|
Subject: [PATCH] v0.23.x: RemoteTagCache: add missing include
|
||||||
|
|
||||||
|
Fix build with Boost 1.81.0. `<array>` was included by one of those boost headers,
|
||||||
|
however, it's no longer included as of Boost 1.81.0.
|
||||||
|
|
||||||
|
`master` doesn't use `std::array` in this file.
|
||||||
|
|
||||||
|
While we're at it, add all necessary inclusion files.
|
||||||
|
---
|
||||||
|
src/RemoteTagCache.hxx | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/RemoteTagCache.hxx b/src/RemoteTagCache.hxx
|
||||||
|
index ed87f9706f..e8b198a219 100644
|
||||||
|
--- a/src/RemoteTagCache.hxx
|
||||||
|
+++ b/src/RemoteTagCache.hxx
|
||||||
|
@@ -28,7 +28,11 @@
|
||||||
|
#include <boost/intrusive/list.hpp>
|
||||||
|
#include <boost/intrusive/unordered_set.hpp>
|
||||||
|
|
||||||
|
+#include <array>
|
||||||
|
+#include <functional>
|
||||||
|
+#include <memory>
|
||||||
|
#include <string>
|
||||||
|
+#include <utility>
|
||||||
|
|
||||||
|
class RemoteTagCacheHandler;
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user