portaldevice/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

web_service: follow-up fix to #4842 ...

Browse source 
* The web_service http request is now fixed on Windows (R) platform.
* The issue is due to a complicated race-condition in `httplib`, a detailed
  explanation is available at https://github.com/yhirose/cpp-httplib/pull/701
* A pending Pull Request on `httplib` has been applied to remedy the
  said race-condition.
* The socket availability check is removed due to a behavioral chice of
  `httplib` that a socket will not be created before any actual request
  is sent.
This commit is contained in:
liushuyu 2020-10-28 23:06:26 -06:00
parent c20569ebdf
commit cf63eacc1a
No known key found for this signature in database
GPG key ID: 23D1CE4534419437
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 MIT License

631
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 {}; return {};
} }
if (!cli->is_socket_open()) {
LOG_ERROR(WebService, "Failed to open socket, skipping request!");
return {};
}
cli->set_connection_timeout(TIMEOUT_SECONDS); cli->set_connection_timeout(TIMEOUT_SECONDS);
cli->set_read_timeout(TIMEOUT_SECONDS); cli->set_read_timeout(TIMEOUT_SECONDS);
cli->set_write_timeout(TIMEOUT_SECONDS); cli->set_write_timeout(TIMEOUT_SECONDS);