CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

externals: httplib: replace custom httplib header with upstream as submodule. 

This also includes a minor change to web_service.cpp - to fix compatibility with upstream changes.
merge-requests/60/head
Vortex 2021-06-19 00:18:53 +07:00
parent 3870ba670f
commit e704da9192
6 changed files with 7 additions and 6731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
Unescape Escape View File

@ -43,3 +43,6 @@
[submodule "SDL"] [submodule "SDL"]
path = externals/SDL path = externals/SDL
url = https://github.com/libsdl-org/SDL.git url = https://github.com/libsdl-org/SDL.git
[submodule "externals/cpp-httplib"]
path = externals/cpp-httplib
url = https://github.com/yhirose/cpp-httplib.git

2
externals/CMakeLists.txt vendored
Unescape Escape View File

@ -115,7 +115,7 @@ if (ENABLE_WEB_SERVICE)
# httplib # httplib
add_library(httplib INTERFACE) add_library(httplib INTERFACE)
target_include_directories(httplib INTERFACE ./httplib) target_include_directories(httplib INTERFACE ./cpp-httplib)
target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES}) target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
if (WIN32) if (WIN32)

1
externals/cpp-httplib vendored

@ -0,0 +1 @@
Subproject commit 9648f950f5a8a41d18833cf4a85f5821b1bcac54

15
externals/httplib/README.md vendored
Unescape Escape View File

@ -1,15 +0,0 @@
From https://github.com/yhirose/cpp-httplib/tree/ff5677ad197947177c158fe857caff4f0e242045 with https://github.com/yhirose/cpp-httplib/pull/701
MIT License
===
cpp-httplib
A C++11 header-only HTTP library.
It's extremely easy to setup. Just include httplib.h file in your code!
Inspired by Sinatra and express.
© 2017 Yuji Hirose

6714
externals/httplib/httplib.h vendored
View File

File diff suppressed because it is too large Load Diff

3
src/web_service/web_backend.cpp
Unescape Escape View File

@ -100,8 +100,9 @@ struct Client::Impl {
request.body = data; request.body = data;
httplib::Response response; httplib::Response response;
httplib::Error error;
if (!cli->send(request, response)) { if (!cli->send(request, response, error)) {
LOG_ERROR(WebService, "{} to {} returned null", method, host + path); LOG_ERROR(WebService, "{} to {} returned null", method, host + path);
return WebResult{WebResult::Code::LibError, "Null response", ""}; return WebResult{WebResult::Code::LibError, "Null response", ""};
} }