Changeset 53917

Timestamp:

08/22/2022 12:24:30 PM (2 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Upgrade PHPMailer to version 6.6.4.

This is a maintenance release with minor changes:

• Add text/csv MIME type.
• Fix DKIM when sending to anonymous group via mail().

Release notes:
​https://github.com/PHPMailer/PHPMailer/releases/tag/v6.6.4

For a full list of changes in this update, see the PHPMailer GitHub:
​https://github.com/PHPMailer/PHPMailer/compare/v6.6.3...v6.6.4

Follow-up to [50628], [50799], [51169], [51634], [51635], [52252], [52749], [52811], [53500], [53535].

Props jrf, Synchro.
Fixes #56016.

Location:

trunk/src/wp-includes/PHPMailer

Files:

• PHPMailer.php (modified) (6 diffs)
• SMTP.php (modified) (1 diff)

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

@@ -351 +351 @@
 
     /**
-     * SMTP auth type.
-     * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
+     * SMTP authentication type. Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2.
+     * If not specified, the first one from that list that the server supports will be selected.
      *
      * @var string
@@ -751 +751 @@
      * @var string
      */
-    const VERSION = '6.6.3';
+    const VERSION = '6.6.4';
 
     /**
@@ -1097 +1097 @@
             return false;
         }
-        if ($name !== null) {
+        if ($name !== null && is_string($name)) {
             $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         } else {
@@ -1289 +1289 @@
     public function setFrom($address, $name = '', $auto = true)
     {
-        $address = trim($address);
+        $address = trim((string)$address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         //Don't validate now addresses with IDN. Will be done in send().
@@ -1894 +1894 @@
             $toArr[] = $this->addrFormat($toaddr);
         }
-        $to = implode(', ', $toArr);
+        $to = trim(implode(', ', $toArr));
+
+        //If there are no To-addresses (e.g. when sending only to BCC-addresses)
+        //the following should be added to get a correct DKIM-signature.
+        //Compare with $this->preSend()
+        if ($to === '') {
+            $to = 'undisclosed-recipients:;';
+        }
 
         $params = null;
@@ -4473 +4480 @@
             'xml' => 'text/xml',
             'xsl' => 'text/xml',
+            'csv' => 'text/csv',
             'wmv' => 'video/x-ms-wmv',
             'mpeg' => 'video/mpeg',

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

@@ -36 +36 @@
      * @var string
      */
-    const VERSION = '6.6.3';
+    const VERSION = '6.6.4';
 
     /**