git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/phpmailer/phpmailer/src/POP3.php b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/phpmailer/phpmailer/src/POP3.php
index b38964b..86cfebd 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/phpmailer/phpmailer/src/POP3.php
@@ -46,7 +46,7 @@
*
* @var string
*/
- const VERSION = '6.5.0';
+ const VERSION = '6.6.0';
/**
* Default POP3 port number.
@@ -308,6 +308,7 @@
{
if (!$this->connected) {
$this->setError('Not connected to POP3 server');
+ return false;
}
if (empty($username)) {
$username = $this->username;
@@ -337,6 +338,15 @@
public function disconnect()
{
$this->sendString('QUIT');
+
+ // RFC 1939 shows POP3 server sending a +OK response to the QUIT command.
+ // Try to get it. Ignore any failures here.
+ try {
+ $this->getResponse();
+ } catch (Exception $e) {
+ //Do nothing
+ }
+
//The QUIT command may cause the daemon to exit, which will kill our connection
//So ignore errors here
try {
@@ -344,6 +354,10 @@
} catch (Exception $e) {
//Do nothing
}
+
+ // Clean up attributes.
+ $this->connected = false;
+ $this->pop_conn = false;
}
/**