mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-08 09:09:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

RequestServer: Remove serenity_resource_root argument from main

Browse source 
We don't need it now that we're not trying to load the cacert.pem file.
Clean up includes while we're here.
This commit is contained in:
Andrew Kaster 2025-07-06 10:10:24 -06:00 • committed by Jelle Raaijmakers
commit 1a6b4aaa49
Notes: github-actions[bot] 2025-07-07 07:11:26 +00:00
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibWebView/HelperProcess.cpp
View file

@ -203,11 +203,6 @@ ErrorOr<NonnullRefPtr<Requests::RequestClient>> launch_request_server_process()
{ {
Vector<ByteString> arguments; Vector<ByteString> arguments;
if (!s_ladybird_resource_root.is_empty()) {
arguments.append("--serenity-resource-root"sv);
arguments.append(s_ladybird_resource_root);
}
for (auto const& certificate : WebView::Application::browser_options().certificates) for (auto const& certificate : WebView::Application::browser_options().certificates)
arguments.append(ByteString::formatted("--certificate={}", certificate)); arguments.append(ByteString::formatted("--certificate={}", certificate));

12
Services/RequestServer/main.cpp
View file

@ -5,17 +5,15 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/LexicalPath.h> #include <AK/ByteString.h>
#include <AK/OwnPtr.h> #include <AK/Format.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/Process.h> #include <LibCore/Process.h>
#include <LibCore/System.h>
#include <LibFileSystem/FileSystem.h>
#include <LibIPC/SingleServer.h> #include <LibIPC/SingleServer.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <LibTLS/TLSv12.h>
#include <RequestServer/ConnectionFromClient.h> #include <RequestServer/ConnectionFromClient.h>
#if defined(AK_OS_MACOS) #if defined(AK_OS_MACOS)
@ -32,14 +30,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
AK::set_rich_debug_enabled(true); AK::set_rich_debug_enabled(true);
StringView serenity_resource_root;
Vector<ByteString> certificates; Vector<ByteString> certificates;
StringView mach_server_name; StringView mach_server_name;
bool wait_for_debugger = false; bool wait_for_debugger = false;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(certificates, "Path to a certificate file", "certificate", 'C', "certificate"); args_parser.add_option(certificates, "Path to a certificate file", "certificate", 'C', "certificate");
args_parser.add_option(serenity_resource_root, "Absolute path to directory for serenity resources", "serenity-resource-root", 'r', "serenity-resource-root");
args_parser.add_option(mach_server_name, "Mach server name", "mach-server-name", 0, "mach_server_name"); args_parser.add_option(mach_server_name, "Mach server name", "mach-server-name", 0, "mach_server_name");
args_parser.add_option(wait_for_debugger, "Wait for debugger", "wait-for-debugger"); args_parser.add_option(wait_for_debugger, "Wait for debugger", "wait-for-debugger");
args_parser.parse(arguments); args_parser.parse(arguments);