From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 11 Jan 2021 10:51:23 +0000 (+0100)
Subject: Disconnect SMTP session for all types of Exception during connect / auth
X-Git-Tag: 5.3.3~30^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dfe29b71478b39e1e66a3e51cc4c56258575cf80;p=GitHub%2FWoltLab%2FWCF.git

Disconnect SMTP session for all types of Exception during connect / auth
---

diff --git a/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php b/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php
index 54e9d6202d..d68d456d58 100644
--- a/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php
+++ b/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php
@@ -388,7 +388,6 @@ class SmtpEmailTransport implements IEmailTransport {
 	 * @param	Mailbox		$envelopeTo
 	 * @throws	\Exception
 	 * @throws	PermanentFailure
-	 * @throws	SystemException
 	 */
 	public function deliver(Email $email, Mailbox $envelopeFrom, Mailbox $envelopeTo) {
 		// delivery is locked
@@ -407,7 +406,7 @@ class SmtpEmailTransport implements IEmailTransport {
 				$this->disconnect();
 				throw $e;
 			}
-			catch (SystemException $e) {
+			catch (\Exception $e) {
 				$this->disconnect();
 				throw $e;
 			}