<!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>[49713] trunk/src/wp-includes/PHPMailer: External Libraries: Upgrade PHPMailer to version 6.2.0.</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/49713">49713</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/49713","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>2020-11-30 17:08:24 +0000 (Mon, 30 Nov 2020)</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.2.0.
For a full list of changes in this update, see the PHPMailer GitHub:
https://github.com/PHPMailer/PHPMailer/compare/v6.1.8...v6.2.0
Props ayeshrajans, jrf.
Fixes <a href="https://core.trac.wordpress.org/ticket/51874">#51874</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesPHPMailerExceptionphp">trunk/src/wp-includes/PHPMailer/Exception.php</a></li>
<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="trunksrcwpincludesPHPMailerExceptionphp"></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/Exception.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/PHPMailer/Exception.php 2020-11-30 16:51:15 UTC (rev 49712)
+++ trunk/src/wp-includes/PHPMailer/Exception.php 2020-11-30 17:08:24 UTC (rev 49713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * PHPMailer Exception class.
</span><span class="cx" style="display: block; padding: 0 10px"> * PHP Version 5.5.
</span></span></pre></div>
<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 2020-11-30 16:51:15 UTC (rev 49712)
+++ trunk/src/wp-includes/PHPMailer/PHPMailer.php 2020-11-30 17:08:24 UTC (rev 49713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * PHPMailer - PHP email creation and transport class.
</span><span class="cx" style="display: block; padding: 0 10px"> * PHP Version 5.5.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,11 +389,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * SMTP class debug output mode.
</span><span class="cx" style="display: block; padding: 0 10px"> * Debug output level.
</span><span class="cx" style="display: block; padding: 0 10px"> * Options:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * * SMTP::DEBUG_OFF: No output
- * * SMTP::DEBUG_CLIENT: Client messages
- * * SMTP::DEBUG_SERVER: Client and server messages
- * * SMTP::DEBUG_CONNECTION: As SERVER plus connection status
- * * SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see SMTP::DEBUG_OFF: No output
+ * @see SMTP::DEBUG_CLIENT: Client messages
+ * @see SMTP::DEBUG_SERVER: Client and server messages
+ * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status
+ * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see SMTP::$do_debug
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,7 +748,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.1.8';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.2.0';
</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">@@ -1185,9 +1186,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //Use this built-in parser if it's available
</span><span class="cx" style="display: block; padding: 0 10px"> $list = imap_rfc822_parse_adrlist($addrstr, '');
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($list as $address) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
- $address->mailbox . '@' . $address->host
- )) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ ('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
+ $address->mailbox . '@' . $address->host
+ )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $addresses[] = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => (property_exists($address, 'personal') ? $address->personal : ''),
</span><span class="cx" style="display: block; padding: 0 10px"> 'address' => $address->mailbox . '@' . $address->host,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1241,7 +1244,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't validate now addresses with IDN. Will be done in send().
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = strrpos($address, '@');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ((false === $pos)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ (false === $pos)
</ins><span class="cx" style="display: block; padding: 0 10px"> || ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported())
</span><span class="cx" style="display: block; padding: 0 10px"> && !static::validateAddress($address))
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1393,7 +1397,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify we have required functions, CharSet, and at-sign.
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = strrpos($address, '@');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!empty($this->CharSet) &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ !empty($this->CharSet) &&
</ins><span class="cx" style="display: block; padding: 0 10px"> false !== $pos &&
</span><span class="cx" style="display: block; padding: 0 10px"> static::idnSupported()
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1457,8 +1462,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function preSend()
</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 ('smtp' === $this->Mailer
- || ('mail' === $this->Mailer && stripos(PHP_OS, 'WIN') === 0)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ 'smtp' === $this->Mailer
+ || ('mail' === $this->Mailer && (PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0))
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> //SMTP mandates RFC-compliant line endings
</span><span class="cx" style="display: block; padding: 0 10px"> //and it's also used with mail() on Windows
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1468,7 +1474,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static::setLE(PHP_EOL);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> //Check for buggy PHP versions that add a header with an incorrect line break
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ('mail' === $this->Mailer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ 'mail' === $this->Mailer
</ins><span class="cx" style="display: block; padding: 0 10px"> && ((PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70017)
</span><span class="cx" style="display: block; padding: 0 10px"> || (PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70103))
</span><span class="cx" style="display: block; padding: 0 10px"> && ini_get('mail.add_x_header') === '1'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1555,7 +1562,8 @@
</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"> // Sign with DKIM if enabled
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!empty($this->DKIM_domain)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ !empty($this->DKIM_domain)
</ins><span class="cx" style="display: block; padding: 0 10px"> && !empty($this->DKIM_selector)
</span><span class="cx" style="display: block; padding: 0 10px"> && (!empty($this->DKIM_private_string)
</span><span class="cx" style="display: block; padding: 0 10px"> || (!empty($this->DKIM_private)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1613,7 +1621,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } catch (Exception $exc) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->smtp->reset();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->smtp->reset();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setError($exc->getMessage());
</span><span class="cx" style="display: block; padding: 0 10px"> $this->edebug($exc->getMessage());
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1719,7 +1727,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function isShellSafe($string)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> // Future-proof
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (escapeshellcmd($string) !== $string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ escapeshellcmd($string) !== $string
</ins><span class="cx" style="display: block; padding: 0 10px"> || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1903,7 +1912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $isSent = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $callbacks[] = ['issent' => $isSent, 'to' => $to[0]];
</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">@@ -1983,11 +1992,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($hosts as $hostentry) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hostinfo = [];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!preg_match(
- '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
- trim($hostentry),
- $hostinfo
- )) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ !preg_match(
+ '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
+ trim($hostentry),
+ $hostinfo
+ )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry));
</span><span class="cx" style="display: block; padding: 0 10px"> // Not a valid host entry
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2056,12 +2067,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // We must resend EHLO after TLS negotiation
</span><span class="cx" style="display: block; padding: 0 10px"> $this->smtp->hello($hello);
</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 ($this->SMTPAuth && !$this->smtp->authenticate(
- $this->Username,
- $this->Password,
- $this->AuthType,
- $this->oauth
- )) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ $this->SMTPAuth && !$this->smtp->authenticate(
+ $this->Username,
+ $this->Password,
+ $this->AuthType,
+ $this->oauth
+ )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new Exception($this->lang('authenticate'));
</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">@@ -2119,7 +2132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'am' => 'hy',
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</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 (isset($renamed_langcodes[$langcode])) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (array_key_exists($langcode, $renamed_langcodes)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $langcode = $renamed_langcodes[$langcode];
</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">@@ -2428,7 +2441,8 @@
</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"> // sendmail and mail() extract Bcc from the header before sending
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ((
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ (
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> && count($this->bcc) > 0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3898,7 +3912,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function isValidHost($host)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> //Simple syntax limits
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (empty($host)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ empty($host)
</ins><span class="cx" style="display: block; padding: 0 10px"> || !is_string($host)
</span><span class="cx" style="display: block; padding: 0 10px"> || strlen($host) > 256
</span><span class="cx" style="display: block; padding: 0 10px"> || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4064,7 +4079,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><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">- if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
</ins><span class="cx" style="display: block; padding: 0 10px"> !empty($basedir)
</span><span class="cx" style="display: block; padding: 0 10px"> // Ignore URLs containing parent dir traversal (..)
</span><span class="cx" style="display: block; padding: 0 10px"> && (strpos($url, '..') === false)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4086,13 +4102,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if (strlen($directory) > 1 && '/' !== substr($directory, -1)) {
</span><span class="cx" style="display: block; padding: 0 10px"> $directory .= '/';
</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 ($this->addEmbeddedImage(
- $basedir . $directory . $filename,
- $cid,
- $filename,
- static::ENCODING_BASE64,
- static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ $this->addEmbeddedImage(
+ $basedir . $directory . $filename,
+ $cid,
+ $filename,
+ static::ENCODING_BASE64,
+ static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = preg_replace(
</span><span class="cx" style="display: block; padding: 0 10px"> '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4511,11 +4528,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $privKey = openssl_pkey_get_private($privKeyStr);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- openssl_pkey_free($privKey);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (PHP_MAJOR_VERSION < 8) {
+ openssl_pkey_free($privKey);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return base64_encode($signature);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- openssl_pkey_free($privKey);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (PHP_MAJOR_VERSION < 8) {
+ openssl_pkey_free($privKey);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</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 2020-11-30 16:51:15 UTC (rev 49712)
+++ trunk/src/wp-includes/PHPMailer/SMTP.php 2020-11-30 17:08:24 UTC (rev 49713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * PHPMailer RFC821 SMTP email transport class.
</span><span class="cx" style="display: block; padding: 0 10px"> * PHP Version 5.5.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,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.1.8';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.2.0';
</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">@@ -539,11 +540,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!$this->sendCommand(
- 'User & Password',
- base64_encode("\0" . $username . "\0" . $password),
- 235
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ !$this->sendCommand(
+ 'User & Password',
+ base64_encode("\0" . $username . "\0" . $password),
+ 235
+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1086,8 +1088,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> //If SMTP transcripts are left enabled, or debug output is posted online
</span><span class="cx" style="display: block; padding: 0 10px"> //it can leak credentials, so hide credentials in all but lowest level
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (self::DEBUG_LOWLEVEL > $this->do_debug &&
- in_array($command, ['User & Password', 'Username', 'Password'], true)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ self::DEBUG_LOWLEVEL > $this->do_debug &&
+ in_array($command, ['User & Password', 'Username', 'Password'], true)
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,7 +1211,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::DEBUG_LOWLEVEL
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //stream_select returns false when the `select` system call is interrupted by an incoming signal, try the select again
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //stream_select returns false when the `select` system call is interrupted
+ //by an incoming signal, try the select again
</ins><span class="cx" style="display: block; padding: 0 10px"> if (stripos($message, 'interrupted system call') !== false) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->edebug(
</span><span class="cx" style="display: block; padding: 0 10px"> 'SMTP -> get_lines(): retrying stream_select',
</span></span></pre>
</div>
</div>
</body>
</html>