enmi-conf.org: comparison wp/wp-includes/PHPMailer/SMTP.php

equal deleted inserted replaced

-:48c4eec2b7e6
+:8c2e4d02f4ef
 * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
 * @author    Brent R. Matzelle (original founder)
 * @copyright 2012 - 2020 Marcus Bointon
 * @copyright 2010 - 2012 Jim Jagielski
 * @copyright 2004 - 2009 Andy Prevost
-* @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+* @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
 * @note      This program is distributed in the hope that it will be useful - WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.
 */
 /**
 * The PHPMailer SMTP version number.
 *
 * @var string
 */
-const VERSION = '6.9.1';
+const VERSION = '6.9.3';
 /**
 * SMTP line break constant.
 *
 * @var string
 /**
 * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
 * *excluding* a trailing CRLF break.
 *
-* @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
+* @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.6
 *
 * @var int
 */
 const MAX_LINE_LENGTH = 998;
 /**
 * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
 * *including* a trailing CRLF line break.
 *
-* @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
+* @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.5
 *
 * @var int
 */
 const MAX_REPLY_LENGTH = 512;
 public $Debugoutput = 'echo';
 /**
 * Whether to use VERP.
 *
-* @see http://en.wikipedia.org/wiki/Variable_envelope_return_path
+* @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
-* @see http://www.postfix.org/VERP_README.html Info on VERP
+* @see https://www.postfix.org/VERP_README.html Info on VERP
 *
 * @var bool
 */
 public $do_verp = false;
 /**
 * The timeout value for connection, in seconds.
 * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
 * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
 *
-* @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+* @see https://www.rfc-editor.org/rfc/rfc2821#section-4.5.3.2
 *
 * @var int
 */
 public $Timeout = 300;
 *
 * @var string[]
 */
 protected $smtp_transaction_id_patterns = [
 'exim' => '/[\d]{3} OK id=(.*)/',
-'sendmail' => '/[\d]{3} 2.0.0 (.*) Message/',
+'sendmail' => '/[\d]{3} 2\.0\.0 (.*) Message/',
-'postfix' => '/[\d]{3} 2.0.0 Ok: queued as (.*)/',
+'postfix' => '/[\d]{3} 2\.0\.0 Ok: queued as (.*)/',
-'Microsoft_ESMTP' => '/[0-9]{3} 2.[\d].0 (.*)@(?:.*) Queued mail for delivery/',
+'Microsoft_ESMTP' => '/[0-9]{3} 2\.[\d]\.0 (.*)@(?:.*) Queued mail for delivery/',
 'Amazon_SES' => '/[\d]{3} Ok (.*)/',
 'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
-'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
+'CampaignMonitor' => '/[\d]{3} 2\.0\.0 OK:([a-zA-Z\d]{48})/',
 'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
 'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
 'Mailjet' => '/[\d]{3} OK queued as (.*)/',
 ];
 if ($level > $this->do_debug) {
 return;
 }
 //Is this a PSR-3 logger?
 if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
-$this->Debugoutput->debug($str);
+//Remove trailing line breaks potentially added by calls to SMTP::client_send()
+$this->Debugoutput->debug(rtrim($str, "\r\n"));
 return;
 }
 //Avoid clash with built-in function names
 if (is_callable($this->Debugoutput) && !in_array($this->Debugoutput, ['error_log', 'html', 'echo'])) {
 return;
 }
 switch ($this->Debugoutput) {
 case 'error_log':
 //Don't output, just log
+/** @noinspection ForgottenDebugOutputInspection */
 error_log($str);
 break;
 case 'html':
 //Cleans up output a bit for a better looking, HTML-safe output
 echo gmdate('Y-m-d H:i:s'), ' ', htmlentities(
 if ($responseCode === 220) {
 return true;
 }
 //Anything other than a 220 response means something went wrong
 //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
-//https://tools.ietf.org/html/rfc5321#section-3.1
+//https://www.rfc-editor.org/rfc/rfc5321#section-3.1
 if ($responseCode === 554) {
 $this->quit();
 }
 //This will handle 421 responses which may not wait for a QUIT (e.g. if the server is being shut down)
 $this->edebug('Connection: closing due to error', self::DEBUG_CONNECTION);
 $errno = 0;
 $errstr = '';
 if ($streamok) {
 $socket_context = stream_context_create($options);
-set_error_handler([$this, 'errorHandler']);
+set_error_handler(function () {
+call_user_func_array([$this, 'errorHandler'], func_get_args());
+});
 $connection = stream_socket_client(
 $host . ':' . $port,
 $errno,
 $errstr,
 $timeout,
 //Fall back to fsockopen which should work in more places, but is missing some features
 $this->edebug(
 'Connection: stream_socket_client not available, falling back to fsockopen',
 self::DEBUG_CONNECTION
 );
-set_error_handler([$this, 'errorHandler']);
+set_error_handler(function () {
+call_user_func_array([$this, 'errorHandler'], func_get_args());
+});
 $connection = fsockopen(
 $host,
 $port,
 $errno,
 $errstr,
 $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
 $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
 }
 //Begin encrypted connection
-set_error_handler([$this, 'errorHandler']);
+set_error_handler(function () {
+call_user_func_array([$this, 'errorHandler'], func_get_args());
+});
 $crypto_ok = stream_socket_enable_crypto(
 $this->smtp_conn,
 true,
 $crypto_method
 );
 if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
 return false;
 }
 //Send encoded username and password
 if (
-//Format from https://tools.ietf.org/html/rfc4616#section-2
+//Format from https://www.rfc-editor.org/rfc/rfc4616#section-2
 //We skip the first field (it's forgery), so the string starts with a null byte
 !$this->sendCommand(
 'User & Password',
 base64_encode("\0" . $username . "\0" . $password),
 235
 if (function_exists('hash_hmac')) {
 return hash_hmac('md5', $data, $key);
 }
 //The following borrowed from
-//http://php.net/manual/en/function.mhash.php#27225
+//https://www.php.net/manual/en/function.mhash.php#27225
 //RFC 2104 HMAC implementation for php.
 //Creates an md5 HMAC.
 //Eliminates the need to install mhash to compute a HMAC
 //by Lance Rushing
 $lines_out[] = $line;
 //Send the lines to the server
 foreach ($lines_out as $line_out) {
 //Dot-stuffing as per RFC5321 section 4.5.2
-//https://tools.ietf.org/html/rfc5321#section-4.5.2
+//https://www.rfc-editor.org/rfc/rfc5321#section-4.5.2
 if (!empty($line_out) && $line_out[0] === '.') {
 $line_out = '.' . $line_out;
 }
 $this->client_send($line_out . static::LE, 'DATA');
 }
 ) {
 $this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
 } else {
 $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
 }
-set_error_handler([$this, 'errorHandler']);
+set_error_handler(function () {
+call_user_func_array([$this, 'errorHandler'], func_get_args());
+});
 $result = fwrite($this->smtp_conn, $data);
 restore_error_handler();
 return $result;
 }
 $selR = [$this->smtp_conn];
 $selW = null;
 while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
 //Must pass vars in here as params are by reference
 //solution for signals inspired by https://github.com/symfony/symfony/pull/6540
-set_error_handler([$this, 'errorHandler']);
+set_error_handler(function () {
+call_user_func_array([$this, 'errorHandler'], func_get_args());
+});
 $n = stream_select($selR, $selW, $selW, $this->Timelimit);
 restore_error_handler();
 if ($n === false) {
 $message = $this->getError()['detail'];

changeset 22	8c2e4d02f4ef
parent 21	48c4eec2b7e6