* methods/http.cc:

  - check for incorrect proxy settings more carefully

diff --git a/debian/changelog b/debian/changelog
index a84146d20747332d26ac483ba4c3b89c2b46f2c2..e69c5091f09446b8d6a4220596c0101a85f48bcf 100644 (file)
--- 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)
       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 341de94e37ab046c3e2a1360bdd16f0f96a5c7dc..c6623c46f09cf97fcb67b1123f49df29e5b979db 100644 (file)
--- 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 */
       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
       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