8000 [Mailer] Fix error message in case of an SMTP error by fabpot · Pull Request #47162 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Mailer] Fix error message in case of an SMTP error #47162

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 1 commit into from
Aug 3, 2022
Merged

[Mailer] Fix error message in case of an SMTP error #47162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,16 @@ private function doEhloCommand(): string
{
try {
$response = $this->executeCommand(sprintf("EHLO %s\r\n", $this->getLocalDomain()), [250]);
} catch (TransportExceptionInterface) {
return parent::executeCommand(sprintf("HELO %s\r\n", $this->getLocalDomain()), [250]);
} catch (TransportExceptionInterface $e) {
try {
return parent::executeCommand(sprintf("HELO %s\r\n", $this->getLocalDomain()), [250]);
} catch (TransportExceptionInterface $ex) {
if (!$ex->getCode()) {
throw $e;
}

throw $ex;
}
}

$this->capabilities = $this->parseCapabilities($response);
Expand All @@ -132,12 +140,8 @@ private function doEhloCommand(): string
throw new TransportException('Unable to connect with STARTTLS.');
}

try {
$response = $this->executeCommand(sprintf("EHLO %s\r\n", $this->getLocalDomain()), [250]);
$this->capabilities = $this->parseCapabilities($response);
} catch (TransportExceptionInterface) {
return parent::executeCommand(sprintf("HELO %s\r\n", $this->getLocalDomain()), [250]);
}
$response = $this->executeCommand(sprintf("EHLO %s\r\n", $this->getLocalDomain()), [250]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we no longer need to catch transport exceptions anymore here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, we know that EHLO is supported, so there is no need to fall back to HELO.

$this->capabilities = $this->parseCapabilities($response);
}

if (\array_key_exists('AUTH', $this->capabilities)) {
Expand Down
0