diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-06 18:04:17 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-06 18:04:17 +0200 |
| commit | 9a4dfc82c563d6335bb37a928a8925efe329fd8d (patch) | |
| tree | 18e11ad79f75a2df8d9b11520851966dad8aab83 /methods | |
| parent | 54668e4e591651be2d83b95ff4a9d96668db1e36 (diff) | |
| parent | 02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff) | |
* merged with the apt--mvo branch
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/gpgv.cc | 8 | ||||
| -rw-r--r-- | methods/http.cc | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index ba7389cba..227e08d63 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -17,6 +17,7 @@ #define GNUPGBADSIG "[GNUPG:] BADSIG" #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY" #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" +#define GNUPGNODATA "[GNUPG:] NODATA" class GPGVMethod : public pkgAcqMethod { @@ -171,7 +172,12 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Got NO_PUBKEY " << std::endl; NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } - + if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got NODATA! " << std::endl; + BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0) { char *sig = buffer + sizeof(GNUPGPREFIX); diff --git a/methods/http.cc b/methods/http.cc index 341de94e3..c6623c46f 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -657,7 +657,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) will glitch HTTP/1.0 proxies because they do not filter it out and pass it on, HTTP/1.1 says the connection should default to keep alive and we expect the proxy to do this */ - if (Proxy.empty() == true) + if (Proxy.empty() == true || Proxy.Host.empty()) sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n", QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str()); else |