Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ private void SendCompletedWaitCallback(object? operationState)
public void Send(string from, string recipients, string? subject, string? body)
{
ObjectDisposedException.ThrowIf(_disposed, this);
//validation happends in MailMessage constructor
//validation happens in MailMessage constructor
MailMessage mailMessage = new MailMessage(from, recipients, subject, body);
Send(mailMessage);
}
Expand Down Expand Up @@ -502,15 +502,15 @@ public void Send(MailMessage message)
throw new SmtpException(SR.SmtpPickupDirectoryDoesnotSupportSsl);
}

allowUnicode = IsUnicodeSupported(); // Determend by the DeliveryFormat paramiter
allowUnicode = IsUnicodeSupported(); // Determined by the DeliveryFormat parameter
ValidateUnicodeRequirement(message, recipients, allowUnicode);
writer = GetFileMailWriter(pickupDirectory);
break;

case SmtpDeliveryMethod.Network:
default:
GetConnection();
// Detected durring GetConnection(), restrictable using the DeliveryFormat paramiter
// Detected during GetConnection(), restrictable using the DeliveryFormat parameter
allowUnicode = IsUnicodeSupported();
ValidateUnicodeRequirement(message, recipients, allowUnicode);
writer = _transport.SendMail(message.Sender ?? message.From, recipients,
Expand Down Expand Up @@ -922,7 +922,7 @@ private void SendMailCallback(IAsyncResult result)
try
{
_writer = _transport.EndSendMail(result);
// If some recipients failed but not others, send the e-mail anyways, but then return the
// If some recipients failed but not others, send the e-mail anyway, but then return the
// "Non-fatal" exception reporting the failures. The sync code path does it this way.
// Fatal exceptions would have thrown above at transport.EndSendMail(...)
SendMailAsyncResult sendResult = (SendMailAsyncResult)result;
Expand Down Expand Up @@ -964,7 +964,7 @@ private void ConnectCallback(IAsyncResult result)
}
else
{
// Detected durring Begin/EndGetConnection, restrictable using DeliveryFormat
// Detected during Begin/EndGetConnection, restrictable using DeliveryFormat
bool allowUnicode = IsUnicodeSupported();
ValidateUnicodeRequirement(_message!, _recipients!, allowUnicode);
_transport.BeginSendMail(_message!.Sender ?? _message.From!, _recipients!,
Expand Down