[Mailer] fixed SMTP support when a message cannot be sent

Author: fabpot

Smtp/SmtpTransport.php

@@ -111,7 +111,13 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
             $this->start();
         }
 
-        $message = parent::send($message, $envelope);
+        try {
+            $message = parent::send($message, $envelope);
+        } catch (TransportExceptionInterface $e) {
+            $this->executeCommand("RSET\r\n", [250]);
+
+            throw $e;
+        }
 
         $this->checkRestartThreshold();
 

SmtpTransport.php

@@ -111,7 +111,13 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
             $this->start();
         }
 
-        $message = parent::send($message, $envelope);
+        try {
+            $message = parent::send($message, $envelope);
+        } catch (TransportExceptionInterface $e) {
+            $this->executeCommand("RSET\r\n", [250]);
+
+            throw $e;
+        }
 
         $this->checkRestartThreshold();
 

Transport/Smtp/SmtpTransport.php

@@ -111,7 +111,13 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
             $this->start();
         }
 
-        $message = parent::send($message, $envelope);
+        try {
+            $message = parent::send($message, $envelope);
+        } catch (TransportExceptionInterface $e) {
+            $this->executeCommand("RSET\r\n", [250]);
+
+            throw $e;
+        }
 
         $this->checkRestartThreshold();