summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-05-09 11:24:52 +0200
committerAndrey Andreev <narf@devilix.net>2016-05-09 11:24:52 +0200
commit8425319eb523ee50b11b06b97738c5a46def84e4 (patch)
tree946d8bbab04ba360c7268f3b1d318e9950607549
parentfd8349f0328cb6c0cd56fd19c931fd79a707faa8 (diff)
[ci skip] Fix #4613
-rw-r--r--system/libraries/Email.php5
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 6 insertions, 0 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index ed6f737a1..cdfb43bb5 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -2153,6 +2153,11 @@ class CI_Email {
return FALSE;
}
+ if ($this->smtp_keepalive)
+ {
+ $this->_smtp_auth = FALSE;
+ }
+
return TRUE;
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d50c0a052..567eb10a6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -27,6 +27,7 @@ Bug fixes for 3.0.7
- Fixed a bug (#4562) - :doc:`Cache Library <libraries/caching>` didn't check if ``Memcached::quit()`` is available before calling it.
- Fixed a bug (#4563) - :doc:`Input Library <libraries/input>` method ``request_headers()`` ignores ``$xss_clean`` parameter value after first call.
- Fixed a bug (#4605) - :doc:`Config Library <libraries/config>` method ``site_url()`` stripped trailing slashes from relative URIs passed to it.
+- Fixed a bug (#4613) - :doc:`Email Library <libraries/config>` failed to send multiple emails via SMTP due to "already authenticated" errors when keep-alive is enabled.
Version 3.0.6
=============