summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-11-17 09:55:22 -0600
committerMichael Vogt <michael.vogt@ubuntu.com>2009-11-17 09:55:22 -0600
commit5085e660679cdbb51783702898c42000d5db4fba (patch)
tree8123569f94324b5445b3502becf158a8595455ca
parent43cf55db7c2ce7015d365556ed9ab0b8b2cec3ca (diff)
methods/https.cc: cleanup for CURLOPT_LOW_SPEED_TIME
-rw-r--r--methods/https.cc3
-rw-r--r--methods/https.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/methods/https.cc b/methods/https.cc
index 3cbb0088a..dbc1cf52c 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -214,8 +214,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
int timeout = _config->FindI("Acquire::http::Timeout",120);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
//set really low lowspeed timeout (see #497983)
- int dlMin = 1;
- curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, dlMin);
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);
curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
// set redirect options and default to 10 redirects
diff --git a/methods/https.h b/methods/https.h
index 2c33d95ee..3f0c416b6 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -24,6 +24,8 @@ class HttpsMethod;
class HttpsMethod : public pkgAcqMethod
{
+ // minimum speed in bytes/se that triggers download timeout handling
+ static const int DL_MIN_SPEED = 10;
virtual bool Fetch(FetchItem *);
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);