From: Wilfried Goesgens <dothebart@citadel.org>
Date: Fri, 6 Apr 2012 21:20:29 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.11~105
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=5922d6ab5d9d36dafabcf0c5a01499be0f9d2f42;hp=91a9b8806b53105a54a4bc83bb40d68b5d6f0b6d;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 2be5e1f74..f6cb345a0 100644
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -5,23 +5,16 @@
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
- * 
- * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * 
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
-
 /*
  * RSS feed generator -- do one message
  */
@@ -86,6 +79,19 @@ void feed_rss_one_message(long msgnum) {
 		in_messagetext = 0;
 		while (StrBufSipLine(Line, ServerResponse, &BufPtr), ((BufPtr!=StrBufNOTNULL)&&(BufPtr!=NULL)) ) {
 			safestrncpy(buf, ChrPtr(Line), sizeof buf);
+
+			/* XML parsers can be picky; strip out nonprintable header characters */
+			if ((strlen(buf)>=6) && (buf[4]=='=')) {
+				char *p = &buf[5];
+				while (*p) {
+					if (!isprint(*p)) {
+						*p = 0;
+					}
+					++p;
+				}
+			}
+
+			/* Now output fields */
 			if (in_body) {
 				if (in_messagetext) {
 					StrBufAppendBufPlain(messagetext, buf, -1, 0);
@@ -141,6 +147,7 @@ void feed_rss_one_message(long msgnum) {
 	return;
 }
 
+
 /*
  * RSS feed generator -- go through the message list
  */