From f83589b5929befc4f6924ab615035140b93ca419 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 17 Jan 2008 22:37:11 -0200 Subject: * Applied patch from Robert Millan to fix the error message when gpgv isn't installed, closes: #452640. --- methods/gpgv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'methods') 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 -- cgit v1.2.3-70-g09d2 From 38965a34274c10d6eb9f0837a9ba4a8b04d24639 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 11 Mar 2008 09:58:13 +0100 Subject: typo fixes --- apt-pkg/depcache.h | 4 ++-- methods/http.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'methods') diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 7adf6fe7f..f41ad17e9 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -92,7 +92,7 @@ class pkgDepCache : protected pkgCache::Namespace * \param rootFunc A callback that can be used to add extra * packages to the root set. * - * \return \b false if an error occured. + * \return \b false if an error occurred. */ bool MarkRequired(InRootSetFunc &rootFunc); @@ -103,7 +103,7 @@ class pkgDepCache : protected pkgCache::Namespace * are tested to see whether they are actually garbage. If so, * they are marked as such. * - * \return \b false if an error occured. + * \return \b false if an error occurred. */ bool Sweep(); diff --git a/methods/http.cc b/methods/http.cc index d4e231fbe..26d435dea 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -368,8 +368,8 @@ bool ServerState::Close() /*}}}*/ // ServerState::RunHeaders - Get the headers before the data /*{{{*/ // --------------------------------------------------------------------- -/* Returns 0 if things are OK, 1 if an IO error occursed and 2 if a header - parse error occured */ +/* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header + parse error occurred */ int ServerState::RunHeaders() { State = Header; -- cgit v1.2.3-70-g09d2 From cc615257a94918b737cb45f7e698b465e096a668 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 2 May 2008 12:26:17 -0300 Subject: Add timeout support for https. --- debian/changelog | 2 ++ methods/https.cc | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index e82740f58..7144a3ad1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.13) UNRELEASED; urgency=low Closes: #478231 * Make cron script quiet if cache is locked. Thanks to Ted Percival for the patch. Closes: #459344 + * Add timeout support for https. Thanks to Andrew Martens + for the patch. [ Program translations ] - Vietnamese updated. Closes: #479008 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); -- cgit v1.2.3-70-g09d2