lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-30 15:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4857 from liushuyu/master

Browse source 
web_service: follow-up fix to #4842
This commit is contained in:
LC 2020-10-29 01:54:45 -04:00 committed by GitHub
parent c5134cbf3a cf63eacc1a
commit 1a6b1bf1d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 444 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
externals/httplib/README.md vendored
View file

@ -1,4 +1,4 @@
From https://github.com/yhirose/cpp-httplib/tree/fce8e6fefdab4ad48bc5b25c98e5ebfda4f3cf53
From https://github.com/yhirose/cpp-httplib/tree/ff5677ad197947177c158fe857caff4f0e242045 with https://github.com/yhirose/cpp-httplib/pull/701
MIT License

657
externals/httplib/httplib.h vendored
View file

File diff suppressed because it is too large Load diff

5
src/web_service/web_backend.cpp
View file

@ -71,11 +71,6 @@ struct Client::Impl {
return {};
}
if (!cli->is_socket_open()) {
LOG_ERROR(WebService, "Failed to open socket, skipping request!");
return {};
}
cli->set_connection_timeout(TIMEOUT_SECONDS);
cli->set_read_timeout(TIMEOUT_SECONDS);
cli->set_write_timeout(TIMEOUT_SECONDS);