diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
index 9a5b214590047..61b3a0e157b17 100644
--- a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -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);
@@ -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]);
+ $this->capabilities = $this->parseCapabilities($response);
}
if (\array_key_exists('AUTH', $this->capabilities)) {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy