Skip to content

Commit

Permalink
PHPMailer 6.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jrotty authored Jul 25, 2023
1 parent c8e5013 commit 38155d1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions PHPMailer/PHPMailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ class PHPMailer
*
* @var string
*/
const VERSION = '6.7.1';
const VERSION = '6.8.0';

/**
* Error severity: message only, continue processing.
Expand Down Expand Up @@ -2423,7 +2423,7 @@ public function addrAppend($type, $addr)
*/
public function addrFormat($addr)
{
if (empty($addr[1])) { //No name provided
if (!isset($addr[1]) || ($addr[1] === '')) { //No name provided
return $this->secureHeader($addr[0]);
}

Expand Down
10 changes: 9 additions & 1 deletion PHPMailer/SMTP.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SMTP
*
* @var string
*/
const VERSION = '6.7.1';
const VERSION = '6.8.0';

/**
* SMTP line break constant.
Expand All @@ -51,6 +51,13 @@ class SMTP
*/
const DEFAULT_PORT = 25;

/**
* The SMTPs port to use if one is not specified.
*
* @var int
*/
const DEFAULT_SECURE_PORT = 465;

/**
* The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
* *excluding* a trailing CRLF break.
Expand Down Expand Up @@ -187,6 +194,7 @@ class SMTP
'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
'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 (.*)/',
];

Expand Down

0 comments on commit 38155d1

Please sign in to comment.