13 files changed, 63 insertions, 437 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index e01ff6930..421b35890 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -73,17 +73,20 @@ if (NOT LIBZIP_FOUND)
 endif()
 if (ENABLE_WEB_SERVICE)
-    # LibreSSL
+    find_package(OpenSSL 1.1)
-    set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
+    if (OPENSSL_FOUND)
-    add_subdirectory(libressl EXCLUDE_FROM_ALL)
+        set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-    target_include_directories(ssl INTERFACE ./libressl/include)
+    else()
-    target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
+        # LibreSSL
-    get_directory_property(OPENSSL_LIBRARIES
+        set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
-        DIRECTORY libressl
+        set(OPENSSLDIR "/etc/ssl/")
-        DEFINITION OPENSSL_LIBS)
+        add_subdirectory(libressl EXCLUDE_FROM_ALL)
+        target_include_directories(ssl INTERFACE ./libressl/include)
-    # lurlparser
+        target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
-    add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
+        get_directory_property(OPENSSL_LIBRARIES
+            DIRECTORY libressl
+            DEFINITION OPENSSL_LIBS)
+    endif()
    # httplib
    add_library(httplib INTERFACE)
diff --git a/externals/libressl b/externals/libressl
-Subproject 7d01cb01cb1a926ecb4c9c98b107ef3c26f59df
+Subproject 8289d0d07de6553bf4b900bf60e808ea3f7f59d
diff --git a/externals/lurlparser/CMakeLists.txt b/externals/lurlparser/CMakeLists.txt
deleted file mode 100644
index 45046ffd3..000000000
--- a/externals/lurlparser/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_library(lurlparser
-        LUrlParser.cpp
-        LUrlParser.h
-)
-create_target_directory_groups(lurlparser)
-target_include_directories(lurlparser INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/externals/lurlparser/LUrlParser.cpp b/externals/lurlparser/LUrlParser.cpp
deleted file mode 100644
index 9c134e330..000000000
--- a/externals/lurlparser/LUrlParser.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- *
- * The MIT License (MIT)
- *
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include "LUrlParser.h"
-#include <algorithm>
-#include <cstring>
-#include <stdlib.h>
-// check if the scheme name is valid
-static bool IsSchemeValid( const std::string& SchemeName )
-{
-    for ( auto c : SchemeName  )
-    {
-        if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
-    }
-    return true;
-}
-bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
-{
-    if ( !IsValid() ) { return false; }
-    int Port = atoi( m_Port.c_str() );
-    if ( Port <= 0 || Port > 65535 ) { return false; }
-    if ( OutPort ) { *OutPort = Port; }
-    return true;
-}
-// based on RFC 1738 and RFC 3986
-LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
-{
-    LUrlParser::clParseURL Result;
-    const char* CurrentString = URL.c_str();
-    /*
-     *  <scheme>:<scheme-specific-part>
-     *  <scheme> := [a-z\+\-\.]+
-     *  For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
-     */
-    // try to read scheme
-    {
-        const char* LocalString = strchr( CurrentString, ':' );
-        if ( !LocalString )
-        {
-            return clParseURL( LUrlParserError_NoUrlCharacter );
-        }
-        // save the scheme name
-        Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
-        if ( !IsSchemeValid( Result.m_Scheme ) )
-        {
-            return clParseURL( LUrlParserError_InvalidSchemeName );
-        }
-        // scheme should be lowercase
-        std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
-        // skip ':'
-        CurrentString = LocalString+1;
-    }
-    /*
-     *  //<user>:<password>@<host>:<port>/<url-path>
-     *  any ":", "@" and "/" must be normalized
-     */
-    // skip "//"
-    if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-    if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-    // check if the user name and password are specified
-    bool bHasUserName = false;
-    const char* LocalString = CurrentString;
-    while ( *LocalString )
-    {
-        if ( *LocalString == '@' )
-        {
-            // user name and password are specified
-            bHasUserName = true;
-            break;
-        }
-        else if ( *LocalString == '/' )
-        {
-            // end of <host>:<port> specification
-            bHasUserName = false;
-            break;
-        }
-        LocalString++;
-    }
-    // user name and password
-    LocalString = CurrentString;
-    if ( bHasUserName )
-    {
-        // read user name
-        while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
-        Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
-        // proceed with the current pointer
-        CurrentString = LocalString;
-        if ( *CurrentString == ':' )
-        {
-            // skip ':'
-            CurrentString++;
-            // read password
-            LocalString = CurrentString;
-            while ( *LocalString && *LocalString != '@' ) LocalString++;
-            Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
-            CurrentString = LocalString;
-        }
-        // skip '@'
-        if ( *CurrentString != '@' )
-        {
-            return clParseURL( LUrlParserError_NoAtSign );
-        }
-        CurrentString++;
-    }
-    bool bHasBracket = ( *CurrentString == '[' );
-    // go ahead, read the host name
-    LocalString = CurrentString;
-    while ( *LocalString )
-    {
-        if ( bHasBracket && *LocalString == ']' )
-        {
-            // end of IPv6 address
-            LocalString++;
-            break;
-        }
-        else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
-        {
-            // port number is specified
-            break;
-        }
-        LocalString++;
-    }
-    Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
-    CurrentString = LocalString;
-    // is port number specified?
-    if ( *CurrentString == ':' )
-    {
-        CurrentString++;
-        // read port number
-        LocalString = CurrentString;
-        while ( *LocalString && *LocalString != '/' ) LocalString++;
-        Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
-        CurrentString = LocalString;
-    }
-    // end of string
-    if ( !*CurrentString )
-    {
-        Result.m_ErrorCode = LUrlParserError_Ok;
-        return Result;
-    }
-    // skip '/'
-    if ( *CurrentString != '/' )
-    {
-        return clParseURL( LUrlParserError_NoSlash );
-    }
-    CurrentString++;
-    // parse the path
-    LocalString = CurrentString;
-    while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
-    Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
-    CurrentString = LocalString;
-    // check for query
-    if ( *CurrentString == '?' )
-    {
-        // skip '?'
-        CurrentString++;
-        // read query
-        LocalString = CurrentString;
-        while ( *LocalString && *LocalString != '#' ) LocalString++;
-        Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
-        CurrentString = LocalString;
-    }
-    // check for fragment
-    if ( *CurrentString == '#' )
-    {
-        // skip '#'
-        CurrentString++;
-        // read fragment
-        LocalString = CurrentString;
-        while ( *LocalString ) LocalString++;
-        Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
-        CurrentString = LocalString;
-    }
-    Result.m_ErrorCode = LUrlParserError_Ok;
-    return Result;
-}
diff --git a/externals/lurlparser/LUrlParser.h b/externals/lurlparser/LUrlParser.h
deleted file mode 100644
index 25d210981..000000000
--- a/externals/lurlparser/LUrlParser.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- *
- * The MIT License (MIT)
- *
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#pragma once
-#include <string>
-namespace LUrlParser
-{
-enum LUrlParserError
-{
-    LUrlParserError_Ok = 0,
-    LUrlParserError_Uninitialized = 1,
-    LUrlParserError_NoUrlCharacter = 2,
-    LUrlParserError_InvalidSchemeName = 3,
-    LUrlParserError_NoDoubleSlash = 4,
-    LUrlParserError_NoAtSign = 5,
-    LUrlParserError_UnexpectedEndOfLine = 6,
-    LUrlParserError_NoSlash = 7,
-};
-class clParseURL
-{
-public:
-    LUrlParserError m_ErrorCode;
-    std::string m_Scheme;
-    std::string m_Host;
-    std::string m_Port;
-    std::string m_Path;
-    std::string m_Query;
-    std::string m_Fragment;
-    std::string m_UserName;
-    std::string m_Password;
-    clParseURL()
-            : m_ErrorCode( LUrlParserError_Uninitialized )
-    {}
-    /// return 'true' if the parsing was successful
-    bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
-    /// helper to convert the port number to int, return 'true' if the port is valid (within the 0..65535 range)
-    bool GetPort( int* OutPort ) const;
-    /// parse the URL
-    static clParseURL ParseURL( const std::string& URL );
-private:
-    explicit clParseURL( LUrlParserError ErrorCode )
-            : m_ErrorCode( ErrorCode )
-    {}
-};
-} // namespace LUrlParser
diff --git a/externals/lurlparser/README.md b/externals/lurlparser/README.md
deleted file mode 100644
index be7f0135a..000000000
--- a/externals/lurlparser/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-From https://github.com/corporateshark/LUrlParser/commit/455d5e2d27e3946f11ad0328fee9ee2628e6a8e2
-MIT License
-===
-Lightweight URL & URI parser (RFC 1738, RFC 3986)
-(C) Sergey Kosarevsky, 2015
-@corporateshark sk@linderdaum.com
-http://www.linderdaum.com
-http://blog.linderdaum.com
-=============================
-A tiny and lightweight URL & URI parser (RFC 1738, RFC 3986) written in C++.
diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp
index 4fd92428f..4757dd2b4 100644
--- a/src/tests/common/fibers.cpp
+++ b/src/tests/common/fibers.cpp
@@ -6,18 +6,40 @@
 #include <cstdlib>
 #include <functional>
 #include <memory>
+#include <mutex>
+#include <stdexcept>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 #include <catch2/catch.hpp>
-#include <math.h>
 #include "common/common_types.h"
 #include "common/fiber.h"
-#include "common/spin_lock.h"
 namespace Common {
+class ThreadIds {
+public:
+    void Register(u32 id) {
+        const auto thread_id = std::this_thread::get_id();
+        std::scoped_lock lock{mutex};
+        if (ids.contains(thread_id)) {
+            throw std::logic_error{"Registering the same thread twice"};
+        }
+        ids.emplace(thread_id, id);
+    }
+    [[nodiscard]] u32 Get() const {
+        std::scoped_lock lock{mutex};
+        return ids.at(std::this_thread::get_id());
+    }
+private:
+    mutable std::mutex mutex;
+    std::unordered_map<std::thread::id, u32> ids;
+};
 class TestControl1 {
 public:
    TestControl1() = default;
@@ -26,7 +48,7 @@ public:
    void ExecuteThread(u32 id);
-    std::unordered_map<std::thread::id, u32> ids;
+    ThreadIds thread_ids;
    std::vector<std::shared_ptr<Common::Fiber>> thread_fibers;
    std::vector<std::shared_ptr<Common::Fiber>> work_fibers;
    std::vector<u32> items;
@@ -39,8 +61,7 @@ static void WorkControl1(void* control) {
 }
 void TestControl1::DoWork() {
-    std::thread::id this_id = std::this_thread::get_id();
+    const u32 id = thread_ids.Get();
-    u32 id = ids[this_id];
    u32 value = items[id];
    for (u32 i = 0; i < id; i++) {
        value++;
@@ -50,8 +71,7 @@ void TestControl1::DoWork() {
 }
 void TestControl1::ExecuteThread(u32 id) {
-    std::thread::id this_id = std::this_thread::get_id();
+    thread_ids.Register(id);
-    ids[this_id] = id;
    auto thread_fiber = Fiber::ThreadToFiber();
    thread_fibers[id] = thread_fiber;
    work_fibers[id] = std::make_shared<Fiber>(std::function<void(void*)>{WorkControl1}, this);
@@ -98,8 +118,7 @@ public:
            value1 += i;
        }
        Fiber::YieldTo(fiber1, fiber3);
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        assert1 = id == 1;
        value2 += 5000;
        Fiber::YieldTo(fiber1, thread_fibers[id]);
@@ -115,8 +134,7 @@ public:
    }
    void DoWork3() {
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        assert2 = id == 0;
        value1 += 1000;
        Fiber::YieldTo(fiber3, thread_fibers[id]);
@@ -125,14 +143,12 @@ public:
    void ExecuteThread(u32 id);
    void CallFiber1() {
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        Fiber::YieldTo(thread_fibers[id], fiber1);
    }
    void CallFiber2() {
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        Fiber::YieldTo(thread_fibers[id], fiber2);
    }
@@ -145,7 +161,7 @@ public:
    u32 value2{};
    std::atomic<bool> trap{true};
    std::atomic<bool> trap2{true};
-    std::unordered_map<std::thread::id, u32> ids;
+    ThreadIds thread_ids;
    std::vector<std::shared_ptr<Common::Fiber>> thread_fibers;
    std::shared_ptr<Common::Fiber> fiber1;
    std::shared_ptr<Common::Fiber> fiber2;
@@ -168,15 +184,13 @@ static void WorkControl2_3(void* control) {
 }
 void TestControl2::ExecuteThread(u32 id) {
-    std::thread::id this_id = std::this_thread::get_id();
+    thread_ids.Register(id);
-    ids[this_id] = id;
    auto thread_fiber = Fiber::ThreadToFiber();
    thread_fibers[id] = thread_fiber;
 }
 void TestControl2::Exit() {
-    std::thread::id this_id = std::this_thread::get_id();
+    const u32 id = thread_ids.Get();
-    u32 id = ids[this_id];
    thread_fibers[id]->Exit();
 }
@@ -228,24 +242,21 @@ public:
    void DoWork1() {
        value1 += 1;
        Fiber::YieldTo(fiber1, fiber2);
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        value3 += 1;
        Fiber::YieldTo(fiber1, thread_fibers[id]);
    }
    void DoWork2() {
        value2 += 1;
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        Fiber::YieldTo(fiber2, thread_fibers[id]);
    }
    void ExecuteThread(u32 id);
    void CallFiber1() {
-        std::thread::id this_id = std::this_thread::get_id();
+        const u32 id = thread_ids.Get();
-        u32 id = ids[this_id];
        Fiber::YieldTo(thread_fibers[id], fiber1);
    }
@@ -254,7 +265,7 @@ public:
    u32 value1{};
    u32 value2{};
    u32 value3{};
-    std::unordered_map<std::thread::id, u32> ids;
+    ThreadIds thread_ids;
    std::vector<std::shared_ptr<Common::Fiber>> thread_fibers;
    std::shared_ptr<Common::Fiber> fiber1;
    std::shared_ptr<Common::Fiber> fiber2;
@@ -271,15 +282,13 @@ static void WorkControl3_2(void* control) {
 }
 void TestControl3::ExecuteThread(u32 id) {
-    std::thread::id this_id = std::this_thread::get_id();
+    thread_ids.Register(id);
-    ids[this_id] = id;
    auto thread_fiber = Fiber::ThreadToFiber();
    thread_fibers[id] = thread_fiber;
 }
 void TestControl3::Exit() {
-    std::thread::id this_id = std::this_thread::get_id();
+    const u32 id = thread_ids.Get();
-    u32 id = ids[this_id];
    thread_fibers[id]->Exit();
 }
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index fdfc885fc..abcee2a1c 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -302,7 +302,10 @@ else()
    target_compile_options(video_core PRIVATE
        -Werror=conversion
        -Wno-error=sign-conversion
+        -Werror=pessimizing-move
+        -Werror=redundant-move
        -Werror=switch
+        -Werror=type-limits
        -Werror=unused-variable
        $<$<CXX_COMPILER_ID:GNU>:-Werror=class-memaccess>
diff --git a/src/video_core/command_classes/codecs/vp9.cpp b/src/video_core/command_classes/codecs/vp9.cpp
index 3bae0bb5d..d205a8f5d 100644
--- a/src/video_core/command_classes/codecs/vp9.cpp
+++ b/src/video_core/command_classes/codecs/vp9.cpp
@@ -366,7 +366,7 @@ Vp9PictureInfo VP9::GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state)
    // to avoid buffering frame data needed for reference frame updating in the header composition.
    std::memcpy(vp9_info.frame_offsets.data(), state.surface_luma_offset.data(), 4 * sizeof(u64));
-    return std::move(vp9_info);
+    return vp9_info;
 }
 void VP9::InsertEntropy(u64 offset, Vp9EntropyProbs& dst) {
@@ -893,7 +893,7 @@ void VpxRangeEncoder::Write(bool bit, s32 probability) {
        if (((low_value << (offset - 1)) >> 31) != 0) {
            const s32 current_pos = static_cast<s32>(base_stream.GetPosition());
            base_stream.Seek(-1, Common::SeekOrigin::FromCurrentPos);
-            while (base_stream.GetPosition() >= 0 && PeekByte() == 0xff) {
+            while (PeekByte() == 0xff) {
                base_stream.WriteByte(0);
                base_stream.Seek(-2, Common::SeekOrigin::FromCurrentPos);
diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
index 166ee34e1..70dd0c3c6 100644
--- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
@@ -317,8 +317,7 @@ std::optional<std::vector<ShaderDiskCachePrecompiled>> ShaderDiskCacheOpenGL::Lo
            return std::nullopt;
        }
    }
+    return entries;
-    return std::move(entries);
 }
 void ShaderDiskCacheOpenGL::InvalidateTransferable() {
diff --git a/src/video_core/renderer_vulkan/wrapper.cpp b/src/video_core/renderer_vulkan/wrapper.cpp
index c034558a3..4e83303d8 100644
--- a/src/video_core/renderer_vulkan/wrapper.cpp
+++ b/src/video_core/renderer_vulkan/wrapper.cpp
@@ -844,7 +844,7 @@ std::optional<std::vector<VkExtensionProperties>> EnumerateInstanceExtensionProp
        VK_SUCCESS) {
        return std::nullopt;
    }
-    return std::move(properties);
+    return properties;
 }
 std::optional<std::vector<VkLayerProperties>> EnumerateInstanceLayerProperties(
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index 7e484b906..ae85a72ea 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -9,4 +9,4 @@ add_library(web_service STATIC
 )
 create_target_directory_groups(web_service)
-target_link_libraries(web_service PRIVATE common nlohmann_json::nlohmann_json httplib lurlparser)
+target_link_libraries(web_service PRIVATE common nlohmann_json::nlohmann_json httplib)
diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp
index 534960d09..c56cd7c71 100644
--- a/src/web_service/web_backend.cpp
+++ b/src/web_service/web_backend.cpp
@@ -7,7 +7,6 @@
 #include <mutex>
 #include <string>
-#include <LUrlParser.h>
 #include <fmt/format.h>
 #include <httplib.h>
@@ -19,9 +18,6 @@ namespace WebService {
 constexpr std::array<const char, 1> API_VERSION{'1'};
-constexpr int HTTP_PORT = 80;
-constexpr int HTTPS_PORT = 443;
 constexpr std::size_t TIMEOUT_SECONDS = 30;
 struct Client::Impl {
@@ -67,21 +63,7 @@ struct Client::Impl {
                             const std::string& jwt = "", const std::string& username = "",
                             const std::string& token = "") {
        if (cli == nullptr) {
-            const auto parsedUrl = LUrlParser::clParseURL::ParseURL(host);
+            cli = std::make_unique<httplib::Client>(host.c_str());
-            int port{};
-            if (parsedUrl.m_Scheme == "http") {
-                if (!parsedUrl.GetPort(&port)) {
-                    port = HTTP_PORT;
-                }
-            } else if (parsedUrl.m_Scheme == "https") {
-                if (!parsedUrl.GetPort(&port)) {
-                    port = HTTPS_PORT;
-                }
-            } else {
-                LOG_ERROR(WebService, "Bad URL scheme {}", parsedUrl.m_Scheme);
-                return WebResult{WebResult::Code::InvalidURL, "Bad URL scheme", ""};
-            }
-            cli = std::make_unique<httplib::Client>(parsedUrl.m_Host.c_str(), port);
        }
        cli->set_connection_timeout(TIMEOUT_SECONDS);
        cli->set_read_timeout(TIMEOUT_SECONDS);