BlackMATov/curly.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/curly.hpp.git synced 2025-12-15 04:15:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix curl_easy_setopt using. default redirections to 10.

Browse Source
This commit is contained in:
Matvey Cherevko
2019-06-26 19:30:23 +07:00
parent 49fc17df30
commit 022b57adaf
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headers/curly.hpp/curly.hpp
View File

@@ -211,7 +211,7 @@ namespace curly_hpp
headers_t headers_;
bool verbose_{false};
bool verification_{true};
std::uint32_t redirections_{~0u};
std::uint32_t redirections_{10u};
time_sec_t response_timeout_{60u};
time_sec_t connection_timeout_{20u};
private:

39
sources/curly.cpp
View File

@@ -289,9 +289,9 @@ namespace curly_hpp
curl_easy_setopt(curlh_.get(), CURLOPT_USERAGENT, user_agent.c_str());
}
curl_easy_setopt(curlh_.get(), CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_TCP_KEEPALIVE, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_BUFFERSIZE, 64 * 1024);
curl_easy_setopt(curlh_.get(), CURLOPT_NOSIGNAL, 1l);
curl_easy_setopt(curlh_.get(), CURLOPT_TCP_KEEPALIVE, 1l);
curl_easy_setopt(curlh_.get(), CURLOPT_BUFFERSIZE, 65536l);
curl_easy_setopt(curlh_.get(), CURLOPT_USE_SSL, CURLUSESSL_ALL);
curl_easy_setopt(curlh_.get(), CURLOPT_READDATA, this);
@@ -305,44 +305,47 @@ namespace curly_hpp
curl_easy_setopt(curlh_.get(), CURLOPT_URL, rb.url().c_str());
curl_easy_setopt(curlh_.get(), CURLOPT_HTTPHEADER, hlist_.get());
curl_easy_setopt(curlh_.get(), CURLOPT_VERBOSE, rb.verbose() ? 1 : 0);
curl_easy_setopt(curlh_.get(), CURLOPT_VERBOSE, rb.verbose() ? 1l : 0l);
switch ( rb.method() ) {
case methods::put:
curl_easy_setopt(curlh_.get(), CURLOPT_UPLOAD, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_INFILESIZE_LARGE, uploader_->size());
curl_easy_setopt(curlh_.get(), CURLOPT_UPLOAD, 1l);
curl_easy_setopt(curlh_.get(), CURLOPT_INFILESIZE_LARGE,
static_cast<curl_off_t>(uploader_->size()));
break;
case methods::get:
curl_easy_setopt(curlh_.get(), CURLOPT_HTTPGET, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_HTTPGET, 1l);
break;
case methods::head:
curl_easy_setopt(curlh_.get(), CURLOPT_NOBODY, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_NOBODY, 1l);
break;
case methods::post:
curl_easy_setopt(curlh_.get(), CURLOPT_POST, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_POSTFIELDSIZE_LARGE, uploader_->size());
curl_easy_setopt(curlh_.get(), CURLOPT_POST, 1l);
curl_easy_setopt(curlh_.get(), CURLOPT_POSTFIELDSIZE_LARGE,
static_cast<curl_off_t>(uploader_->size()));
break;
default:
throw exception("curly_hpp: unexpected request method");
}
if ( rb.verification() ) {
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYPEER, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYHOST, 2);
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYPEER, 1l);
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYHOST, 2l);
} else {
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYHOST, 0);
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYPEER, 0l);
curl_easy_setopt(curlh_.get(), CURLOPT_SSL_VERIFYHOST, 0l);
}
if ( rb.redirections() ) {
curl_easy_setopt(curlh_.get(), CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curlh_.get(), CURLOPT_MAXREDIRS, rb.redirections());
curl_easy_setopt(curlh_.get(), CURLOPT_FOLLOWLOCATION, 1l);
curl_easy_setopt(curlh_.get(), CURLOPT_MAXREDIRS,
static_cast<long>(rb.redirections()));
} else {
curl_easy_setopt(curlh_.get(), CURLOPT_FOLLOWLOCATION, 0);
curl_easy_setopt(curlh_.get(), CURLOPT_FOLLOWLOCATION, 0l);
}
curl_easy_setopt(curlh_.get(), CURLOPT_CONNECTTIMEOUT,
std::max(time_sec_t(1), rb.connection_timeout()).count());
static_cast<long>(std::max(time_sec_t(1), rb.connection_timeout()).count()));
last_response_ = time_point_t::clock::now();
response_timeout_ = std::max(time_sec_t(1), rb.response_timeout());