<!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>[49136] trunk/src/wp-includes/PHPMailer: External Libraries: Upgrade PHPMailer to version 6.1.8.</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/49136">49136</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/49136","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-10-13 13:58:15 +0000 (Tue, 13 Oct 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.1.8.
For a full list of changes in this update, see the PHPMailer GitHub:
https://github.com/PHPMailer/PHPMailer/compare/v6.1.7...v6.1.8
Props ayeshrajans.
Fixes <a href="https://core.trac.wordpress.org/ticket/51502">#51502</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-10-13 13:07:23 UTC (rev 49135)
+++ trunk/src/wp-includes/PHPMailer/Exception.php 2020-10-13 13:58:15 UTC (rev 49136)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Brent R. Matzelle (original founder)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @copyright 2012 - 2017 Marcus Bointon
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @copyright 2012 - 2020 Marcus Bointon
</ins><span class="cx" style="display: block; padding: 0 10px"> * @copyright 2010 - 2012 Jim Jagielski
</span><span class="cx" style="display: block; padding: 0 10px"> * @copyright 2004 - 2009 Andy Prevost
</span><span class="cx" style="display: block; padding: 0 10px"> * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
</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-10-13 13:07:23 UTC (rev 49135)
+++ trunk/src/wp-includes/PHPMailer/PHPMailer.php 2020-10-13 13:58:15 UTC (rev 49136)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Brent R. Matzelle (original founder)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @copyright 2012 - 2019 Marcus Bointon
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @copyright 2012 - 2020 Marcus Bointon
</ins><span class="cx" style="display: block; padding: 0 10px"> * @copyright 2010 - 2012 Jim Jagielski
</span><span class="cx" style="display: block; padding: 0 10px"> * @copyright 2004 - 2009 Andy Prevost
</span><span class="cx" style="display: block; padding: 0 10px"> * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,7 +747,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.7';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.1.8';
</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">@@ -899,6 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ($this->Debugoutput) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'error_log':
</span><span class="cx" style="display: block; padding: 0 10px"> //Don't output, just log
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @noinspection ForgottenDebugOutputInspection */
</ins><span class="cx" style="display: block; padding: 0 10px"> error_log($str);
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'html':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1350,7 +1351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
</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 http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return (bool) preg_match(
</span><span class="cx" style="display: block; padding: 0 10px"> '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1611,6 +1612,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } catch (Exception $exc) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
+ $this->smtp->reset();
+ }
</ins><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="cx" style="display: block; padding: 0 10px"> if ($this->exceptions) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1752,6 +1756,23 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check whether a file path is safe, accessible, and readable.
+ *
+ * @param string $path A relative or absolute path to a file
+ *
+ * @return bool
+ */
+ protected static function fileIsAccessible($path)
+ {
+ $readable = file_exists($path);
+ //If not a UNC path (expected to start with \\), check read permission, see #2069
+ if (strpos($path, '\\\\') !== 0) {
+ $readable = $readable && is_readable($path);
+ }
+ return static::isPermittedPath($path) && $readable;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Send mail using the PHP mail() function.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see http://www.php.net/manual/en/book.mail.php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2004,7 +2025,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $host = $hostinfo[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $port = $this->Port;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (array_key_exists(3, $hostinfo) && is_numeric($hostinfo[3]) && $hostinfo[3] > 0 && $hostinfo[3] < 65536) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ array_key_exists(3, $hostinfo) &&
+ is_numeric($hostinfo[3]) &&
+ $hostinfo[3] > 0 &&
+ $hostinfo[3] < 65536
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $port = (int) $hostinfo[3];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2134,7 +2160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // There is no English translation file
</span><span class="cx" style="display: block; padding: 0 10px"> if ('en' !== $langcode) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure language file path is readable
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!static::isPermittedPath($lang_file) || !file_exists($lang_file)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!static::fileIsAccessible($lang_file)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $foundlang = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Overwrite language-specific strings.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2382,21 +2408,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result .= $this->headerLine('Date', '' === $this->MessageDate ? self::rfcDate() : $this->MessageDate);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // To be created automatically by mail()
- if ($this->SingleTo) {
- if ('mail' !== $this->Mailer) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The To header is created automatically by mail(), so needs to be omitted here
+ if ('mail' !== $this->Mailer) {
+ if ($this->SingleTo) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ($this->to as $toaddr) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->SingleToArray[] = $this->addrFormat($toaddr);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- } elseif (count($this->to) > 0) {
- if ('mail' !== $this->Mailer) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif (count($this->to) > 0) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result .= $this->addrAppend('To', $this->to);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif (count($this->cc) === 0) {
+ $result .= $this->headerLine('To', 'undisclosed-recipients:;');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif (count($this->cc) === 0) {
- $result .= $this->headerLine('To', 'undisclosed-recipients:;');
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // sendmail and mail() extract Cc from the header before sending
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2951,7 +2974,7 @@
</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 $name Overrides the attachment name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $encoding File encoding (see $Encoding)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $type File extension (MIME) type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $type MIME type, e.g. `image/jpeg`; determined automatically from $path if not specified
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $disposition Disposition to use
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @throws Exception
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2966,7 +2989,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $disposition = 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!static::fileIsAccessible($path)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
</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">@@ -3140,7 +3163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function encodeFile($path, $encoding = self::ENCODING_BASE64)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!static::isPermittedPath($path) || !file_exists($path) || !is_readable($path)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!static::fileIsAccessible($path)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $file_buffer = file_get_contents($path);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3526,7 +3549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $disposition = 'inline'
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!static::fileIsAccessible($path)) {
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
</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">@@ -4217,6 +4240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tiff' => 'image/tiff',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tif' => 'image/tiff',
</span><span class="cx" style="display: block; padding: 0 10px"> 'webp' => 'image/webp',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avif' => 'image/avif',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'heif' => 'image/heif',
</span><span class="cx" style="display: block; padding: 0 10px"> 'heifs' => 'image/heif-sequence',
</span><span class="cx" style="display: block; padding: 0 10px"> 'heic' => 'image/heic',
</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-10-13 13:07:23 UTC (rev 49135)
+++ trunk/src/wp-includes/PHPMailer/SMTP.php 2020-10-13 13:58:15 UTC (rev 49136)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Brent R. Matzelle (original founder)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @copyright 2012 - 2019 Marcus Bointon
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @copyright 2012 - 2020 Marcus Bointon
</ins><span class="cx" style="display: block; padding: 0 10px"> * @copyright 2010 - 2012 Jim Jagielski
</span><span class="cx" style="display: block; padding: 0 10px"> * @copyright 2004 - 2009 Andy Prevost
</span><span class="cx" style="display: block; padding: 0 10px"> * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,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.7';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const VERSION = '6.1.8';
</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">@@ -417,8 +417,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Windows does not have support for this timeout function
</span><span class="cx" style="display: block; padding: 0 10px"> if (strpos(PHP_OS, 'WIN') !== 0) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max = (int)ini_get('max_execution_time');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't bother if unlimited
- if (0 !== $max && $timeout > $max) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't bother if unlimited, or if set_time_limit is disabled
+ if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
</ins><span class="cx" style="display: block; padding: 0 10px"> @set_time_limit($timeout);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> stream_set_timeout($connection, $timeout, 0);
</span></span></pre>
</div>
</div>
</body>
</html>