fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

RequestServer: Stop using LibHTTP

Browse Source
This commit is contained in:
Andreas Kling
2024-09-06 07:36:17 +02:00
committed by Andreas Kling
parent 6d91c42214
commit c2590afcf9
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Ladybird/RequestServer/CMakeLists.txt
View File

@@ -6,13 +6,6 @@ set(CMAKE_AUTOUIC OFF)
set(REQUESTSERVER_SOURCES set(REQUESTSERVER_SOURCES
${REQUESTSERVER_SOURCE_DIR}/ConnectionFromClient.cpp ${REQUESTSERVER_SOURCE_DIR}/ConnectionFromClient.cpp
${REQUESTSERVER_SOURCE_DIR}/ConnectionCache.cpp
${REQUESTSERVER_SOURCE_DIR}/Request.cpp
${REQUESTSERVER_SOURCE_DIR}/HttpRequest.cpp
${REQUESTSERVER_SOURCE_DIR}/HttpProtocol.cpp
${REQUESTSERVER_SOURCE_DIR}/HttpsRequest.cpp
${REQUESTSERVER_SOURCE_DIR}/HttpsProtocol.cpp
${REQUESTSERVER_SOURCE_DIR}/Protocol.cpp
) )
if (ANDROID) if (ANDROID)
@@ -34,7 +27,7 @@ target_link_libraries(RequestServer PRIVATE requestserver)
target_include_directories(requestserver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/) target_include_directories(requestserver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/)
target_include_directories(requestserver PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) target_include_directories(requestserver PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..)
target_link_libraries(requestserver PUBLIC LibCore LibMain LibCrypto LibFileSystem LibHTTP LibIPC LibMain LibTLS LibWebView LibWebSocket LibURL LibThreading CURL::libcurl) target_link_libraries(requestserver PUBLIC LibCore LibMain LibCrypto LibFileSystem LibIPC LibMain LibTLS LibWebView LibWebSocket LibURL LibThreading CURL::libcurl)
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
# Solaris has socket and networking related functions in two extra libraries # Solaris has socket and networking related functions in two extra libraries
target_link_libraries(requestserver PUBLIC nsl socket) target_link_libraries(requestserver PUBLIC nsl socket)

5
Ladybird/RequestServer/main.cpp
View File

@@ -17,8 +17,6 @@
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <LibTLS/Certificate.h> #include <LibTLS/Certificate.h>
#include <RequestServer/ConnectionFromClient.h> #include <RequestServer/ConnectionFromClient.h>
#include <RequestServer/HttpProtocol.h>
#include <RequestServer/HttpsProtocol.h>
#if defined(AK_OS_MACOS) #if defined(AK_OS_MACOS)
# include <LibCore/Platform/ProcessStatisticsMach.h> # include <LibCore/Platform/ProcessStatisticsMach.h>
@@ -71,9 +69,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Core::Platform::register_with_mach_server(mach_server_name); Core::Platform::register_with_mach_server(mach_server_name);
#endif #endif
RequestServer::HttpProtocol::install();
RequestServer::HttpsProtocol::install();
auto client = TRY(IPC::take_over_accepted_client_from_system_server<RequestServer::ConnectionFromClient>()); auto client = TRY(IPC::take_over_accepted_client_from_system_server<RequestServer::ConnectionFromClient>());
return event_loop.exec(); return event_loop.exec();