Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
Jo Shields
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions

View File

@ -550,8 +550,12 @@ namespace System.Net.Mail {
MailAddress from = message.From;
if (from == null)
from = defaultFrom;
SendHeader (HeaderName.Date, DateTime.Now.ToString ("ddd, dd MMM yyyy HH':'mm':'ss zzz", DateTimeFormatInfo.InvariantInfo));
string dt = DateTime.Now.ToString("ddd, dd MMM yyyy HH':'mm':'ss zzz", DateTimeFormatInfo.InvariantInfo);
// remove ':' from time zone offset (e.g. from "+01:00")
dt = dt.Remove(dt.Length - 3, 1);
SendHeader(HeaderName.Date, dt);
SendHeader (HeaderName.From, EncodeAddress(from));
SendHeader (HeaderName.To, EncodeAddresses(message.To));
if (message.CC.Count > 0)
@ -762,7 +766,7 @@ namespace System.Net.Mail {
static void SendMailAsyncCompletedHandler (TaskCompletionSource<object> source, AsyncCompletedEventArgs e, SendCompletedEventHandler handler, SmtpClient client)
{
if (handler != e.UserState)
if ((object) handler != e.UserState)
return;
client.SendCompleted -= handler;