diff options
| author | 2020-10-28 23:06:26 -0600 | |
|---|---|---|
| committer | 2020-10-28 23:16:06 -0600 | |
| commit | cf63eacc1a34924a01e7d8586fccb7d7561d2250 (patch) | |
| tree | e54703cea2555e42126972628bd6a6d04216de38 /src/web_service/web_backend.cpp | |
| parent | Merge pull request #4856 from bunnei/webservice-socket-error (diff) | |
| download | yuzu-cf63eacc1a34924a01e7d8586fccb7d7561d2250.tar.gz yuzu-cf63eacc1a34924a01e7d8586fccb7d7561d2250.tar.xz yuzu-cf63eacc1a34924a01e7d8586fccb7d7561d2250.zip | |
web_service: follow-up fix to #4842 ...
* 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.
Diffstat (limited to 'src/web_service/web_backend.cpp')
| -rw-r--r-- | src/web_service/web_backend.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp index f264b98a0..67183e64c 100644 --- a/src/web_service/web_backend.cpp +++ b/src/web_service/web_backend.cpp | |||
| @@ -71,11 +71,6 @@ struct Client::Impl { | |||
| 71 | return {}; | 71 | return {}; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | if (!cli->is_socket_open()) { | ||
| 75 | LOG_ERROR(WebService, "Failed to open socket, skipping request!"); | ||
| 76 | return {}; | ||
| 77 | } | ||
| 78 | |||
| 79 | cli->set_connection_timeout(TIMEOUT_SECONDS); | 74 | cli->set_connection_timeout(TIMEOUT_SECONDS); |
| 80 | cli->set_read_timeout(TIMEOUT_SECONDS); | 75 | cli->set_read_timeout(TIMEOUT_SECONDS); |
| 81 | cli->set_write_timeout(TIMEOUT_SECONDS); | 76 | cli->set_write_timeout(TIMEOUT_SECONDS); |