Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/upstream/master' into longlines
Browse files Browse the repository at this point in the history
  • Loading branch information
Synchro committed Apr 17, 2015
2 parents b83f2a6 + 245d73b commit 1365c49
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog.md
Expand Up @@ -25,6 +25,7 @@
* Store and report SMTP errors more consistently
* Add MIME multipart preamble for better Outlook compatibility
* Provide detailed errors when individual recipients fail
* Report more errors when connecting

## Version 5.2.9 (Sept 25th 2014)
* **Important: The autoloader is no longer autoloaded by the PHPMailer class**
Expand Down
1 change: 1 addition & 0 deletions class.phpmailer.php
Expand Up @@ -1379,6 +1379,7 @@ public function smtpConnect($options = array())
return true;
} catch (phpmailerException $exc) {
$lastexception = $exc;
$this->edebug($exc->getMessage());
// We must have connected, but then failed TLS or Auth, so close connection nicely
$this->smtp->quit();
}
Expand Down

0 comments on commit 1365c49

Please sign in to comment.