<!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>[53535] trunk/src/wp-includes/PHPMailer: External Libraries: Upgrade PHPMailer to version 6.6.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/53535">53535</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/53535","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>2022-06-20 15:02:32 +0000 (Mon, 20 Jun 2022)</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.6.3.
This is a maintenance release with minor CS improvements.
Release notes:
https://github.com/PHPMailer/PHPMailer/releases/tag/v6.6.3
For a full list of changes in this update, see the PHPMailer GitHub:
https://github.com/PHPMailer/PHPMailer/compare/v6.6.2...v6.6.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>.
Props jrf, Synchro.
Fixes <a href="https://core.trac.wordpress.org/ticket/56016">#56016</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 2022-06-20 14:58:45 UTC (rev 53534)
+++ trunk/src/wp-includes/PHPMailer/PHPMailer.php 2022-06-20 15:02:32 UTC (rev 53535)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,7 +750,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.6.2';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.6.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">@@ -1557,17 +1557,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //Validate From, Sender, and ConfirmReadingTo addresses
</span><span class="cx" style="display: block; padding: 0 10px"> foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->$address_kind = trim($this->$address_kind);
- if (empty($this->$address_kind)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->{$address_kind} = trim($this->{$address_kind});
+ if (empty($this->{$address_kind})) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
- if (!static::validateAddress($this->$address_kind)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->{$address_kind} = $this->punyencodeAddress($this->{$address_kind});
+ if (!static::validateAddress($this->{$address_kind})) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error_message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s (%s): %s',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->lang('invalid_address'),
</span><span class="cx" style="display: block; padding: 0 10px"> $address_kind,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->$address_kind
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->{$address_kind}
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setError($error_message);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->edebug($error_message);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1667,7 +1667,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> $sendMethod = $this->Mailer . 'Send';
</span><span class="cx" style="display: block; padding: 0 10px"> if (method_exists($this, $sendMethod)) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->{$sendMethod}($this->MIMEHeader, $this->MIMEBody);
</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"> return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2202,7 +2202,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //As we've caught all exceptions, just report whatever the last one was
</span><span class="cx" style="display: block; padding: 0 10px"> if ($this->exceptions && null !== $lastexception) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw $lastexception;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ($this->exceptions) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ($this->exceptions) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // no exception was thrown, likely $this->smtp->connect() failed
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $this->getSmtpErrorMessage('connect_host');
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception($message);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3715,20 +3716,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * These differ from 'regular' attachments in that they are intended to be
</span><span class="cx" style="display: block; padding: 0 10px"> * displayed inline with the message, not just attached for download.
</span><span class="cx" style="display: block; padding: 0 10px"> * This is used in HTML messages that embed the images
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * the HTML refers to using the $cid value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * the HTML refers to using the `$cid` value in `img` tags, for example `<img src="cid:mylogo">`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Never use a user-supplied path to a file!
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Path to the attachment
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $cid Content ID of the attachment; Use this to reference
</span><span class="cx" style="display: block; padding: 0 10px"> * the content when using an embedded image in HTML
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $name Overrides the attachment name
- * @param string $encoding File encoding (see $Encoding)
- * @param string $type File MIME type
- * @param string $disposition Disposition to use
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $name Overrides the attachment filename
+ * @param string $encoding File encoding (see $Encoding) defaults to `base64`
+ * @param string $type File MIME type (by default mapped from the `$path` filename's extension)
+ * @param string $disposition Disposition to use: `inline` (default) or `attachment`
+ * (unlikely you want this – {@see `addAttachment()`} instead)
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True on successfully adding an attachment
</ins><span class="cx" style="display: block; padding: 0 10px"> * @throws Exception
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True on successfully adding an attachment
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function addEmbeddedImage(
</span><span class="cx" style="display: block; padding: 0 10px"> $path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4106,12 +4108,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //Is it a valid IPv4 address?
</span><span class="cx" style="display: block; padding: 0 10px"> return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false) {
- //Is it a syntactically valid hostname?
- return true;
- }
-
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //Is it a syntactically valid hostname (when embeded in a URL)?
+ return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4581,7 +4579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function set($name, $value = '')
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> if (property_exists($this, $name)) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->$name = $value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->{$name} = $value;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2022-06-20 14:58:45 UTC (rev 53534)
+++ trunk/src/wp-includes/PHPMailer/SMTP.php 2022-06-20 15:02:32 UTC (rev 53535)
</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.6.2';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.6.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></pre>
</div>
</div>
</body>
</html>