From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 17 Nov 2009 15:55:22 +0000 (-0600)
Subject: methods/https.cc: cleanup for CURLOPT_LOW_SPEED_TIME
X-Git-Tag: 0.7.24ubuntu1~1^2~1
X-Git-Url: https://git.hcoop.net/ntk/apt.git/commitdiff_plain/5085e660679cdbb51783702898c42000d5db4fba?ds=sidebyside

methods/https.cc: cleanup for CURLOPT_LOW_SPEED_TIME
---

diff --git a/methods/https.cc b/methods/https.cc
index 3cbb0088..dbc1cf52 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 2c33d95e..3f0c416b 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);