diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:03:16 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:03:16 +0200 |
| commit | 549da1a850f0fd50e0a55415452ecaa735d49451 (patch) | |
| tree | 312bc5525fc98d2c25780e3479b7223044596388 /methods/https.cc | |
| parent | 1171258afb052c3ddcb4e5dc3f19b4ec1b29e4b9 (diff) | |
| parent | 8f6aa8efa522c90959fb827a8618f02f41e0a2cd (diff) | |
* Mark a message from dselect backend as translatable
Thanks to Frédéric Bothamy for the patch
Closes: #322470
* Simplified Chinese updated. Closes: #473360
* Catalan fixes. Closes: #387141
* Typo fix in Greek translation. Closes: #479122
* French updated.
* Thai updated. Closes: #479313
* Italian updated. Closes: #479326
* Polish updated. Closes: #479342
* Bulgarian updated. Closes: #479379
* Finnish updated. Closes: #479403
* Korean updated. Closes: #479426
* Basque updated. Closes: #479452
* Add missing build-depends back from build-depends-indep field.
Closes: #478231
* Make cron script quiet if cache is locked. Thanks to Ted Percival
<ted@midg3t.net> for the patch. Closes: #459344
* Add timeout support for https. Thanks to Andrew Martens
<andrew.martens@strangeloopnetworks.com> for the patch.
* Add support for --no-download on apt-get update. Closes: #478517
- Vietnamese updated. Closes: #479008
- Enable more complete debugging information when Debug::pkgAutoRemove
is set.
* debian/rules:
- Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto.
Diffstat (limited to 'methods/https.cc')
| -rw-r--r-- | methods/https.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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); |