diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-06-09 11:51:21 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-06-09 11:51:21 +0200 |
commit | 23c5897cbdb5a957788201a5178e963586dcdbc9 (patch) | |
tree | 8303be690b404c47d7a2da310175e1a40c62348c /methods/http.h | |
parent | 6dd8400ca787ef832d87121f304f98ad152dc3a6 (diff) | |
parent | 164fed49362b28c0264c293a14a06d167e32b76f (diff) |
* merge the remaining Ubuntu change:
- on gpg verification failure warn and restore the last known
good state
- on failure display the IP of the server (useful for servers
that use round robin DNS)
- support Original-Maintainer in RewritePackageOrder
- enable cdrom autodetection via libudev by default
- show messsage about Vcs in use when apt-get source is run for
packages maintained in a Vcs
- better support transitional packages with mark auto-installed.
when the transitional package is in "oldlibs" the new package
is not marked auto installed (same is true for section
metapackages)
- provide new "deb mirror://archive.foo/mirrors.list sid main"
method expects a list of mirrors (generated on the server e.g.
via geoip) and will use that, including cycle on failure
- write apport crash file on package failure (disabled by default
on debian until apport is available)
- support mirror failure reporting (disabled by default on debian)
Diffstat (limited to 'methods/http.h')
-rw-r--r-- | methods/http.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/methods/http.h b/methods/http.h index af0f5e033..d0677bdaa 100644 --- a/methods/http.h +++ b/methods/http.h @@ -13,7 +13,7 @@ #define MAXLEN 360 -#include <iostream> + using std::cout; using std::endl; @@ -167,7 +167,6 @@ class HttpMethod : public pkgAcqMethod /** \brief Try to AutoDetect the proxy */ bool AutoDetectProxy(); - virtual bool Fetch(FetchItem *); virtual bool Configuration(string Message); // In the event of a fatal signal this file will be closed and timestamped. @@ -175,6 +174,9 @@ class HttpMethod : public pkgAcqMethod static int FailFd; static time_t FailTime; static void SigTerm(int); + + protected: + virtual bool Fetch(FetchItem *); string NextURI; string AutoDetectProxyCmd; |