Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 09:07:59 +01:00
Code Issues Projects Releases Wiki Activity

External Libraries: Upgrade PHPMailer to version 6.9.3.

Browse Source 
This is a maintenance release, adding support for the release version of PHP 8.4, and experimental support for PHP 8.5.

References:
* [https://github.com/PHPMailer/PHPMailer/releases/tag/v6.9.3 PHPMailer 6.9.3 release notes]
* [https://github.com/PHPMailer/PHPMailer/compare/v6.9.2...v6.9.3 Full list of changes in PHPMailer 6.9.3]

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

Props desrosj, yogeshbhutkar, ayeshrajans.
Fixes #62632.
Built from https://develop.svn.wordpress.org/trunk@59481


git-svn-id: http://core.svn.wordpress.org/trunk@58867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-12-03 15:22:18 +00:00
parent ab2697f8bf
commit a319916e26
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/PHPMailer/PHPMailer.php
View File

@ -253,7 +253,7 @@ class PHPMailer
* You can set your own, but it must be in the format "<id@domain>", * You can set your own, but it must be in the format "<id@domain>",
* as defined in RFC5322 section 3.6.4 or it will be ignored. * as defined in RFC5322 section 3.6.4 or it will be ignored.
* *
* @see https://tools.ietf.org/html/rfc5322#section-3.6.4 * @see https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
* *
* @var string * @var string
*/ */
@ -387,7 +387,7 @@ class PHPMailer
* 'DELAY' will notify you if there is an unusual delay in delivery, but the actual * 'DELAY' will notify you if there is an unusual delay in delivery, but the actual
* delivery's outcome (success or failure) is not yet decided. * delivery's outcome (success or failure) is not yet decided.
* *
* @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY * @see https://www.rfc-editor.org/rfc/rfc3461.html#section-4.1 for more information about NOTIFY
*/ */
public $dsn = ''; public $dsn = '';
@ -756,7 +756,7 @@ class PHPMailer
* *
* @var string * @var string
*/ */
const VERSION = '6.9.2'; const VERSION = '6.9.3';
/** /**
* Error severity: message only, continue processing. * Error severity: message only, continue processing.
@ -1873,7 +1873,7 @@ class PHPMailer
*/ */
protected static function isPermittedPath($path) protected static function isPermittedPath($path)
{ {
//Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1 //Matches scheme definition from https://www.rfc-editor.org/rfc/rfc3986#section-3.1
return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path); return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
} }
@ -2707,7 +2707,7 @@ class PHPMailer
} }
//Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4 //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
//https://tools.ietf.org/html/rfc5322#section-3.6.4 //https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
if ( if (
'' !== $this->MessageID && '' !== $this->MessageID &&
preg_match( preg_match(
@ -4912,7 +4912,7 @@ class PHPMailer
* Uses the 'relaxed' algorithm from RFC6376 section 3.4.2. * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
* Canonicalized headers should *always* use CRLF, regardless of mailer setting. * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
* *
* @see https://tools.ietf.org/html/rfc6376#section-3.4.2 * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.2
* *
* @param string $signHeader Header * @param string $signHeader Header
* *
@ -4924,7 +4924,7 @@ class PHPMailer
$signHeader = static::normalizeBreaks($signHeader, self::CRLF); $signHeader = static::normalizeBreaks($signHeader, self::CRLF);
//Unfold header lines //Unfold header lines
//Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]` //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
//@see https://tools.ietf.org/html/rfc5322#section-2.2 //@see https://www.rfc-editor.org/rfc/rfc5322#section-2.2
//That means this may break if you do something daft like put vertical tabs in your headers. //That means this may break if you do something daft like put vertical tabs in your headers.
$signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader); $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
//Break headers out into an array //Break headers out into an array
@ -4956,7 +4956,7 @@ class PHPMailer
* Uses the 'simple' algorithm from RFC6376 section 3.4.3. * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
* Canonicalized bodies should *always* use CRLF, regardless of mailer setting. * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
* *
* @see https://tools.ietf.org/html/rfc6376#section-3.4.3 * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.3
* *
* @param string $body Message Body * @param string $body Message Body
* *
@ -4992,7 +4992,7 @@ class PHPMailer
$DKIMquery = 'dns/txt'; //Query method $DKIMquery = 'dns/txt'; //Query method
$DKIMtime = time(); $DKIMtime = time();
//Always sign these headers without being asked //Always sign these headers without being asked
//Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1 //Recommended list from https://www.rfc-editor.org/rfc/rfc6376#section-5.4.1
$autoSignHeaders = [ $autoSignHeaders = [
'from', 'from',
'to', 'to',
@ -5098,7 +5098,7 @@ class PHPMailer
} }
//The DKIM-Signature header is included in the signature *except for* the value of the `b` tag //The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
//which is appended after calculating the signature //which is appended after calculating the signature
//https://tools.ietf.org/html/rfc6376#section-3.5 //https://www.rfc-editor.org/rfc/rfc6376#section-3.5
$dkimSignatureHeader = 'DKIM-Signature: v=1;' . $dkimSignatureHeader = 'DKIM-Signature: v=1;' .
' d=' . $this->DKIM_domain . ';' . ' d=' . $this->DKIM_domain . ';' .
' s=' . $this->DKIM_selector . ';' . static::$LE . ' s=' . $this->DKIM_selector . ';' . static::$LE .

12
wp-includes/PHPMailer/SMTP.php
View File

@ -35,7 +35,7 @@ class SMTP
* *
* @var string * @var string
*/ */
const VERSION = '6.9.2'; const VERSION = '6.9.3';
/** /**
* SMTP line break constant. * SMTP line break constant.
@ -62,7 +62,7 @@ class SMTP
* The maximum line length allowed by RFC 5321 section 4.5.3.1.6, * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
* *excluding* a trailing CRLF break. * *excluding* a trailing CRLF break.
* *
* @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6 * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.6
* *
* @var int * @var int
*/ */
@ -72,7 +72,7 @@ class SMTP
* The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5, * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
* *including* a trailing CRLF line break. * *including* a trailing CRLF line break.
* *
* @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5 * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.5
* *
* @var int * @var int
*/ */
@ -373,7 +373,7 @@ class SMTP
} }
//Anything other than a 220 response means something went wrong //Anything other than a 220 response means something went wrong
//RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
//https://tools.ietf.org/html/rfc5321#section-3.1 //https://www.rfc-editor.org/rfc/rfc5321#section-3.1
if ($responseCode === 554) { if ($responseCode === 554) {
$this->quit(); $this->quit();
} }
@ -582,7 +582,7 @@ class SMTP
} }
//Send encoded username and password //Send encoded username and password
if ( if (
//Format from https://tools.ietf.org/html/rfc4616#section-2 //Format from https://www.rfc-editor.org/rfc/rfc4616#section-2
//We skip the first field (it's forgery), so the string starts with a null byte //We skip the first field (it's forgery), so the string starts with a null byte
!$this->sendCommand( !$this->sendCommand(
'User & Password', 'User & Password',
@ -795,7 +795,7 @@ class SMTP
//Send the lines to the server //Send the lines to the server
foreach ($lines_out as $line_out) { foreach ($lines_out as $line_out) {
//Dot-stuffing as per RFC5321 section 4.5.2 //Dot-stuffing as per RFC5321 section 4.5.2
//https://tools.ietf.org/html/rfc5321#section-4.5.2 //https://www.rfc-editor.org/rfc/rfc5321#section-4.5.2
if (!empty($line_out) && $line_out[0] === '.') { if (!empty($line_out) && $line_out[0] === '.') {
$line_out = '.' . $line_out; $line_out = '.' . $line_out;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.8-alpha-59480'; $wp_version = '6.8-alpha-59481';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.