summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-01-22 13:29:50 +0100
committerAndrey Andreev <narf@devilix.net>2018-01-22 13:29:50 +0100
commit6545f8595480ab64220aacc8a5176383dac4122b (patch)
tree31e9f0a592801fe07dba5d99a3b73526d10b101f /user_guide_src
parent3738910fce3192054cd2815d814ab261c3d3868c (diff)
parent329dd039a211ed7634b45e2c908f7dc375b806a2 (diff)
Merge branch '3.1-stable' into develop
Conflicts resolved: system/libraries/Email.php system/libraries/Form_validation.php
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6a26a165b..37c276f19 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -124,6 +124,14 @@ Version 3.1.8
Release Date: Not Released
+- General Changes
+
+ - Updated :doc:`Email Library <libraries/email>` to always negotiate between TLS 1.0, 1.1, 1.2 when possible (PHP 5.6+) for SMTP connections.
+
+Bug fixes for 3.1.8
+-------------------
+
+- Fixed a bug where :doc:`Form Validation Library <libraries/form_validation>`, :doc:`Email Library <libraries/email>` tried to use ``INTL_IDNA_VARIANT_UTS46`` when it was undeclared.
Version 3.1.7
=============