LLM inference in C/C++
C++ ggml
vendor : update cpp-httplib to 0.58.0 (#29407)
Alessandro de Oliveira Faria (A.K.A.CABELO)171e8846b4af
diff --git a/scripts/sync_vendor.py b/scripts/sync_vendor.pyindex b320884bbe..8ede79d57b 100755--- a/scripts/sync_vendor.py+++ b/scripts/sync_vendor.py@@ -5,7 +5,7 @@ import osimport sysimport subprocess-HTTPLIB_VERSION = "refs/tags/v0.57.1"+HTTPLIB_VERSION = "refs/tags/v0.58.0"# used by examples/gguf-hash, these repos have no release tag, so we pin a commitXXHASH_COMMIT = "9f465f1ea932d6ad9a26cd77496311ffa544cd68"diff --git a/vendor/cpp-httplib/httplib.cpp b/vendor/cpp-httplib/httplib.cppindex df79b3c7d9..00c3ef7e13 100644--- a/vendor/cpp-httplib/httplib.cpp+++ b/vendor/cpp-httplib/httplib.cpp@@ -10456,16 +10456,30 @@ ClientImpl::open_stream(const std::string &method, const std::string &path,prepare_default_headers(req, true, content_type);auto &strm = *handle.stream_;- if (detail::write_request_line(strm, req.method, req.path) < 0) {- handle.error = Error::Write;- handle.response.reset();- return handle;- }- if (!detail::check_and_write_headers(strm, req.headers, header_writer_,- handle.error)) {- handle.response.reset();- return handle;+ // Build the request line and headers in memory first, like write_request()+ // does, so that a rejected header leaves nothing on the wire.+ {+ detail::BufferStream bstrm;++ if (detail::write_request_line(bstrm, req.method, req.path) < 0) {+ handle.error = Error::Write;+ handle.response.reset();+ return handle;+ }++ if (!detail::check_and_write_headers(bstrm, req.headers, header_writer_,+ handle.error)) {+ handle.response.reset();+ return handle;+ }++ const auto &data = bstrm.get_buffer();+ if (!detail::write_data(strm, data.data(), data.size())) {+ handle.error = Error::Write;+ handle.response.reset();+ return handle;+ }}if (!body.empty()) {@@ -11018,7 +11032,9 @@ bool ClientImpl::write_content_with_provider(Stream &strm,bool ClientImpl::write_request(Stream &strm, Request &req,bool close_connection, Error &error,- bool skip_body) {+ bool skip_body, bool &rejected_locally) {+ rejected_locally = false;+// Prepare additional headersif (close_connection) {if (!req.has_header("Connection")) {@@ -11112,11 +11128,13 @@ bool ClientImpl::write_request(Stream &strm, Request &req,// set_path_encode(false)) must fail the request cleanly instead of// emitting a request-line-less, header-injecting request.error = Error::Write;+ rejected_locally = true;output_error_log(error, &req);return false;}if (!detail::check_and_write_headers(bstrm, req.headers, header_writer_,error)) {+ rejected_locally = true;output_error_log(error, &req);return false;}@@ -11385,8 +11403,16 @@ bool ClientImpl::process_request(Stream &strm, Request &req,detail::has_header_token(req.headers, "Expect", "100-continue");// Send request (skip body if using Expect: 100-continue)+ auto rejected_locally = false;auto write_request_success =- write_request(strm, req, close_connection, error, expect_100_continue);+ write_request(strm, req, close_connection, error, expect_100_continue,+ rejected_locally);++ // A failed write normally still reads the response below, since the server+ // may have answered early (e.g. 413/414) and closed while the body was being+ // sent. A request rejected before any byte reached the socket gets no such+ // response, and waiting for one would block until the read timeout.+ if (rejected_locally) { return false; }#ifdef CPPHTTPLIB_SSL_ENABLEDif (is_ssl() && !expect_100_continue) {diff --git a/vendor/cpp-httplib/httplib.h b/vendor/cpp-httplib/httplib.hindex ba603ed25b..759d5dff82 100644--- a/vendor/cpp-httplib/httplib.h+++ b/vendor/cpp-httplib/httplib.h@@ -8,8 +8,8 @@#ifndef CPPHTTPLIB_HTTPLIB_H#define CPPHTTPLIB_HTTPLIB_H-#define CPPHTTPLIB_VERSION "0.57.1"-#define CPPHTTPLIB_VERSION_NUM "0x003901"+#define CPPHTTPLIB_VERSION "0.58.0"+#define CPPHTTPLIB_VERSION_NUM "0x003a00"#ifdef _WIN32#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0A00@@ -2986,7 +2986,7 @@ private:bool read_response_line(Stream &strm, const Request &req, Response &res,bool skip_100_continue = true) const;bool write_request(Stream &strm, Request &req, bool close_connection,- Error &error, bool skip_body = false);+ Error &error, bool skip_body, bool &rejected_locally);bool write_request_body(Stream &strm, Request &req, Error &error);void prepare_default_headers(Request &r, bool for_stream,const std::string &ct);