diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-16 12:16:46 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-16 12:16:46 +0200 |
| commit | 02b7ddb1404fa3969bceb03a5f35107884027ba6 (patch) | |
| tree | 9b698e1cb0301c44a39eb02739be736651dc6d43 | |
| parent | cd33a78610099e9f0cfdcad782f9d92e55ea647e (diff) | |
| download | apt-02b7ddb1404fa3969bceb03a5f35107884027ba6.tar.gz | |
* methods/http.cc:
- check for incorrect proxy settings more carefully
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | methods/http.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a84146d2..e69c5091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.6.45.1) unstable; urgency=low versions of the package (closes: #257054) - properly handle recommends/suggests or-groups when printing the list of suggested/recommends packages (closes: #311619) + * methods/http.cc: + - check more careful for incorrect proxy settings (closes: #378868) -- diff --git a/methods/http.cc b/methods/http.cc index 341de94e..c6623c46 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 |