diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:21:13 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:21:13 +0200 |
| commit | a2ec4d22dd77a363cd5b1f8b55ed34ba88331396 (patch) | |
| tree | 1f4995e44a20923ecc69c3ed30ec788d38b81b49 /methods | |
| parent | 5c92e3800d6ce8e9cde1e2816bd76c975d9342a7 (diff) | |
| parent | 549da1a850f0fd50e0a55415452ecaa735d49451 (diff) | |
merged from debian
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/gpgv.cc | 2 | ||||
| -rw-r--r-- | methods/https.cc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 1ed26a30a..9f4683e6e 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -211,7 +211,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str()); + ioprintf(ret, _("Could not execute '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str()); return ret.str(); } else diff --git a/methods/https.cc b/methods/https.cc index b2bbbddb1..b0b05a47e 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -110,7 +110,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) long curl_responsecode; // TODO: - // - http::Timeout // - http::Pipeline-Depth // - error checking/reporting // - more debug options? (CURLOPT_DEBUGFUNCTION?) @@ -169,6 +168,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // set header curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + // set timeout + int timeout = _config->FindI("Acquire::http::Timeout",120); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); + // debug if(_config->FindB("Debug::Acquire::https", false)) curl_easy_setopt(curl, CURLOPT_VERBOSE, true); |