From c2590afcf9ae4aa421e4c7a4e98a1ac3fed910a7 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 6 Sep 2024 07:36:17 +0200 Subject: [PATCH] RequestServer: Stop using LibHTTP --- Ladybird/RequestServer/CMakeLists.txt | 9 +-------- Ladybird/RequestServer/main.cpp | 5 ----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Ladybird/RequestServer/CMakeLists.txt b/Ladybird/RequestServer/CMakeLists.txt index da945a54d84..b6b3b3787da 100644 --- a/Ladybird/RequestServer/CMakeLists.txt +++ b/Ladybird/RequestServer/CMakeLists.txt @@ -6,13 +6,6 @@ set(CMAKE_AUTOUIC OFF) set(REQUESTSERVER_SOURCES ${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) @@ -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 ${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") # Solaris has socket and networking related functions in two extra libraries target_link_libraries(requestserver PUBLIC nsl socket) diff --git a/Ladybird/RequestServer/main.cpp b/Ladybird/RequestServer/main.cpp index 0509619e65e..0a00fc075f4 100644 --- a/Ladybird/RequestServer/main.cpp +++ b/Ladybird/RequestServer/main.cpp @@ -17,8 +17,6 @@ #include #include #include -#include -#include #if defined(AK_OS_MACOS) # include @@ -71,9 +69,6 @@ ErrorOr serenity_main(Main::Arguments arguments) Core::Platform::register_with_mach_server(mach_server_name); #endif - RequestServer::HttpProtocol::install(); - RequestServer::HttpsProtocol::install(); - auto client = TRY(IPC::take_over_accepted_client_from_system_server()); return event_loop.exec();