Skip to content

Merging internal commits for release/9.0 #120719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 14, 2025
Merged

Merging internal commits for release/9.0 #120719

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
615ee7d
Don't attempt HELO if EnableTls is true.
rzikm Jun 11, 2025
8d14117
Merge commit '6defb92f2151ea3f6bff4c850dd4f34f25d7f4b0'
Sep 4, 2025
18e28d7
[release/9.0] SmtpClient - Don't attempt HELO if EnableSsl is true
rzikm Sep 5, 2025
be73917
Merge commit 'ef77bd6e2c65738ae792e552c7dfd0fffd1ec229'
Sep 9, 2025
3c48d7c
Merge commit 'f26e4f18576a9298976df57b14502be46c03db7a'
Sep 10, 2025
11f875f
Merge commit '1aed58f86a16a65d88c5469ed34ccef6ff143d43'
Sep 15, 2025
b317337
Merge commit 'ae38547ca7c94580379b62be534e8acc08c938b8'
Sep 17, 2025
79ba1ea
Merge commit '6d96e28597e7da0d790d495ba834cc4908e442cd'
Sep 17, 2025
af15b36
Merge commit '7501cab0f095539c5c6fe1096db54593f8253776'
Sep 22, 2025
cbe90b1
Merge commit 'c1ef1f1fa52d6585a19ce1becc261d4575dfa0fe'
Sep 23, 2025
2eb9097
Merge commit '078434b7fd6721b2823be6907a83fa8d9b5a3715'
Sep 24, 2025
e1f1988
Merge commit 'fe023f17474aab631c9ee8caeabfae03af46689b'
Sep 25, 2025
16550dd
Merge commit 'e1f19886fe3354963a4a790c896b3f99689fd7a5' into internal…
vseanreesermsft Oct 14, 2025
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
8 changes: 8 additions & 0 deletions src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,14 @@ private static void SendEHelloCallback(IAsyncResult result)

private bool SendHello()
{
if (_connection._enableSsl)
{
// We only try HELO command if EHLO was not recognized. Server cannot
// advertise STARTTLS in older HELO command, thus if TLS is required,
// we can fail early.
throw new SmtpException(SR.MailServerDoesNotSupportStartTls);
}

IAsyncResult result = HelloCommand.BeginSend(_connection, _connection._client!._clientDomain, s_sendHelloCallback, this);
//if ehello isn't supported, assume basic auth
if (result.CompletedSynchronously)
Expand Down
Loading