From b0fb76685e3a3ae996424fb5676319c2586a7c20 Mon Sep 17 00:00:00 2001 From: ClicShopping Date: Wed, 27 May 2020 19:38:35 +0200 Subject: [PATCH] update composer libraries --- shop/composer.lock | 28 ++++++----- .../External/vendor/composer/installed.json | 34 +++++++------ .../vendor/guzzlehttp/guzzle/CHANGELOG.md | 9 +++- .../vendor/guzzlehttp/guzzle/composer.json | 2 +- .../vendor/guzzlehttp/guzzle/src/Client.php | 9 ++-- .../guzzlehttp/guzzle/src/ClientInterface.php | 2 +- .../guzzle/src/Handler/CurlMultiHandler.php | 1 - .../vendor/guzzlehttp/guzzle/src/Utils.php | 30 ++++++++++-- .../vendor/phpmailer/phpmailer/SECURITY.md | 2 + .../vendor/phpmailer/phpmailer/VERSION | 2 +- .../vendor/phpmailer/phpmailer/composer.json | 6 +++ ...iler.lang-am.php => phpmailer.lang-hy.php} | 0 .../phpmailer/phpmailer/src/PHPMailer.php | 48 ++++++++++++------- .../vendor/phpmailer/phpmailer/src/POP3.php | 2 +- .../vendor/phpmailer/phpmailer/src/SMTP.php | 6 +-- 15 files changed, 121 insertions(+), 60 deletions(-) rename shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/language/{phpmailer.lang-am.php => phpmailer.lang-hy.php} (100%) diff --git a/shop/composer.lock b/shop/composer.lock index e2fe8a5f9..06cd8bfd2 100644 --- a/shop/composer.lock +++ b/shop/composer.lock @@ -56,16 +56,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.3", + "version": "6.5.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" + "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d", + "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d", "shasum": "" }, "require": { @@ -73,7 +73,7 @@ "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.11" + "symfony/polyfill-intl-idn": "1.17.0" }, "require-dev": { "ext-curl": "*", @@ -119,7 +119,7 @@ "rest", "web service" ], - "time": "2020-04-18T10:38:46+00:00" + "time": "2020-05-25T19:35:05+00:00" }, { "name": "guzzlehttp/promises", @@ -245,16 +245,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.1.5", + "version": "v6.1.6", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "a8bf068f64a580302026e484ee29511f661b2ad3" + "reference": "c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a8bf068f64a580302026e484ee29511f661b2ad3", - "reference": "a8bf068f64a580302026e484ee29511f661b2ad3", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3", + "reference": "c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3", "shasum": "" }, "require": { @@ -303,7 +303,13 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2020-03-14T14:23:48+00:00" + "funding": [ + { + "url": "https://github.com/synchro", + "type": "github" + } + ], + "time": "2020-05-27T12:24:03+00:00" }, { "name": "phpxmlrpc/phpxmlrpc", diff --git a/shop/includes/ClicShopping/External/vendor/composer/installed.json b/shop/includes/ClicShopping/External/vendor/composer/installed.json index 204e4f9f4..fc66a5ac9 100644 --- a/shop/includes/ClicShopping/External/vendor/composer/installed.json +++ b/shop/includes/ClicShopping/External/vendor/composer/installed.json @@ -51,17 +51,17 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.3", - "version_normalized": "6.5.3.0", + "version": "6.5.4", + "version_normalized": "6.5.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" + "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d", + "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d", "shasum": "" }, "require": { @@ -69,7 +69,7 @@ "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.11" + "symfony/polyfill-intl-idn": "1.17.0" }, "require-dev": { "ext-curl": "*", @@ -79,7 +79,7 @@ "suggest": { "psr/log": "Required for using the Log middleware" }, - "time": "2020-04-18T10:38:46+00:00", + "time": "2020-05-25T19:35:05+00:00", "type": "library", "extra": { "branch-alias": { @@ -246,17 +246,17 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.1.5", - "version_normalized": "6.1.5.0", + "version": "v6.1.6", + "version_normalized": "6.1.6.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "a8bf068f64a580302026e484ee29511f661b2ad3" + "reference": "c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a8bf068f64a580302026e484ee29511f661b2ad3", - "reference": "a8bf068f64a580302026e484ee29511f661b2ad3", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3", + "reference": "c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3", "shasum": "" }, "require": { @@ -277,7 +277,7 @@ "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, - "time": "2020-03-14T14:23:48+00:00", + "time": "2020-05-27T12:24:03+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -306,7 +306,13 @@ "name": "Brent R. Matzelle" } ], - "description": "PHPMailer is a full-featured email creation and transfer class for PHP" + "description": "PHPMailer is a full-featured email creation and transfer class for PHP", + "funding": [ + { + "url": "https://github.com/synchro", + "type": "github" + } + ] }, { "name": "phpxmlrpc/phpxmlrpc", diff --git a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/CHANGELOG.md b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/CHANGELOG.md index a5cb9c1a8..f5b183a0c 100644 --- a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 6.5.4 - 2020-05-25 + +* Fix various intl icu issues [#2626](https://github.com/guzzle/guzzle/pull/2626) + ## 6.5.3 - 2020-04-18 * Use Symfony intl-idn polyfill [#2550](https://github.com/guzzle/guzzle/pull/2550) @@ -19,7 +23,10 @@ * Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143) * Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287) * Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132) -* Fix: `RetryMiddleware` did not do exponential delay between retires due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132) +* Fix: `RetryMiddleware` did not do exponential delay between retries due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132) + Previously, `RetryMiddleware` would sleep for 1 millisecond, then 2 milliseconds, then 4 milliseconds. + **After this change, `RetryMiddleware` will sleep for 1 second, then 2 seconds, then 4 seconds.** + `Middleware::retry()` accepts a second callback parameter to override the default timeouts if needed. * Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348) * Deprecated `ClientInterface::VERSION` diff --git a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/composer.json b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/composer.json index 02ab73c0f..b7bff79a8 100644 --- a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/composer.json +++ b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/composer.json @@ -23,7 +23,7 @@ "require": { "php": ">=5.5", "ext-json": "*", - "symfony/polyfill-intl-idn": "^1.11", + "symfony/polyfill-intl-idn": "1.17.0", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1" }, diff --git a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Client.php b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Client.php index cd9a63574..315a022cf 100644 --- a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Client.php +++ b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Client.php @@ -2,7 +2,7 @@ namespace GuzzleHttp; use GuzzleHttp\Cookie\CookieJar; -use GuzzleHttp\Exception\InvalidArgumentException; +use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Promise; use GuzzleHttp\Psr7; use Psr\Http\Message\RequestInterface; @@ -47,9 +47,8 @@ class Client implements ClientInterface * wire. The function is called with a Psr7\Http\Message\RequestInterface * and array of transfer options, and must return a * GuzzleHttp\Promise\PromiseInterface that is fulfilled with a - * Psr7\Http\Message\ResponseInterface on success. "handler" is a - * constructor only option that cannot be overridden in per/request - * options. If no handler is provided, a default handler will be created + * Psr7\Http\Message\ResponseInterface on success. + * If no handler is provided, a default handler will be created * that enables all of the request options below by attaching all of the * default middleware to the handler. * - base_uri: (string|UriInterface) Base URI of the client that is merged @@ -489,7 +488,7 @@ private function applyOptions(RequestInterface $request, array &$options) /** * Throw Exception with pre-set message. * @return void - * @throws InvalidArgumentException Invalid body. + * @throws \InvalidArgumentException Invalid body. */ private function invalidBody() { diff --git a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/ClientInterface.php index 76872dd3a..54c759b96 100644 --- a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -15,7 +15,7 @@ interface ClientInterface /** * @deprecated Will be removed in Guzzle 7.0.0 */ - const VERSION = '6.5.3'; + const VERSION = '6.5.4'; /** * Send an HTTP request. diff --git a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php index 8eaa34f35..564c95f48 100644 --- a/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php +++ b/shop/includes/ClicShopping/External/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php @@ -1,7 +1,6 @@ getHost()) { - $idnaVariant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : 0; - $asciiHost = $idnaVariant === 0 - ? idn_to_ascii($uri->getHost(), $options) - : idn_to_ascii($uri->getHost(), $options, $idnaVariant, $info); + $asciiHost = self::idnToAsci($uri->getHost(), $options, $info); if ($asciiHost === false) { $errorBitSet = isset($info['errors']) ? $info['errors'] : 0; @@ -64,4 +62,28 @@ public static function idnUriConvert(UriInterface $uri, $options = 0) return $uri; } + + /** + * @param string $domain + * @param int $options + * @param array $info + * + * @return string|false + */ + private static function idnToAsci($domain, $options, &$info = []) + { + if (\preg_match('%^[ -~]+$%', $domain) === 1) { + return $domain; + } + + if (\extension_loaded('intl') && defined('INTL_IDNA_VARIANT_UTS46')) { + return \idn_to_ascii($domain, $options, INTL_IDNA_VARIANT_UTS46, $info); + } + + /* + * The Idn class is marked as @internal. We've locked the version to + * symfony/polyfill-intl-idn to avoid issues in the future. + */ + return Idn::idn_to_ascii($domain, $options, Idn::INTL_IDNA_VARIANT_UTS46, $info); + } } diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/SECURITY.md b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/SECURITY.md index 5e917cd04..fc3e61c20 100644 --- a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/SECURITY.md +++ b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/SECURITY.md @@ -2,6 +2,8 @@ Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately. +PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security. + PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr. PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project. diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/VERSION b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/VERSION index f8c5c2ccd..3af67b5cb 100644 --- a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/VERSION +++ b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/VERSION @@ -1 +1 @@ -6.1.5 \ No newline at end of file +6.1.6 \ No newline at end of file diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/composer.json b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/composer.json index fd0695c8a..90d2576f5 100644 --- a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/composer.json +++ b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/composer.json @@ -19,6 +19,12 @@ "name": "Brent R. Matzelle" } ], + "funding": [ + { + "url": "https://github.com/synchro", + "type": "github" + } + ], "require": { "php": ">=5.5.0", "ext-ctype": "*", diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/language/phpmailer.lang-am.php b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php similarity index 100% rename from shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/language/phpmailer.lang-am.php rename to shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/PHPMailer.php b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/PHPMailer.php index fddad40ac..ed14d7c7a 100644 --- a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/PHPMailer.php +++ b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/PHPMailer.php @@ -745,7 +745,7 @@ class PHPMailer * * @var string */ - const VERSION = '6.1.5'; + const VERSION = '6.1.6'; /** * Error severity: message only, continue processing. @@ -2086,6 +2086,7 @@ public function setLanguage($langcode = 'en', $lang_path = '') 'se' => 'sv', 'rs' => 'sr', 'tg' => 'tl', + 'am' => 'hy', ]; if (isset($renamed_langcodes[$langcode])) { @@ -2606,7 +2607,7 @@ public function createBody() $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE; } //Use this as a preamble in all multipart message types - $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE; + $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE; switch ($this->message_type) { case 'inline': $body .= $mimepre; @@ -3063,9 +3064,9 @@ protected function attachAll($disposition_type, $boundary) //Only include a filename property if we have one if (!empty($name)) { $mime[] = sprintf( - 'Content-Type: %s; name="%s"%s', + 'Content-Type: %s; name=%s%s', $type, - $this->encodeHeader($this->secureHeader($name)), + static::quotedString($this->encodeHeader($this->secureHeader($name))), static::$LE ); } else { @@ -3085,24 +3086,14 @@ protected function attachAll($disposition_type, $boundary) $mime[] = 'Content-ID: <' . $this->encodeHeader($this->secureHeader($cid)) . '>' . static::$LE; } - // If a filename contains any of these chars, it should be quoted, - // but not otherwise: RFC2183 & RFC2045 5.1 - // Fixes a warning in IETF's msglint MIME checker - // Allow for bypassing the Content-Disposition header totally + // Allow for bypassing the Content-Disposition header if (!empty($disposition)) { $encoded_name = $this->encodeHeader($this->secureHeader($name)); - if (preg_match('/[ ()<>@,;:"\/\[\]?=]/', $encoded_name)) { - $mime[] = sprintf( - 'Content-Disposition: %s; filename="%s"%s', - $disposition, - $encoded_name, - static::$LE . static::$LE - ); - } elseif (!empty($encoded_name)) { + if (!empty($encoded_name)) { $mime[] = sprintf( 'Content-Disposition: %s; filename=%s%s', $disposition, - $encoded_name, + static::quotedString($encoded_name), static::$LE . static::$LE ); } else { @@ -3162,6 +3153,7 @@ protected function encodeFile($path, $encoding = self::ENCODING_BASE64) if ($this->exceptions) { throw $exc; } + return ''; } } @@ -4726,6 +4718,28 @@ public static function hasLineLongerThanMax($str) return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str); } + /** + * If a string contains any "special" characters, double-quote the name, + * and escape any double quotes with a backslash. + * + * @param string $str + * + * @return string + * + * @see RFC822 3.4.1 + */ + public static function quotedString($str) + { + if (preg_match('/[ ()<>@,;:"\/\[\]?=]/', $str)) { + //If the string contains any of these chars, it must be double-quoted + //and any double quotes must be escaped with a backslash + return '"' . str_replace('"', '\\"', $str) . '"'; + } + + //Return the string untouched, it doesn't need quoting + return $str; + } + /** * Allows for public read access to 'to' property. * Before the send() call, queued addresses (i.e. with IDN) are not yet included. diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/POP3.php b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/POP3.php index cd6fc2f2e..7d4c88f6c 100644 --- a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/POP3.php +++ b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/POP3.php @@ -45,7 +45,7 @@ class POP3 * * @var string */ - const VERSION = '6.1.5'; + const VERSION = '6.1.6'; /** * Default POP3 port number. diff --git a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/SMTP.php b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/SMTP.php index 1e38ba7da..aa5555149 100644 --- a/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/SMTP.php +++ b/shop/includes/ClicShopping/External/vendor/phpmailer/phpmailer/src/SMTP.php @@ -34,7 +34,7 @@ class SMTP * * @var string */ - const VERSION = '6.1.5'; + const VERSION = '6.1.6'; /** * SMTP line break constant. @@ -1168,7 +1168,7 @@ protected function get_lines() //Must pass vars in here as params are by reference if (!stream_select($selR, $selW, $selW, $this->Timelimit)) { $this->edebug( - 'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)', + 'SMTP -> get_lines(): select timed-out in (' . $this->Timelimit . ' sec)', self::DEBUG_LOWLEVEL ); break; @@ -1187,7 +1187,7 @@ protected function get_lines() $info = stream_get_meta_data($this->smtp_conn); if ($info['timed_out']) { $this->edebug( - 'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)', + 'SMTP -> get_lines(): stream timed-out (' . $this->Timeout . ' sec)', self::DEBUG_LOWLEVEL ); break;