lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-28 09:25:05 +03:00
Code

Removed default parameter values in Client and SSLClient constructors

Browse Source
This commit is contained in:
yhirose 2020-05-14 08:51:32 -04:00
parent 2d4b42b70b
commit bbb83d12c1
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
httplib.h
View File

@ -571,9 +571,13 @@ private:
class Client { class Client {
public: public:
explicit Client(const std::string &host, int port = 80, explicit Client(const std::string &host);
const std::string &client_cert_path = std::string(),
const std::string &client_key_path = std::string()); explicit Client(const std::string &host, int port);
explicit Client(const std::string &host, int port,
const std::string &client_cert_path,
const std::string &client_key_path);
virtual ~Client(); virtual ~Client();
@ -897,9 +901,13 @@ private:
class SSLClient : public Client { class SSLClient : public Client {
public: public:
explicit SSLClient(const std::string &host, int port = 443, explicit SSLClient(const std::string &host);
const std::string &client_cert_path = std::string(),
const std::string &client_key_path = std::string()); explicit SSLClient(const std::string &host, int port);
explicit SSLClient(const std::string &host, int port,
const std::string &client_cert_path,
const std::string &client_key_path);
explicit SSLClient(const std::string &host, int port, X509 *client_cert, explicit SSLClient(const std::string &host, int port, X509 *client_cert,
EVP_PKEY *client_key); EVP_PKEY *client_key);
@ -3786,6 +3794,12 @@ inline bool Server::process_and_close_socket(socket_t sock) {
} }
// HTTP client implementation // HTTP client implementation
inline Client::Client(const std::string &host)
: Client(host, 80, std::string(), std::string()) {}
inline Client::Client(const std::string &host, int port)
: Client(host, port, std::string(), std::string()) {}
inline Client::Client(const std::string &host, int port, inline Client::Client(const std::string &host, int port,
const std::string &client_cert_path, const std::string &client_cert_path,
const std::string &client_key_path) const std::string &client_key_path)
@ -4845,6 +4859,12 @@ inline bool SSLServer::process_and_close_socket(socket_t sock) {
} }
// SSL HTTP client implementation // SSL HTTP client implementation
inline SSLClient::SSLClient(const std::string &host)
: SSLClient(host, 443, std::string(), std::string()) {}
inline SSLClient::SSLClient(const std::string &host, int port)
: SSLClient(host, port, std::string(), std::string()) {}
inline SSLClient::SSLClient(const std::string &host, int port, inline SSLClient::SSLClient(const std::string &host, int port,
const std::string &client_cert_path, const std::string &client_cert_path,
const std::string &client_key_path) const std::string &client_key_path)
@ -5101,13 +5121,16 @@ inline bool SSLClient::check_host_name(const char *pattern,
class Client2 { class Client2 {
public: public:
explicit Client2(const char *host_and_port, explicit Client2(const char *scheme_host_port)
const std::string &client_cert_path = std::string(), : Client2(scheme_host_port, std::string(), std::string()) {}
const std::string &client_key_path = std::string()) {
explicit Client2(const char *scheme_host_port,
const std::string &client_cert_path,
const std::string &client_key_path) {
const static std::regex re(R"(^(https?)://([^:/?#]+)(?::(\d+))?)"); const static std::regex re(R"(^(https?)://([^:/?#]+)(?::(\d+))?)");
std::cmatch m; std::cmatch m;
if (std::regex_match(host_and_port, m, re)) { if (std::regex_match(scheme_host_port, m, re)) {
auto scheme = m[1].str(); auto scheme = m[1].str();
auto host = m[2].str(); auto host = m[2].str();
auto port_str = m[3].str(); auto port_str = m[3].str();