diff options
| author | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-02-18 12:36:12 +0100 |
|---|---|---|
| committer | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-02-18 12:36:12 +0100 |
| commit | 9ecde434cf660da53c8887f4e768f37fdf64dac1 (patch) | |
| tree | cae995edd2f316f8ad3934595bb30678507741d5 | |
| parent | 59209deaf2467372ba0deef5a4266758b366ca70 (diff) | |
Clean up
| -rw-r--r-- | user_guide_src/source/changelog.rst | 3 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/email.rst | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 8d3f3705d..94f7f9e4a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -250,6 +250,8 @@ Release Date: Not Released - Added Redis driver. - Added a *key_prefix* option for cache IDs. - :doc:`Email library <libraries/email>` changes include: + - Added SMTP keepalive option to avoid opening the connection for each ``Email::send()``. Accessible as ``$smtp_keepalive``. + - Empty string passed into useragent will be set to the first valid value in ``$_SERVER['HTTP_USER_AGENT']`` or ``PHP/<version>``. - Added custom filename to ``Email::attach()`` as ``$this->email->attach($filename, $disposition, $newname)``. - Added possibility to send attachment as buffer string in ``Email::attach()`` as ``$this->email->attach($buffer, $disposition, $newname, $mime)``. - Added dsn (delivery status notification) option. @@ -337,6 +339,7 @@ Release Date: Not Released Bug fixes for 3.0 ------------------ +- Fixed a bug (#2255, #2256) where ``smtp_timeout`` was not being applied to read and writes for the socket. - Fixed a bug where ``unlink()`` raised an error if cache file did not exist when you try to delete it. - Fixed a bug (#181) where a mis-spelling was in the form validation language file. - Fixed a bug (#159, #163) that mishandled Query Builder nested transactions because _trans_depth was not getting incremented. diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index 7d468251c..a55f1895d 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -89,6 +89,7 @@ Preference Default Value Options Descript **smtp_pass** No Default None SMTP Password. **smtp_port** 25 None SMTP Port. **smtp_timeout** 5 None SMTP Timeout (in seconds). +**smtp_keepalive** FALSE TRUE or FALSE (boolean) Enable persistent SMTP connections. **smtp_crypto** No Default tls or ssl SMTP Encryption **wordwrap** TRUE TRUE or FALSE (boolean) Enable word-wrap. **wrapchars** 76 Character count to wrap at. |