bug #38075 esmtp error not being thrown properly (Anton Zagorskii)

fabpot · fabpot · commit 088b818797d5 · 2020-09-06T19:12:31.000+02:00
This PR was submitted for the master branch but it was merged into the 4.4 branch instead. Discussion ---------- esmtp error not being thrown properly | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a | License | MIT | Doc PR | n/a This is the same fix as #32895 but for esmtp transport Commits ------- 976eea3 esmtp error not being thrown properly
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -166,7 +166,11 @@ private function handleAuth(array $modes): void
 
                 return;
             } catch (TransportExceptionInterface $e) {
-                $this->executeCommand("RSET\r\n", [250]);
+                try {
+                    $this->executeCommand("RSET\r\n", [250]);
+                } catch (TransportExceptionInterface $_) {
+                    // ignore this exception as it probably means that the server error was final
+                }
 
                 // keep the error message, but tries the other authenticators
                 $errors[$authenticator->getAuthKeyword()] = $e;
