[asterisk-commits] mmichelson: trunk r69182 - in /trunk: ./ apps/app_voicemail.c

[asterisk-commits at lists.digium.com]

Author: mmichelson
Date: Wed Jun 13 14:47:29 2007
New Revision: 69182

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69182
Log:
Merged revisions 69181 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69181 | mmichelson | 2007-06-13 14:41:13 -0500 (Wed, 13 Jun 2007) | 5 lines

Contains a patch for fixing an encoding problem when using Outlook to view voicemail emails and attachments.
This fix has also been tested on Thunderbird, Evolution, Pine, and Mutt.
(Issue 9336, reported by marwick, patched by mutterc)


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=69182&r1=69181&r2=69182
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Jun 13 14:47:29 2007
@@ -2056,10 +2056,10 @@
 	fprintf(p, "MIME-Version: 1.0" ENDL);
 	if (attach_user_voicemail) {
 		/* Something unique. */
-		snprintf(bound, sizeof(bound), "voicemail_%d%s%d%d", msgnum + 1, mailbox, getpid(), (unsigned int)ast_random());
-
-		fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"" ENDL ENDL ENDL, bound);
-
+		snprintf(bound, sizeof(bound), "----voicemail_%d%s%d%d", msgnum + 1, mailbox, getpid(), (unsigned int)ast_random());
+
+		fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"" ENDL, bound);
+		fprintf(p, ENDL ENDL "This is a multi-part message in MIME format." ENDL ENDL);
 		fprintf(p, "--%s" ENDL, bound);
 	}
 	fprintf(p, "Content-Type: text/plain; charset=%s" ENDL "Content-Transfer-Encoding: 8bit" ENDL ENDL, charset);
@@ -2110,7 +2110,7 @@
 		fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.%s\"" ENDL ENDL, msgnum + 1, format);
 		snprintf(fname, sizeof(fname), "%s.%s", attach, format);
 		base_encode(fname, p);
-		fprintf(p, ENDL ENDL "--%s--" ENDL "." ENDL, bound);
+		fprintf(p, ENDL "--%s--" ENDL "." ENDL, bound);
 		if (tmpfd > -1)
 			close(tmpfd);
 		unlink(newtmp);