Changeset 52252 for trunk/src/wp-includes/PHPMailer/SMTP.php

Timestamp:

11/26/2021 12:41:54 AM (3 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Upgrade PHPMailer to version 6.5.3.

The latest release includes official PHP 8.1 support, as well as some small bug fixes, including one for PHP 5.6 cross-version support.

Release notes:

• ​https://github.com/PHPMailer/PHPMailer/releases/tag/v6.5.2
• ​https://github.com/PHPMailer/PHPMailer/releases/tag/v6.5.3

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

Follow-up to [50628], [50799], [51169], [51634], [51635].

Props jrf, Synchro.
Fixes #54514.

File:

• trunk/src/wp-includes/PHPMailer/SMTP.php (modified) (6 diffs)

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

@@ -36 +36 @@
      * @var string
      */
-    const VERSION = '6.5.1';
+    const VERSION = '6.5.3';
 
     /**
@@ -393 +393 @@
                 $socket_context
             );
-            restore_error_handler();
         } else {
             //Fall back to fsockopen which should work in more places, but is missing some features
@@ -408 +407 @@
                 $timeout
             );
-            restore_error_handler();
-        }
+        }
+        restore_error_handler();
 
         //Verify we connected properly
@@ -697 +696 @@
      * 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
@@ -1171 +1170 @@
             $this->setError('No HELO/EHLO was sent');
 
-            return;
+            return null;
         }
 
@@ -1183 +1182 @@
             $this->setError('HELO handshake was used; No information about server extensions available');
 
-            return;
+            return null;
         }