Explorar o código

Merge pull request #4857 from liushuyu/master

web_service: follow-up fix to #4842
LC %!s(int64=5) %!d(string=hai) anos
pai
achega
1a6b1bf1d7
Modificáronse 3 ficheiros con 297 adicións e 131 borrados
  1. 1 1
      externals/httplib/README.md
  2. 296 125
      externals/httplib/httplib.h
  3. 0 5
      src/web_service/web_backend.cpp

+ 1 - 1
externals/httplib/README.md

@@ -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
 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 296 - 125
externals/httplib/httplib.h


+ 0 - 5
src/web_service/web_backend.cpp

@@ -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);

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio