* detect the QP-coding type 'B' and 'Q' case insensitive

* start detecting non-qp encoded string parts

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index ba8fdec4af7289d1b5e9151bed1de795e864df8d..9e15107dea1481c143433a4cf4b8be8c918aa43a 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -1624,6 +1624,7 @@ inline static void DecodeSegment(StrBuf *Target,
        extract_token(encoding, SegmentStart, 2, '?', sizeof encoding);
        StrBufExtract_token(ConvertBuf, &StaticBuf, 3, '?');
        
+       *encoding = toupper(*encoding);
        if (*encoding == 'B') { /**< base64 */
                ConvertBuf2->BufUsed = CtdlDecodeBase64(ConvertBuf2->buf, 
                                                        ConvertBuf->buf, 
@@ -1739,6 +1740,8 @@ void StrBuf_RFC822_to_Utf8(StrBuf *Target, StrBuf *DecodeMe, const StrBuf* Defau
 
        ConvertBuf2 = NewStrBufPlain(NULL, StrLength(DecodeMe));
 
+       if (start != DecodeMe->buf)
+               StrBufAppendBufPlain(Target, DecodeMe->buf, start - DecodeMe->buf, 0);
        /*
         * Since spammers will go to all sorts of absurd lengths to get their
         * messages through, there are LOTS of corrupt headers out there.