* added http data corruption fix patch (#280844)

diff --git a/configure.in b/configure.in
index 758727f2f21a0a342f0d896ff26db8c7a443afcc..5ac3b0d8a194a58465fbfaf3105682cba4953b33 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1exp1")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index b854d174198dd8e0846069c9c72cc5d6f081fa7f..67195fc7e2ae5bcd6bebb4f0b0784ed1f38b388c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ apt (0.6.42.1exp1) experimental; urgency=low
   * synced with the apt--debian-sid--0 branch
   * build from mvo@debian.org--2005/apt--debian-experimental--0
     (from http://people.debian.org/~mvo/arch)
   * synced with the apt--debian-sid--0 branch
   * build from mvo@debian.org--2005/apt--debian-experimental--0
     (from http://people.debian.org/~mvo/arch)

-
+  * fix bug in apt-cache when displaying the record (closes: #334887)
+  * add patch to fix http download corruption problem (thanks to
+    Petr Vandrovec, closes: #280844, #290694)
+  

  -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:12:13 +0200
 
 apt (0.6.42.1) unstable; urgency=low
  -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:12:13 +0200
 
 apt (0.6.42.1) unstable; urgency=low

diff --git a/methods/http.cc b/methods/http.cc
index e2337a9ba3459d1110a15e98a5f5c4591fa1c8fc..dbf2d1b438d7042908bcc595be09c03931588f98 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -205,28 +205,23 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
       if (Buf[I%Size] != '\n')
         continue;
       ++I;
       if (Buf[I%Size] != '\n')
         continue;
       ++I;

-      if (I < InP  && Buf[I%Size] == '\r')
-         ++I;

       
       if (Single == false)
       {
       
       if (Single == false)
       {

-        if (Buf[I%Size] != '\n')
-           continue;
-         ++I;

          if (I < InP  && Buf[I%Size] == '\r')
             ++I;
          if (I < InP  && Buf[I%Size] == '\r')
             ++I;

+         if (I >= InP || Buf[I%Size] != '\n')
+            continue;
+         ++I;

       }
       
       }
       

-      if (I > InP)
-        I = InP;
-      

       Data = "";
       while (OutP < I)
       {
         unsigned long Sz = LeftWrite();
         if (Sz == 0)
            return false;
       Data = "";
       while (OutP < I)
       {
         unsigned long Sz = LeftWrite();
         if (Sz == 0)
            return false;

-        if (I - OutP < LeftWrite())
+        if (I - OutP < Sz)

            Sz = I - OutP;
         Data += string((char *)(Buf + (OutP%Size)),Sz);
         OutP += Sz;
            Sz = I - OutP;
         Data += string((char *)(Buf + (OutP%Size)),Sz);
         OutP += Sz;