forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

charset bug

This commit is contained in:
Adam D. Ruppe 2013-05-30 10:03:54 -04:00
parent 5d63348946
commit 48e3dc9ca7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
email.d
View File

@ -200,6 +200,9 @@ class EmailMessage {
void send(RelayInfo mailServer = RelayInfo("smtp://localhost")) { void send(RelayInfo mailServer = RelayInfo("smtp://localhost")) {
auto smtp = new SMTP(mailServer.server); auto smtp = new SMTP(mailServer.server);
smtp.verifyHost = false;
smtp.verifyPeer = false;
// smtp.verbose = true; // smtp.verbose = true;
if(mailServer.username.length) if(mailServer.username.length)
smtp.setAuthentication(mailServer.username, mailServer.password); smtp.setAuthentication(mailServer.username, mailServer.password);
@ -392,7 +395,7 @@ class MimePart {
if(type.indexOf("text/") == 0) { if(type.indexOf("text/") == 0) {
if(charset.length == 0) if(charset.length == 0)
charset = "latin1"; charset = "latin1";
textContent = convertToUtf8(content, charset); textContent = convertToUtf8Lossy(content, charset);
} }
} }
} }
@ -573,7 +576,7 @@ class IncomingEmailMessage {
lineLoop: while(mboxLines.length) { lineLoop: while(mboxLines.length) {
// this can needlessly convert headers too, but that won't harm anything since they are 7 bit anyway // this can needlessly convert headers too, but that won't harm anything since they are 7 bit anyway
auto line = convertToUtf8(mboxLines[0], charset); auto line = convertToUtf8Lossy(mboxLines[0], charset);
line = line.stripRight; line = line.stripRight;
final switch(state) { final switch(state) {
@ -684,9 +687,9 @@ class IncomingEmailMessage {
switch(contentTransferEncoding) { switch(contentTransferEncoding) {
case "quoted-printable": case "quoted-printable":
if(textMessageBody.length) if(textMessageBody.length)
textMessageBody = cast(string) decodeQuotedPrintable(textMessageBody); textMessageBody = convertToUtf8Lossy(decodeQuotedPrintable(textMessageBody), charset);
if(htmlMessageBody.length) if(htmlMessageBody.length)
htmlMessageBody = cast(string) decodeQuotedPrintable(htmlMessageBody); htmlMessageBody = convertToUtf8Lossy(decodeQuotedPrintable(htmlMessageBody), charset);
break; break;
default: default:
// nothing needed // nothing needed
@ -821,7 +824,7 @@ string decodeEncodedWord(string data) {
else else
return originalData; // wtf return originalData; // wtf
ret ~= convertToUtf8(decodedText, charset); ret ~= convertToUtf8Lossy(decodedText, charset);
} }
ret ~= data; // keep the rest since there could be trailing stuff ret ~= data; // keep the rest since there could be trailing stuff