yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring the previous commit

Browse source
This commit is contained in:
yhirose 2022-08-04 20:56:02 -04:00
parent 656e936f49
commit 4f8407a3a7
1 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
httplib.h
View file

@ -951,9 +951,9 @@ public:
const Params &params); const Params &params);
Result Put(const std::string &path, const MultipartFormDataItems &items); Result Put(const std::string &path, const MultipartFormDataItems &items);
Result Put(const std::string &path, const Headers &headers, Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items); const MultipartFormDataItems &items);
Result Put(const std::string &path, const Headers &headers, Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const std::string &boundary); const MultipartFormDataItems &items, const std::string &boundary);
Result Patch(const std::string &path); Result Patch(const std::string &path);
Result Patch(const std::string &path, const char *body, size_t content_length, Result Patch(const std::string &path, const char *body, size_t content_length,
@ -2592,7 +2592,7 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
std::copy(host.begin(), host.end(), addr.sun_path); std::copy(host.begin(), host.end(), addr.sun_path);
hints.ai_addr = reinterpret_cast<sockaddr*>(&addr); hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
hints.ai_addrlen = static_cast<socklen_t>( hints.ai_addrlen = static_cast<socklen_t>(
sizeof(addr) - sizeof(addr.sun_path) + addrlen); sizeof(addr) - sizeof(addr.sun_path) + addrlen);
@ -4074,11 +4074,10 @@ inline std::string make_multipart_data_boundary() {
return result; return result;
} }
inline bool is_multipart_boundary_chars_valid(const std::string& boundary) inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
{ auto valid = true;
bool valid = true;
for (size_t i = 0; i < boundary.size(); i++) { for (size_t i = 0; i < boundary.size(); i++) {
char c = boundary[i]; auto c = boundary[i];
if (!std::isalnum(c) && c != '-' && c != '_') { if (!std::isalnum(c) && c != '-' && c != '_') {
valid = false; valid = false;
break; break;
@ -4087,11 +4086,10 @@ inline bool is_multipart_boundary_chars_valid(const std::string& boundary)
return valid; return valid;
} }
inline std::string
inline std::string serialize_multipart_formdata(const MultipartFormDataItems& items, std::string& content_type, const std::string& boundary_str) serialize_multipart_formdata(const MultipartFormDataItems &items,
{ const std::string &boundary,
const std::string& boundary = boundary_str.empty() ? make_multipart_data_boundary() : boundary_str; std::string &content_type) {
std::string body; std::string body;
for (const auto &item : items) { for (const auto &item : items) {
@ -6796,20 +6794,21 @@ inline Result ClientImpl::Post(const std::string &path,
inline Result ClientImpl::Post(const std::string &path, const Headers &headers, inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) { const MultipartFormDataItems &items) {
std::string content_type; std::string content_type;
const std::string& body = detail::serialize_multipart_formdata(items, content_type, std::string()); const auto &body = detail::serialize_multipart_formdata(
items, detail::make_multipart_data_boundary(), content_type);
return Post(path, headers, body, content_type.c_str()); return Post(path, headers, body, content_type.c_str());
} }
inline Result ClientImpl::Post(const std::string &path, const Headers &headers, inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const MultipartFormDataItems &items,
const std::string &boundary) const std::string &boundary) {
{
if (!detail::is_multipart_boundary_chars_valid(boundary)) { if (!detail::is_multipart_boundary_chars_valid(boundary)) {
return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
} }
std::string content_type; std::string content_type;
const std::string& body = detail::serialize_multipart_formdata(items, content_type, boundary); const auto &body =
detail::serialize_multipart_formdata(items, boundary, content_type);
return Post(path, headers, body, content_type.c_str()); return Post(path, headers, body, content_type.c_str());
} }
@ -6882,28 +6881,29 @@ inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
return Put(path, headers, query, "application/x-www-form-urlencoded"); return Put(path, headers, query, "application/x-www-form-urlencoded");
} }
inline Result ClientImpl::Put(const std::string &path, const MultipartFormDataItems &items) inline Result ClientImpl::Put(const std::string &path,
{ const MultipartFormDataItems &items) {
return Put(path, Headers(), items); return Put(path, Headers(), items);
} }
inline Result ClientImpl::Put(const std::string &path, const Headers &headers, inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) const MultipartFormDataItems &items) {
{
std::string content_type; std::string content_type;
const std::string& body = detail::serialize_multipart_formdata(items, content_type, std::string()); const auto &body = detail::serialize_multipart_formdata(
items, detail::make_multipart_data_boundary(), content_type);
return Put(path, headers, body, content_type); return Put(path, headers, body, content_type);
} }
inline Result ClientImpl::Put(const std::string &path, const Headers &headers, inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const MultipartFormDataItems &items,
const std::string &boundary) const std::string &boundary) {
{
if (!detail::is_multipart_boundary_chars_valid(boundary)) { if (!detail::is_multipart_boundary_chars_valid(boundary)) {
return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
} }
std::string content_type; std::string content_type;
const std::string& body = detail::serialize_multipart_formdata(items, content_type, boundary); const auto &body =
detail::serialize_multipart_formdata(items, boundary, content_type);
return Put(path, headers, body, content_type); return Put(path, headers, body, content_type);
} }
@ -7032,9 +7032,7 @@ inline size_t ClientImpl::is_socket_open() const {
return socket_.is_open(); return socket_.is_open();
} }
inline socket_t ClientImpl::socket() const { inline socket_t ClientImpl::socket() const { return socket_.sock; }
return socket_.sock;
}
inline void ClientImpl::stop() { inline void ClientImpl::stop() {
std::lock_guard<std::mutex> guard(socket_mutex_); std::lock_guard<std::mutex> guard(socket_mutex_);
@ -7942,13 +7940,13 @@ inline Client::Client(const std::string &scheme_host_port,
if (is_ssl) { if (is_ssl) {
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
cli_ = detail::make_unique<SSLClient>(host, port, cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
client_cert_path, client_key_path); client_key_path);
is_ssl_ = is_ssl; is_ssl_ = is_ssl;
#endif #endif
} else { } else {
cli_ = detail::make_unique<ClientImpl>(host, port, cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
client_cert_path, client_key_path); client_key_path);
} }
} else { } else {
cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80, cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
@ -8158,18 +8156,17 @@ inline Result Client::Put(const std::string &path, const Headers &headers,
const Params &params) { const Params &params) {
return cli_->Put(path, headers, params); return cli_->Put(path, headers, params);
} }
inline Result Client::Put(const std::string &path, const MultipartFormDataItems &items) inline Result Client::Put(const std::string &path,
{ const MultipartFormDataItems &items) {
return cli_->Put(path, items); return cli_->Put(path, items);
} }
inline Result Client::Put(const std::string &path, const Headers &headers, inline Result Client::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) const MultipartFormDataItems &items) {
{
return cli_->Put(path, headers, items); return cli_->Put(path, headers, items);
} }
inline Result Client::Put(const std::string &path, const Headers &headers, inline Result Client::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const std::string &boundary) const MultipartFormDataItems &items,
{ const std::string &boundary) {
return cli_->Put(path, headers, items, boundary); return cli_->Put(path, headers, items, boundary);
} }
inline Result Client::Patch(const std::string &path) { inline Result Client::Patch(const std::string &path) {