Skip to content

Commit 8eb8d63

Browse files
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] * [PHPMailer/PHPMailer@v6.9.2...v6.9.3 Full list of changes in PHPMailer 6.9.3] Follow-up to [50628], [50799], [51169], [51634], [51635], [52252], [52749], [52811], [53500], [53535], [53917], [54427], [54937], [55557], [56484], [57137], [59246]. Props desrosj, yogeshbhutkar, ayeshrajans. Fixes #62632. git-svn-id: https://develop.svn.wordpress.org/trunk@59481 602fd350-edb4-49c9-b593-d223f7449a82
1 parent d93b275 commit 8eb8d63

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/wp-includes/PHPMailer/PHPMailer.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class PHPMailer
253253
* You can set your own, but it must be in the format "<id@domain>",
254254
* as defined in RFC5322 section 3.6.4 or it will be ignored.
255255
*
256-
* @see https://tools.ietf.org/html/rfc5322#section-3.6.4
256+
* @see https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
257257
*
258258
* @var string
259259
*/
@@ -387,7 +387,7 @@ class PHPMailer
387387
* 'DELAY' will notify you if there is an unusual delay in delivery, but the actual
388388
* delivery's outcome (success or failure) is not yet decided.
389389
*
390-
* @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY
390+
* @see https://www.rfc-editor.org/rfc/rfc3461.html#section-4.1 for more information about NOTIFY
391391
*/
392392
public $dsn = '';
393393

@@ -756,7 +756,7 @@ class PHPMailer
756756
*
757757
* @var string
758758
*/
759-
const VERSION = '6.9.2';
759+
const VERSION = '6.9.3';
760760

761761
/**
762762
* Error severity: message only, continue processing.
@@ -1873,7 +1873,7 @@ protected static function isShellSafe($string)
18731873
*/
18741874
protected static function isPermittedPath($path)
18751875
{
1876-
//Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
1876+
//Matches scheme definition from https://www.rfc-editor.org/rfc/rfc3986#section-3.1
18771877
return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
18781878
}
18791879

@@ -2707,7 +2707,7 @@ public function createHeader()
27072707
}
27082708

27092709
//Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
2710-
//https://tools.ietf.org/html/rfc5322#section-3.6.4
2710+
//https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
27112711
if (
27122712
'' !== $this->MessageID &&
27132713
preg_match(
@@ -4912,7 +4912,7 @@ public function DKIM_Sign($signHeader)
49124912
* Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
49134913
* Canonicalized headers should *always* use CRLF, regardless of mailer setting.
49144914
*
4915-
* @see https://tools.ietf.org/html/rfc6376#section-3.4.2
4915+
* @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.2
49164916
*
49174917
* @param string $signHeader Header
49184918
*
@@ -4924,7 +4924,7 @@ public function DKIM_HeaderC($signHeader)
49244924
$signHeader = static::normalizeBreaks($signHeader, self::CRLF);
49254925
//Unfold header lines
49264926
//Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
4927-
//@see https://tools.ietf.org/html/rfc5322#section-2.2
4927+
//@see https://www.rfc-editor.org/rfc/rfc5322#section-2.2
49284928
//That means this may break if you do something daft like put vertical tabs in your headers.
49294929
$signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
49304930
//Break headers out into an array
@@ -4956,7 +4956,7 @@ public function DKIM_HeaderC($signHeader)
49564956
* Uses the 'simple' algorithm from RFC6376 section 3.4.3.
49574957
* Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
49584958
*
4959-
* @see https://tools.ietf.org/html/rfc6376#section-3.4.3
4959+
* @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.3
49604960
*
49614961
* @param string $body Message Body
49624962
*
@@ -4992,7 +4992,7 @@ public function DKIM_Add($headers_line, $subject, $body)
49924992
$DKIMquery = 'dns/txt'; //Query method
49934993
$DKIMtime = time();
49944994
//Always sign these headers without being asked
4995-
//Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
4995+
//Recommended list from https://www.rfc-editor.org/rfc/rfc6376#section-5.4.1
49964996
$autoSignHeaders = [
49974997
'from',
49984998
'to',
@@ -5098,7 +5098,7 @@ public function DKIM_Add($headers_line, $subject, $body)
50985098
}
50995099
//The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
51005100
//which is appended after calculating the signature
5101-
//https://tools.ietf.org/html/rfc6376#section-3.5
5101+
//https://www.rfc-editor.org/rfc/rfc6376#section-3.5
51025102
$dkimSignatureHeader = 'DKIM-Signature: v=1;' .
51035103
' d=' . $this->DKIM_domain . ';' .
51045104
' s=' . $this->DKIM_selector . ';' . static::$LE .

src/wp-includes/PHPMailer/SMTP.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class SMTP
3535
*
3636
* @var string
3737
*/
38-
const VERSION = '6.9.2';
38+
const VERSION = '6.9.3';
3939

4040
/**
4141
* SMTP line break constant.
@@ -62,7 +62,7 @@ class SMTP
6262
* The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
6363
* *excluding* a trailing CRLF break.
6464
*
65-
* @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
65+
* @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.6
6666
*
6767
* @var int
6868
*/
@@ -72,7 +72,7 @@ class SMTP
7272
* The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
7373
* *including* a trailing CRLF line break.
7474
*
75-
* @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
75+
* @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.5
7676
*
7777
* @var int
7878
*/
@@ -373,7 +373,7 @@ public function connect($host, $port = null, $timeout = 30, $options = [])
373373
}
374374
//Anything other than a 220 response means something went wrong
375375
//RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
376-
//https://tools.ietf.org/html/rfc5321#section-3.1
376+
//https://www.rfc-editor.org/rfc/rfc5321#section-3.1
377377
if ($responseCode === 554) {
378378
$this->quit();
379379
}
@@ -582,7 +582,7 @@ public function authenticate(
582582
}
583583
//Send encoded username and password
584584
if (
585-
//Format from https://tools.ietf.org/html/rfc4616#section-2
585+
//Format from https://www.rfc-editor.org/rfc/rfc4616#section-2
586586
//We skip the first field (it's forgery), so the string starts with a null byte
587587
!$this->sendCommand(
588588
'User & Password',
@@ -795,7 +795,7 @@ public function data($msg_data)
795795
//Send the lines to the server
796796
foreach ($lines_out as $line_out) {
797797
//Dot-stuffing as per RFC5321 section 4.5.2
798-
//https://tools.ietf.org/html/rfc5321#section-4.5.2
798+
//https://www.rfc-editor.org/rfc/rfc5321#section-4.5.2
799799
if (!empty($line_out) && $line_out[0] === '.') {
800800
$line_out = '.' . $line_out;
801801
}

0 commit comments

Comments
 (0)