3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Http: Don't set CURLOPT_TIMEOUT

Browse Source
This commit is contained in:
Vojtech Kral 2018-12-21 12:00:54 +01:00
parent 4a2c0722f7
commit 75cc0b07bb
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/Utils/Http.cpp
View File

@ -32,7 +32,7 @@ class CurlGlobalInit
struct Http::priv struct Http::priv
{ {
enum { enum {
DEFAULT_TIMEOUT = 10, DEFAULT_TIMEOUT_CONNECT = 10,
DEFAULT_SIZE_LIMIT = 5 * 1024 * 1024, DEFAULT_SIZE_LIMIT = 5 * 1024 * 1024,
}; };
@ -64,7 +64,7 @@ struct Http::priv
static int xfercb_legacy(void *userp, double dltotal, double dlnow, double ultotal, double ulnow); static int xfercb_legacy(void *userp, double dltotal, double dlnow, double ultotal, double ulnow);
static size_t form_file_read_cb(char *buffer, size_t size, size_t nitems, void *userp); static size_t form_file_read_cb(char *buffer, size_t size, size_t nitems, void *userp);
void set_timeout(long timeout); void set_timeout_connect(long timeout);
void form_add_file(const char *name, const fs::path &path, const char* filename); void form_add_file(const char *name, const fs::path &path, const char* filename);
void set_post_body(const fs::path &path); void set_post_body(const fs::path &path);
@ -86,7 +86,7 @@ Http::priv::priv(const std::string &url)
throw std::runtime_error(std::string("Could not construct Curl object")); throw std::runtime_error(std::string("Could not construct Curl object"));
} }
set_timeout(DEFAULT_TIMEOUT); set_timeout_connect(DEFAULT_TIMEOUT_CONNECT);
::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); // curl makes a copy internally ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); // curl makes a copy internally
::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_FORK_NAME "/" SLIC3R_VERSION); ::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_FORK_NAME "/" SLIC3R_VERSION);
::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer.front()); ::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer.front());
@ -172,10 +172,9 @@ size_t Http::priv::form_file_read_cb(char *buffer, size_t size, size_t nitems, v
return stream->gcount(); return stream->gcount();
} }
void Http::priv::set_timeout(long timeout) void Http::priv::set_timeout_connect(long timeout)
{ {
::curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); ::curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
::curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
} }
void Http::priv::form_add_file(const char *name, const fs::path &path, const char* filename) void Http::priv::form_add_file(const char *name, const fs::path &path, const char* filename)
@ -306,10 +305,10 @@ Http::~Http()
} }
Http& Http::timeout(long timeout) Http& Http::timeout_connect(long timeout)
{ {
if (timeout < 1) { timeout = priv::DEFAULT_TIMEOUT; } if (timeout < 1) { timeout = priv::DEFAULT_TIMEOUT_CONNECT; }
if (p) { p->set_timeout(timeout); } if (p) { p->set_timeout_connect(timeout); }
return *this; return *this;
} }

2
src/slic3r/Utils/Http.hpp
View File

@ -56,7 +56,7 @@ public:
Http& operator=(Http &&) = delete; Http& operator=(Http &&) = delete;
// Sets a maximum connection timeout in seconds // Sets a maximum connection timeout in seconds
Http& timeout(long timeout); Http& timeout_connect(long timeout);
// Sets a maximum size of the data that can be received. // Sets a maximum size of the data that can be received.
// A value of zero sets the default limit, which is is 5MB. // A value of zero sets the default limit, which is is 5MB.
Http& size_limit(size_t sizeLimit); Http& size_limit(size_t sizeLimit);