fix a couple of regressionsv2.3.2

git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2931 7b491191-dbf0-0310-aff6-d879d4d69008

2 files changed, 34 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 75da4447..78c5a8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2008-01-20  Paul J Stevens <paul@nfg.nl>
+
+	* src/dbmail-message.c:
+	fix a couple of regressions
+
+2008-01-19  Paul Stevens <paul@nfg.nl>
+
+	* src/dbmail-message.c:
+	call register_header from dbmail_message_set_header (aaron)
+	* src/dbmail-message.c:
+	ignore content-type headers hidden inside headervalues during message 
+	reconstruction
+
+2008-01-18  Paul Stevens <paul@nfg.nl>
+
+	* ChangeLog, debian/changelog, test-scripts/testimap.py:
+	update test
+	* src/dbmail-imapsession.c:
+	remove faulty assertion
+	* src/server.c, src/serverpool.c:
+	startup the processpool properly
+	* src/dbmail-mailbox.c:
+	ignore purged messages
+	* ChangeLog, src/dbmail-mailbox.c:
+	fix opening empty mailboxes
+	* src/dbmail-imapsession.c:
+	fix _fetch_headers
+
 2008-01-18  Paul J Stevens <paul@nfg.nl>
 
 	* test-scripts/testimap.py:
diff --git a/src/dbmail-message.c b/src/dbmail-message.c
index ce2a92c1..fcdb9932 100644
--- a/src/dbmail-message.c
+++ b/src/dbmail-message.c
@@ -282,7 +282,11 @@ static const char * find_boundary(const char *s)
 
 	memset(header,0,sizeof(header));
 
-	rest = g_strcasestr(s, "\nContent-type:");
+	rest = g_strcasestr(s, "\nContent-type: ");
+	if (! rest) {
+		if ((g_strncasecmp(s, "Content-type: ", 14)) == 0)
+			rest = (char *)s;
+	}
 	if (! rest)
 		return NULL;
 
@@ -920,7 +924,7 @@ static void _register_header(const char *header, const char *value, gpointer use
 		hvalue = value;
 	}
 	
-	if (! g_relation_exists(m->headers, hname, hvalue))
+	if (m->headers && (! g_relation_exists(m->headers, hname, hvalue)))
 		g_relation_insert(m->headers, hname, hvalue);
 }