From: Ben Schmidt <none@none>
Date: Sun, 19 Sep 2010 15:41:32 +0000 (+1000)
Subject: Fix Content-Transfer-Encoding: header for digests,
X-Git-Tag: RELEASE_1_2_18a1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61da047b7af3985bbdd126bb3cf1d348c0205bd4;p=thirdparty%2Fmlmmj.git

Fix Content-Transfer-Encoding: header for digests,
and always close digest listtext
---

diff --git a/ChangeLog b/ChangeLog
index 299ce69d..ce826714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+ o Ensure digest listtext is always closed
+ o Fix Content-Transfer-Encoding: header for digests
  o Fixed a bug that could cause a crash if $posteraddr$ appeared in the
    maxmaiilsize listtext
  o Documented listtexts
diff --git a/src/send_digest.c b/src/send_digest.c
index 46c77b27..127b15f7 100644
--- a/src/send_digest.c
+++ b/src/send_digest.c
@@ -321,7 +321,7 @@ errdighdrs:
 
 		tmp = concatstr(3, "\n--", boundary,
 				"\nContent-Type: text/plain; charset=UTF-8"
-				"\nContent-Encoding: 8bit"
+				"\nContent-Transfer-Encoding: 8bit"
 				"\n\n");
 		if (writen(fd, tmp, strlen(tmp)) == -1) {
 			log_error(LOG_ARGS, "Could not write digest text/plain"
@@ -375,6 +375,8 @@ errdighdrs:
 			} while ((line = mygetline(txtfd)));
 		}
 
+		close(txtfd);
+	} else if (txtfd > 0) {
 		close(txtfd);
 	}