citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #3834 from j-selby/fix-cpp-httplib 

Update cpp-httplib for gzip + chunked encoding fixes
This commit is contained in:
James Rowe 2018-06-26 09:57:08 -06:00 committed by GitHub
parent 26254072e7 cdebde8fb1
commit 5e641d16d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 533 additions and 232 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/commit/25aa0b34c3c43ad51fc60c09e2e420c4ebda75cd From https://github.com/yhirose/cpp-httplib/commit/d9479bc0b12e8a1e8bce2d34da4feeef488581f3
MIT License MIT License

715
externals/httplib/httplib.h vendored
View File

File diff suppressed because it is too large Load Diff

6
src/web_service/web_backend.cpp
View File

@ -31,14 +31,12 @@ std::unique_ptr<httplib::Client> GetClientFor(const LUrlParser::clParseURL& pars
if (!parsedUrl.GetPort(&port)) { if (!parsedUrl.GetPort(&port)) {
port = HTTP_PORT; port = HTTP_PORT;
} }
return std::make_unique<hl::Client>(parsedUrl.m_Host.c_str(), port, TIMEOUT_SECONDS, return std::make_unique<hl::Client>(parsedUrl.m_Host.c_str(), port, TIMEOUT_SECONDS);
hl::HttpVersion::v1_1);
} else if (parsedUrl.m_Scheme == "https") { } else if (parsedUrl.m_Scheme == "https") {
if (!parsedUrl.GetPort(&port)) { if (!parsedUrl.GetPort(&port)) {
port = HTTPS_PORT; port = HTTPS_PORT;
} }
return std::make_unique<hl::SSLClient>(parsedUrl.m_Host.c_str(), port, TIMEOUT_SECONDS, return std::make_unique<hl::SSLClient>(parsedUrl.m_Host.c_str(), port, TIMEOUT_SECONDS);
hl::HttpVersion::v1_1);
} else { } else {
NGLOG_ERROR(WebService, "Bad URL scheme {}", parsedUrl.m_Scheme); NGLOG_ERROR(WebService, "Bad URL scheme {}", parsedUrl.m_Scheme);
return nullptr; return nullptr;