<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[59481] trunk/src/wp-includes/PHPMailer: External Libraries: Upgrade PHPMailer to version 6.9.3.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59481">59481</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59481","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-12-03 15:20:13 +0000 (Tue, 03 Dec 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>External Libraries: Upgrade PHPMailer to version 6.9.3.
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 <a href="https://core.trac.wordpress.org/changeset/50628">[50628]</a>, <a href="https://core.trac.wordpress.org/changeset/50799">[50799]</a>, <a href="https://core.trac.wordpress.org/changeset/51169">[51169]</a>, <a href="https://core.trac.wordpress.org/changeset/51634">[51634]</a>, <a href="https://core.trac.wordpress.org/changeset/51635">[51635]</a>, <a href="https://core.trac.wordpress.org/changeset/52252">[52252]</a>, <a href="https://core.trac.wordpress.org/changeset/52749">[52749]</a>, <a href="https://core.trac.wordpress.org/changeset/52811">[52811]</a>, <a href="https://core.trac.wordpress.org/changeset/53500">[53500]</a>, <a href="https://core.trac.wordpress.org/changeset/53535">[53535]</a>, <a href="https://core.trac.wordpress.org/changeset/53917">[53917]</a>, <a href="https://core.trac.wordpress.org/changeset/54427">[54427]</a>, <a href="https://core.trac.wordpress.org/changeset/54937">[54937]</a>, <a href="https://core.trac.wordpress.org/changeset/55557">[555
57]</a>, <a href="https://core.trac.wordpress.org/changeset/56484">[56484]</a>, <a href="https://core.trac.wordpress.org/changeset/57137">[57137]</a>, <a href="https://core.trac.wordpress.org/changeset/59246">[59246]</a>.
Props desrosj, yogeshbhutkar, ayeshrajans.
Fixes <a href="https://core.trac.wordpress.org/ticket/62632">#62632</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesPHPMailerPHPMailerphp">trunk/src/wp-includes/PHPMailer/PHPMailer.php</a></li>
<li><a href="#trunksrcwpincludesPHPMailerSMTPphp">trunk/src/wp-includes/PHPMailer/SMTP.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesPHPMailerPHPMailerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/PHPMailer/PHPMailer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/PHPMailer/PHPMailer.php 2024-12-02 23:34:02 UTC (rev 59480)
+++ trunk/src/wp-includes/PHPMailer/PHPMailer.php 2024-12-03 15:20:13 UTC (rev 59481)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * You can set your own, but it must be in the format "<id@domain>",
</span><span class="cx" style="display: block; padding: 0 10px"> * as defined in RFC5322 section 3.6.4 or it will be ignored.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,7 +387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'DELAY' will notify you if there is an unusual delay in delivery, but the actual
</span><span class="cx" style="display: block; padding: 0 10px"> * delivery's outcome (success or failure) is not yet decided.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://www.rfc-editor.org/rfc/rfc3461.html#section-4.1 for more information about NOTIFY
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $dsn = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,7 +756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const VERSION = '6.9.2';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.9.3';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Error severity: message only, continue processing.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1873,7 +1873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function isPermittedPath($path)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //Matches scheme definition from https://www.rfc-editor.org/rfc/rfc3986#section-3.1
</ins><span class="cx" style="display: block; padding: 0 10px"> return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2707,7 +2707,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //https://tools.ietf.org/html/rfc5322#section-3.6.4
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> '' !== $this->MessageID &&
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4912,7 +4912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
</span><span class="cx" style="display: block; padding: 0 10px"> * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.2
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $signHeader Header
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4924,7 +4924,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $signHeader = static::normalizeBreaks($signHeader, self::CRLF);
</span><span class="cx" style="display: block; padding: 0 10px"> //Unfold header lines
</span><span class="cx" style="display: block; padding: 0 10px"> //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //@see https://tools.ietf.org/html/rfc5322#section-2.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //@see https://www.rfc-editor.org/rfc/rfc5322#section-2.2
</ins><span class="cx" style="display: block; padding: 0 10px"> //That means this may break if you do something daft like put vertical tabs in your headers.
</span><span class="cx" style="display: block; padding: 0 10px"> $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
</span><span class="cx" style="display: block; padding: 0 10px"> //Break headers out into an array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4956,7 +4956,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
</span><span class="cx" style="display: block; padding: 0 10px"> * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see https://tools.ietf.org/html/rfc6376#section-3.4.3
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.3
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $body Message Body
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4992,7 +4992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $DKIMquery = 'dns/txt'; //Query method
</span><span class="cx" style="display: block; padding: 0 10px"> $DKIMtime = time();
</span><span class="cx" style="display: block; padding: 0 10px"> //Always sign these headers without being asked
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //Recommended list from https://www.rfc-editor.org/rfc/rfc6376#section-5.4.1
</ins><span class="cx" style="display: block; padding: 0 10px"> $autoSignHeaders = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'from',
</span><span class="cx" style="display: block; padding: 0 10px"> 'to',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5098,7 +5098,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> //The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
</span><span class="cx" style="display: block; padding: 0 10px"> //which is appended after calculating the signature
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //https://tools.ietf.org/html/rfc6376#section-3.5
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //https://www.rfc-editor.org/rfc/rfc6376#section-3.5
</ins><span class="cx" style="display: block; padding: 0 10px"> $dkimSignatureHeader = 'DKIM-Signature: v=1;' .
</span><span class="cx" style="display: block; padding: 0 10px"> ' d=' . $this->DKIM_domain . ';' .
</span><span class="cx" style="display: block; padding: 0 10px"> ' s=' . $this->DKIM_selector . ';' . static::$LE .
</span></span></pre></div>
<a id="trunksrcwpincludesPHPMailerSMTPphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/PHPMailer/SMTP.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/PHPMailer/SMTP.php 2024-12-02 23:34:02 UTC (rev 59480)
+++ trunk/src/wp-includes/PHPMailer/SMTP.php 2024-12-03 15:20:13 UTC (rev 59481)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const VERSION = '6.9.2';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.9.3';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * SMTP line break constant.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
</span><span class="cx" style="display: block; padding: 0 10px"> * *excluding* a trailing CRLF break.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.6
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
</span><span class="cx" style="display: block; padding: 0 10px"> * *including* a trailing CRLF line break.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.5
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> //Anything other than a 220 response means something went wrong
</span><span class="cx" style="display: block; padding: 0 10px"> //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //https://tools.ietf.org/html/rfc5321#section-3.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //https://www.rfc-editor.org/rfc/rfc5321#section-3.1
</ins><span class="cx" style="display: block; padding: 0 10px"> if ($responseCode === 554) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->quit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +582,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> //Send encoded username and password
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Format from https://tools.ietf.org/html/rfc4616#section-2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //Format from https://www.rfc-editor.org/rfc/rfc4616#section-2
</ins><span class="cx" style="display: block; padding: 0 10px"> //We skip the first field (it's forgery), so the string starts with a null byte
</span><span class="cx" style="display: block; padding: 0 10px"> !$this->sendCommand(
</span><span class="cx" style="display: block; padding: 0 10px"> 'User & Password',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,7 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //Send the lines to the server
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($lines_out as $line_out) {
</span><span class="cx" style="display: block; padding: 0 10px"> //Dot-stuffing as per RFC5321 section 4.5.2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //https://tools.ietf.org/html/rfc5321#section-4.5.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //https://www.rfc-editor.org/rfc/rfc5321#section-4.5.2
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!empty($line_out) && $line_out[0] === '.') {
</span><span class="cx" style="display: block; padding: 0 10px"> $line_out = '.' . $line_out;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>