From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 16 Aug 2006 10:16:46 +0000 (+0200)
Subject: * methods/http.cc:
X-Git-Tag: 0.7.24ubuntu1~238^2~1^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/02b7ddb1404fa3969bceb03a5f35107884027ba6?hp=-c

* methods/http.cc:
  - check for incorrect proxy settings more carefully
---

02b7ddb1404fa3969bceb03a5f35107884027ba6
diff --git a/debian/changelog b/debian/changelog
index a84146d20..e69c5091f 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 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