From c390f2fc0dd786318baeb528fddd8110dd5d5749 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 8 Apr 2014 12:15:06 +0000 Subject: [PATCH] *Core/POP3: Removed line ending at the end of multipart git-svn-id: svn://ultimatepp.org/upp/trunk@7189 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/POP3/InetMessage.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/POP3/InetMessage.cpp b/uppsrc/Core/POP3/InetMessage.cpp index 7bd7960e4..93ced34df 100644 --- a/uppsrc/Core/POP3/InetMessage.cpp +++ b/uppsrc/Core/POP3/InetMessage.cpp @@ -1,6 +1,6 @@ #include "POP3.h" -#define LLOG(x) DLOG(x) +#define LLOG(x) // DLOG(x) String QDecode(const String& s) { @@ -146,6 +146,7 @@ bool InetMessage::ReadPart(Stream& ss, int parent, int level) bool end = false; while(!end) { String body; + bool next = false; for(;;) { if(ss.IsEof()) return false; @@ -156,7 +157,10 @@ bool InetMessage::ReadPart(Stream& ss, int parent, int level) end = true; break; } - body << ln << "\r\n"; + if(next) + body << "\r\n"; + body << ln; + next = true; } StringStream nss(body); ReadPart(nss, newparent, level + 1);