BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-01 15:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

update submodules, remove ssl crap

Browse Source
This commit is contained in:
Lion Kortlepel 2022-05-26 11:59:36 +02:00
parent 4f69ca1ad0
commit a0876ed58c
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
10 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -35,7 +35,7 @@ include_directories("${PROJECT_SOURCE_DIR}/deps/cpp-httplib")
include_directories("${PROJECT_SOURCE_DIR}/deps/json/single_include")
include_directories("${PROJECT_SOURCE_DIR}/deps")
add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)
add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
# ------------------------ APPLE ---------------------------------
if(APPLE)

2
deps/cpp-httplib vendored

@ -1 +1 @@
Subproject commit b324921c1aeff2976544128e4bb2a0979a4aa595
Subproject commit 47044c05a8587dff86ab90526daabfef61079490

2
deps/fmt vendored

@ -1 +1 @@
Subproject commit 17dda58391fba627a56482f5d2652a396619bc26
Subproject commit ce246aaf74cb7616777497da988804fa4c02bf2d

2
deps/json vendored

@ -1 +1 @@
Subproject commit eb2182414749825be086c825edb5229e5c28503d
Subproject commit 31e25839b6576d31bc32d5b7d08ba8a32b38f4c2

2
deps/sentry-native vendored

@ -1 +1 @@
Subproject commit 90966cc1022b8155681b6899539b35466baccf2c
Subproject commit 0a498e3e40d37180464c8fd17058e7330c72eb7a

2
deps/sol2 vendored

@ -1 +1 @@
Subproject commit c068aefbeddb3dd1f1fd38d42843ecb49a3b4cdb
Subproject commit d0eba0a7544b0b62e37f08972c0f431f3c0e96b4

2
deps/toml11 vendored

@ -1 +1 @@
Subproject commit fda0a2b9abd16e356f777c40a675131821c71b00
Subproject commit e8f922a1b874b110781dfb3d23d03d41ddb6666b

2
include/Http.h
View File

@ -29,8 +29,6 @@ namespace Server {
class THttpServerInstance {
public:
THttpServerInstance();
static fs::path KeyFilePath;
static fs::path CertFilePath;
protected:
void operator()();

8
src/Http.cpp
View File

@ -151,13 +151,7 @@ Http::Server::THttpServerInstance::THttpServerInstance() {
void Http::Server::THttpServerInstance::operator()() try {
beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
std::unique_ptr<httplib::Server> HttpLibServerInstance;
if (Application::Settings.HTTPServerUseSSL) {
HttpLibServerInstance = std::make_unique<httplib::SSLServer>(
reinterpret_cast<const char*>(Http::Server::THttpServerInstance::CertFilePath.c_str()),
reinterpret_cast<const char*>(Http::Server::THttpServerInstance::KeyFilePath.c_str()));
} else {
HttpLibServerInstance = std::make_unique<httplib::Server>();
}
HttpLibServerInstance = std::make_unique<httplib::Server>();
// todo: make this IP agnostic so people can set their own IP
HttpLibServerInstance->Get("/", [](const httplib::Request&, httplib::Response& res) {
res.set_content("<!DOCTYPE html><article><h1>Hello World!</h1><section><p>BeamMP Server can now serve HTTP requests!</p></section></article></html>", "text/html");

2
src/main.cpp
View File

@ -17,7 +17,7 @@
#include <iostream>
#include <thread>
#define CPPHTTPLIB_OPENSSL_SUPPORT 1
static const std::string sCommandlineArguments = R"(
USAGE:
BeamMP-Server [arguments]