aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-13 19:47:29 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-13 19:47:29 +0000
commit5a5666d1407b7a42dc8a87869d29cbcd8582d247 (patch)
treed54e1a401b3cc93f4ffce01aecbd574ecbfc75ca /apps
parent40a5f668411ecb31097bd3770aeb05621e6c7127 (diff)
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) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69182 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index a11de6e9d..801a8702d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2056,10 +2056,10 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
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 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
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);