* merged with mainline

diff --combined debian/changelog
index 8831d9ba76732852ff1e2d5ce4faee563b0f84ea,b55e0c5822ac898ebd8e11cf20ea795e5c2753dd..9248e80187542a0bd57ef582fe3112395dc85798
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,30 +1,30 @@@
+ apt (0.6.45.1) unstable; urgency=low
+ 
+   * debian/control:
+     - switched to libdb4.4 for building (closes: #381019)
+   * cmdline/apt-get.cc:
+     - show only the recommends/suggests for the candidate-version, not for all
+       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)
+   * methods/gzip.cc:
+     - don't hang when /var is full (closes: #341537), thanks to
+       Luis Rodrigo Gallardo Cruz for the patch
+   * doc/examples/sources.list:
+     - removed non-us.debian.org from the example (closes: #380030,#316196)
+   * Merged from Christian Perrier bzr branch:
+     * sk.po: Updated to 514t. Closes: #386851
+     * ja.po: Updated to 514t. Closes: #386537
+     * gl.po: Updated to 514t. Closes: #386397
+     * fr.po: Updated to 516t.
+     * fi.po: Updated to 512t. Closes: #382702
+   * share/archive-archive.gpg:
+     - removed the outdated amd64 and debian-2004 keys
+   
+  -- 
+ 
  apt (0.6.45) unstable; urgency=low
  
    * apt-pkg/contrib/sha256.cc:
@@@ -65,32 -92,22 +92,32 @@@ apt (0.6.44.1-0.1) unstable; urgency=lo
  
  apt (0.6.44.1) unstable; urgency=low
  
 +  * apt-pkg/acquire-item.cc:
 +    - fix reversed logic of the "Acquire::PDiffs" option
    * merged from 
      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
      - po/LINGUAS: added "bg" Closes: #360262
      - po/gl.po: Galician translation update. Closes: #366849
      - po/hu.po: Hungarian translation update. Closes: #365448
      - po/cs.po: Czech translation updated. Closes: #367244
 +  * apt-pkg/contrib/sha256.cc:
 +    - applied patch to fix unaligned access problem. Closes: #367417
 +      (thanks to David Mosberger)
  
   -- Michael Vogt <mvo@debian.org>  Tue, 16 May 2006 21:51:16 +0200
  
  apt (0.6.44) unstable; urgency=low
  
    * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
 +  * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 
 +    (thanks to Anthony Towns)
 +  * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
 +    (thanks to Anthony Towns)
 +  * apt pdiff support from experimental merged
 +  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
    * apt-pkg/deb/dpkgpm.cc: 
      - wording fixes (thanks to Matt Zimmerman)
 -    - fix error in dpkg interaction (closes: #364513, 
 -      thanks to Martin Dickopp)
 +    - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp)
    * apt-pkg/tagfile.{cc,h}:
      - use MMap to read the entries (thanks to Zephaniah E. Hull for the
        patch) Closes: #350025

diff --combined methods/http.cc
index cb63ada499f9df866f96f143a0eec53608fbf7ad,c6623c46f09cf97fcb67b1123f49df29e5b979db..1f3b038bc4a515391ff0feb8ac3ca326733cee1b
--- 1/methods/http.cc
--- 2/methods/http.cc
+++ b/methods/http.cc
@@@ -58,6 -58,7 +58,6 @@@ unsigned long PipelineDepth = 10
  unsigned long TimeOut = 120;
  bool Debug = false;
  
 -
  unsigned long CircleBuf::BwReadLimit=0;
  unsigned long CircleBuf::BwTickReadData=0;
  struct timeval CircleBuf::BwReadTick={0,0};
@@@ -656,7 -657,7 +656,7 @@@ void HttpMethod::SendReq(FetchItem *Itm
        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