Changeset 57137

Timestamp:

11/26/2023 07:25:50 PM (8 months ago)

Author:

SergeyBiryukov

Message:

External Libraries: Upgrade PHPMailer to version 6.9.1.

This is a maintenance and feature release, adding support for the official release of PHP 8.3, methods for removing and replacing custom headers, XCLIENT support, and links to a new way of implementing XOAUTH2 authentication.

The only change likely to have any impact on existing code is that PHPMailer previously attempted to use opportunistic STARTTLS encryption when connecting to localhost, which was unlikely to work. The workaround required setting SMTPAutoTLS = false, but that's no longer required. You may still need to use this setting when connecting to literal IPs.

References:

• ​PHPMailer 6.9.1 release notes
• ​Full list of changes in PHPMailer 6.9.1

Follow-up to [50628], [50799], [51169], [51634], [51635], [52252], [52749], [52811], [53500], [53535], [53917], [54427], [54937], [55557], [56484].

Props jrf, Synchro.
Fixes #59966.

Location:

trunk/src/wp-includes/PHPMailer

Files:

• PHPMailer.php (modified) (7 diffs)
• SMTP.php (modified) (3 diffs)

trunk/src/wp-includes/PHPMailer/PHPMailer.php

@@ -359 +359 @@
 
     /**
+
+
+
+
+
+
+
      * An implementation of the PHPMailer OAuthTokenProvider interface.
      *
@@ -751 +758 @@
      * @var string
      */
-    const VERSION = '6.8.1';
+    const VERSION = '6..1';
 
     /**
@@ -1574 +1581 @@
             //Validate From, Sender, and ConfirmReadingTo addresses
             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
+
+
+
+
                 $this->{$address_kind} = trim($this->{$address_kind});
                 if (empty($this->{$address_kind})) {
@@ -2001 +2012 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Send mail via SMTP.
      * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
@@ -2027 +2070 @@
         } else {
             $smtp_from = $this->Sender;
+
+
+
         }
         if (!$this->smtp->mail($smtp_from)) {
@@ -2190 +2236 @@
                     //Automatically enable TLS encryption if:
                     //* it's not disabled
+
                     //* we have openssl extension
                     //* we are not already using SSL
                     //* the server offers STARTTLS
-                    if ($this->SMTPAutoTLS && $sslext && 'ssl' !== $secure && $this->smtp->getServerExt('STARTTLS')) {
+                    if (
+                        $this->SMTPAutoTLS &&
+                        $this->Host !== 'localhost' &&
+                        $sslext &&
+                        $secure !== 'ssl' &&
+                        $this->smtp->getServerExt('STARTTLS')
+                    ) {
                         $tls = true;
                     }
@@ -4051 +4104 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Add an error message to the error container.
      *

trunk/src/wp-includes/PHPMailer/SMTP.php

@@ -36 +36 @@
      * @var string
      */
-    const VERSION = '6.8.1';
+    const VERSION = '6..1';
 
     /**
@@ -197 +197 @@
         'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
         'Mailjet' => '/[\d]{3} OK queued as (.*)/',
+
+
+
+
+
+
+
+
+
+
+
+
     ];
 
@@ -973 +985 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Send an SMTP RSET command.
      * Abort any transaction that is currently in progress.