--- a/wp/wp-includes/PHPMailer/SMTP.php Wed Sep 21 18:19:35 2022 +0200
+++ b/wp/wp-includes/PHPMailer/SMTP.php Tue Sep 27 16:37:53 2022 +0200
@@ -35,7 +35,7 @@
*
* @var string
*/
- const VERSION = '6.5.0';
+ const VERSION = '6.6.0';
/**
* SMTP line break constant.
@@ -187,6 +187,7 @@
'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
+ 'Mailjet' => '/[\d]{3} OK queued as (.*)/',
];
/**
@@ -392,7 +393,6 @@
STREAM_CLIENT_CONNECT,
$socket_context
);
- restore_error_handler();
} else {
//Fall back to fsockopen which should work in more places, but is missing some features
$this->edebug(
@@ -407,8 +407,8 @@
$errstr,
$timeout
);
- restore_error_handler();
}
+ restore_error_handler();
//Verify we connected properly
if (!is_resource($connection)) {
@@ -483,7 +483,7 @@
* @param string $username The user name
* @param string $password The password
* @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
- * @param OAuth $OAuth An optional OAuth instance for XOAUTH2 authentication
+ * @param OAuthTokenProvider $OAuth An optional OAuthTokenProvider instance for XOAUTH2 authentication
*
* @return bool True if successfully authenticated
*/
@@ -696,7 +696,7 @@
/**
* Send an SMTP DATA command.
* Issues a data command and sends the msg_data to the server,
- * finializing the mail transaction. $msg_data is the message
+ * finalizing the mail transaction. $msg_data is the message
* that is to be send with the headers. Each header needs to be
* on a single line followed by a <CRLF> with the message headers
* and the message body being separated by an additional <CRLF>.
@@ -1170,7 +1170,7 @@
if (!$this->server_caps) {
$this->setError('No HELO/EHLO was sent');
- return;
+ return null;
}
if (!array_key_exists($name, $this->server_caps)) {
@@ -1182,7 +1182,7 @@
}
$this->setError('HELO handshake was used; No information about server extensions available');
- return;
+ return null;
}
return $this->server_caps[$name];