summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2005-10-23 11:12:54 +0000
committerMichael Vogt <mvo@debian.org>2005-10-23 11:12:54 +0000
commit927c393f1305925c1456c931e1e7b45afd6f051d (patch)
tree08e78830e218a42d0922c2853f29ca1bdb9984db
parent05d82b584c7e29b14325feca1003f76106e27683 (diff)
* added http data corruption fix patch (#280844)
-rw-r--r--configure.in2
-rw-r--r--debian/changelog5
-rw-r--r--methods/http.cc13
3 files changed, 9 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index 758727f2f..5ac3b0d8a 100644
--- 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_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)
diff --git a/debian/changelog b/debian/changelog
index b854d1741..67195fc7e 100644
--- 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)
-
+ * 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
diff --git a/methods/http.cc b/methods/http.cc
index e2337a9ba..dbf2d1b43 100644
--- 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 (I < InP && Buf[I%Size] == '\r')
- ++I;
if (Single == false)
{
- if (Buf[I%Size] != '\n')
- continue;
- ++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;
- if (I - OutP < LeftWrite())
+ if (I - OutP < Sz)
Sz = I - OutP;
Data += string((char *)(Buf + (OutP%Size)),Sz);
OutP += Sz;