diff options
| author | Michael Vogt <mvo@debian.org> | 2006-01-10 18:07:17 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2006-01-10 18:07:17 +0000 |
| commit | ac2c9fa03c9786da44320d59b3ad66f474c4634a (patch) | |
| tree | c36d42b4b2c01d6582a22d2fa4083f07777f3b75 /methods/http.cc | |
| parent | 4d165fe0b5974454f706d42e7bb9e8424fe7fe64 (diff) | |
| parent | c5691ddf15797bead5d77021ee0524635798bebb (diff) | |
* merged with apt--mvo--0
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-149
Merge with Michael archive (Debian version)
* bubulle@debian.org--2005/apt--main--0--patch-150
Fix typo in apt-get.cc and update PO files
* bubulle@debian.org--2005/apt--main--0--patch-151
Update French translation (and document the update-po I ran previously)
* bubulle@debian.org--2005/apt--main--0--patch-152
Updated Slovak translation
* bubulle@debian.org--2005/apt--main--0--patch-153
Close the right bug for Slovak translation
* bubulle@debian.org--2005/apt--main--0--patch-154
French manpages translation update
* bubulle@debian.org--2005/apt--main--0--patch-155
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-156
Better makefile for more up-to-date PO and POT
* bubulle@debian.org--2005/apt--main--0--patch-157
Run make uupdate-po
* bubulle@debian.org--2005/apt--main--0--patch-158
Fix spaces errors in some translations
* bubulle@debian.org--2005/apt--main--0--patch-159
Patch to allow "make apt-all.pot" work in the baz archive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116
* changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118
* merged from bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119
* fix http data corruption (#280844)
* mvo@debian.org--2005/apt--debian-experimental--0--patch-12
* added http data corruption fix patch (#280844)
* philippe.batailler@free.fr--2005/apt--main--0--patch-6
Change apt.ent.fr
* philippe.batailler@free.fr--2005/apt--main--0--patch-7
Update manpages
Diffstat (limited to 'methods/http.cc')
| -rw-r--r-- | methods/http.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/methods/http.cc b/methods/http.cc index dc3f0b763..341de94e3 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -241,28 +241,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; |