From 7657600403b63d7656dce7b18d2880d3703ad57e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 9 Jan 2017 18:55:03 +0200
Subject: [ci skip] Mark the beginning of 3.1.4-dev

---
 user_guide_src/source/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index cccef1cda..0db43940e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,12 @@
 Change Log
 ##########
 
+Version 3.1.4
+=============
+
+Release Date: Not Released
+
+
 Version 3.1.3
 =============
 
-- 
cgit v1.2.3-24-g4f1b


From fa986fe738363069d8ae331f0ae331521cd895d3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 10 Jan 2017 12:22:05 +0200
Subject: Add a testcase and changelog entry for #4975

---
 user_guide_src/source/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0db43940e..47b984eff 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.4
 
 Release Date: Not Released
 
+Bug fixes for 3.1.4
+-------------------
+
+-  Fixed a regression (#4975) - :doc:`Loader Library <libraries/loader>` couldn't handle objects passed as view variables.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 8f9ab65270ae033c5637f8a7d26ae834e9a71d5e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 10 Jan 2017 12:30:38 +0200
Subject: [ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1

See #4967
---
 user_guide_src/source/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 47b984eff..64ebd61a1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.4
 
 Release Date: Not Released
 
+-  General Changes
+
+   -  Updated the :doc:`Image Manipulation Library <libraries/image_lib>` to work-around an issue with some JPEGs when using GD.
+
 Bug fixes for 3.1.4
 -------------------
 
-- 
cgit v1.2.3-24-g4f1b


From 167c295813c9e5dc6c412bad8c9375dae89005ce Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 11 Jan 2017 17:07:02 +0200
Subject: [ci skip] Add changelog entry for #4977

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 64ebd61a1..ab94d6760 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -15,6 +15,7 @@ Bug fixes for 3.1.4
 -------------------
 
 -  Fixed a regression (#4975) - :doc:`Loader Library <libraries/loader>` couldn't handle objects passed as view variables.
+-  Fixed a bug (#4977) - :doc:`Loader Library <libraries/loader>` method ``helper()`` could accept any character as a filename extension separator.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From f44c93f7a3b35b84fe47a70d8b3fd786d0536845 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 11 Jan 2017 21:47:21 +0200
Subject: [ci skip] Add a changelog entry for
 37226c036a52ae857b13109774b1cdfc4b1d4db9

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ab94d6760..b2d00345f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -16,6 +16,7 @@ Bug fixes for 3.1.4
 
 -  Fixed a regression (#4975) - :doc:`Loader Library <libraries/loader>` couldn't handle objects passed as view variables.
 -  Fixed a bug (#4977) - :doc:`Loader Library <libraries/loader>` method ``helper()`` could accept any character as a filename extension separator.
+-  Fixed a regression where the :doc:`Session Library <libraries/sessions>` would fail on a ``session_regenerate_id(TRUE)`` call with the 'database' driver.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 2649e6e3f3d2a44fd09a25e6f8f70848a75dbed5 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 17 Jan 2017 12:47:50 +0200
Subject: [ci skip] Add changelog entry for #4987

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b2d00345f..2769990f8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -17,6 +17,7 @@ Bug fixes for 3.1.4
 -  Fixed a regression (#4975) - :doc:`Loader Library <libraries/loader>` couldn't handle objects passed as view variables.
 -  Fixed a bug (#4977) - :doc:`Loader Library <libraries/loader>` method ``helper()`` could accept any character as a filename extension separator.
 -  Fixed a regression where the :doc:`Session Library <libraries/sessions>` would fail on a ``session_regenerate_id(TRUE)`` call with the 'database' driver.
+-  Fixed a bug (#4987) - :doc:`Query Builder <database/query_builder>` caching didn't keep track of table aliases.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From f565212c5aa07a8016394a3bc66874be83c73d4d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Jan 2017 15:17:00 +0200
Subject: Fix byte-safety issues & actually test for them

---
 user_guide_src/source/changelog.rst | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2769990f8..17069ca32 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,12 @@ Version 3.1.4
 
 Release Date: Not Released
 
+-  **Security**
+
+   -  Updated :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) to call ``mcrypt_create_iv()`` with ``MCRYPT_DEV_URANDOM``.
+   -  Fixed byte-safety issues in :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) when ``mbstring.func_overload`` is enabled.
+   -  Fixed byte-safety issues in :doc:`Encryption Library <libraries/encryption>` when ``mbstring.func_overload`` is enabled.
+
 -  General Changes
 
    -  Updated the :doc:`Image Manipulation Library <libraries/image_lib>` to work-around an issue with some JPEGs when using GD.
@@ -18,6 +24,7 @@ Bug fixes for 3.1.4
 -  Fixed a bug (#4977) - :doc:`Loader Library <libraries/loader>` method ``helper()`` could accept any character as a filename extension separator.
 -  Fixed a regression where the :doc:`Session Library <libraries/sessions>` would fail on a ``session_regenerate_id(TRUE)`` call with the 'database' driver.
 -  Fixed a bug (#4987) - :doc:`Query Builder <database/query_builder>` caching didn't keep track of table aliases.
+-  Fixed a bug where :doc:`Text Helper <helpers/text_helper>` function ``ascii_to_entities()`` wasn't byte-safe when ``mbstring.func_overload`` is enabled.
 
 Version 3.1.3
 =============
@@ -82,7 +89,7 @@ Bug fixes for 3.1.2
 -  Fixed a regression (#4874) - :doc:`Session Library <libraries/sessions>` didn't take into account ``session.hash_bits_per_character`` when validating session IDs.
 -  Fixed a bug (#4871) - :doc:`Query Builder <database/query_builder>` method ``update_batch()`` didn't properly handle identifier escaping.
 -  Fixed a bug (#4884) - :doc:`Query Builder <database/query_builder>` didn't properly parse field names ending in 'is' when used inside WHERE and HAVING statements.
--  Fixed a bug where ``CI_Log``, ``CI_Output``, ``CI_Email`` and ``CI_Zip`` didn't handle strings in a byte-safe manner when ``mbstring.func_override`` is enabled.
+-  Fixed a bug where ``CI_Log``, ``CI_Output``, ``CI_Email`` and ``CI_Zip`` didn't handle strings in a byte-safe manner when ``mbstring.func_overload`` is enabled.
 
 Version 3.1.1
 =============
@@ -119,7 +126,7 @@ Bug fixes for 3.1.1
 -  Fixed a bug where :doc:`Query Builder <database/query_builder>` method ``insert_batch()`` tried to execute an unsupported SQL query with the 'ibase' and 'pdo/firebird' drivers.
 -  Fixed a bug (#4809) - :doc:`Database <database/index>` driver 'pdo/mysql' didn't turn off ``AUTOCOMMIT`` when starting a transaction.
 -  Fixed a bug (#4822) - :doc:`CAPTCHA Helper <helpers/captcha_helper>` didn't clear expired PNG images.
--  Fixed a bug (#4823) - :doc:`Session Library <libraries/sessions>` 'files' driver could enter an infinite loop if ``mbstring.func_override`` is enabled.
+-  Fixed a bug (#4823) - :doc:`Session Library <libraries/sessions>` 'files' driver could enter an infinite loop if ``mbstring.func_overload`` is enabled.
 -  Fixed a bug (#4851) - :doc:`Database Forge <database/forge>` didn't quote schema names passed to its ``create_database()`` method.
 -  Fixed a bug (#4863) - :doc:`HTML Table Library <libraries/table>` method ``set_caption()`` was missing method chaining support.
 -  Fixed a bug (#4843) - :doc:`XML-RPC Library <libraries/xmlrpc>` client class didn't set a read/write socket timeout.
-- 
cgit v1.2.3-24-g4f1b


From c0c74d5201c171cd6d0cdc2133e63077ebe1a407 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Jan 2017 15:26:35 +0200
Subject: More byte-safety

---
 user_guide_src/source/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 17069ca32..7d1302b3a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,6 +12,7 @@ Release Date: Not Released
    -  Updated :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) to call ``mcrypt_create_iv()`` with ``MCRYPT_DEV_URANDOM``.
    -  Fixed byte-safety issues in :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) when ``mbstring.func_overload`` is enabled.
    -  Fixed byte-safety issues in :doc:`Encryption Library <libraries/encryption>` when ``mbstring.func_overload`` is enabled.
+   -  Fixed byte-safety issues in :doc:`compatibility function <general/compatibility_functions>` ``password_hash()`` when ``mbstring.func_overload`` is enabled.
 
 -  General Changes
 
@@ -25,6 +26,8 @@ Bug fixes for 3.1.4
 -  Fixed a regression where the :doc:`Session Library <libraries/sessions>` would fail on a ``session_regenerate_id(TRUE)`` call with the 'database' driver.
 -  Fixed a bug (#4987) - :doc:`Query Builder <database/query_builder>` caching didn't keep track of table aliases.
 -  Fixed a bug where :doc:`Text Helper <helpers/text_helper>` function ``ascii_to_entities()`` wasn't byte-safe when ``mbstring.func_overload`` is enabled.
+-  Fixed a bug where ``CI_Log``, ``CI_Output``, ``CI_Email`` and ``CI_Zip`` didn't handle strings in a byte-safe manner when ``mbstring.func_overload`` is enabled.
+-  Fixed a bug where :doc:`Session Library <libraries/sessions>` didn't read session data in a byte-safe manner when ``mbstring.func_overload`` is enabled.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 25461d8eac80c0f1242150f7316ec58ac14c5d39 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Jan 2017 15:42:43 +0200
Subject: hash_pbkdf2() byte-safety

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7d1302b3a..ce82f071c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,7 +12,7 @@ Release Date: Not Released
    -  Updated :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) to call ``mcrypt_create_iv()`` with ``MCRYPT_DEV_URANDOM``.
    -  Fixed byte-safety issues in :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) when ``mbstring.func_overload`` is enabled.
    -  Fixed byte-safety issues in :doc:`Encryption Library <libraries/encryption>` when ``mbstring.func_overload`` is enabled.
-   -  Fixed byte-safety issues in :doc:`compatibility function <general/compatibility_functions>` ``password_hash()`` when ``mbstring.func_overload`` is enabled.
+   -  Fixed byte-safety issues in :doc:`compatibility functions <general/compatibility_functions>` ``password_hash()``, ``hash_pbkdf2()`` when ``mbstring.func_overload`` is enabled.
 
 -  General Changes
 
-- 
cgit v1.2.3-24-g4f1b


From dba035db1cee163e6c3d9de9903125ed239386d7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 23 Jan 2017 12:01:32 +0200
Subject: [ci skip] Add changelog entries for PR #4990

---
 user_guide_src/source/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ce82f071c..b1dadb14b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -28,6 +28,8 @@ Bug fixes for 3.1.4
 -  Fixed a bug where :doc:`Text Helper <helpers/text_helper>` function ``ascii_to_entities()`` wasn't byte-safe when ``mbstring.func_overload`` is enabled.
 -  Fixed a bug where ``CI_Log``, ``CI_Output``, ``CI_Email`` and ``CI_Zip`` didn't handle strings in a byte-safe manner when ``mbstring.func_overload`` is enabled.
 -  Fixed a bug where :doc:`Session Library <libraries/sessions>` didn't read session data in a byte-safe manner when ``mbstring.func_overload`` is enabled.
+-  Fixed a bug (#4990) - :doc:`Profiler <general/profiling>` didn't close ``<pre>`` tags it generated.
+-  Fixed a bug (#4990) - :doc:`Profiler <general/profiling>` didn't HTML-escape quotes for ``$_SESSION`` variables.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 422b8890e8b41a9ecf6644bff169c8c82fa2c82d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 1 Feb 2017 14:36:49 +0200
Subject: Fix a CI_Input::set_cookie() bug

Found on StackOverflow: https://stackoverflow.com/questions/41925028/codeigniter-config-overrides-set-cookie-parameters
---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b1dadb14b..28a862126 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -30,6 +30,7 @@ Bug fixes for 3.1.4
 -  Fixed a bug where :doc:`Session Library <libraries/sessions>` didn't read session data in a byte-safe manner when ``mbstring.func_overload`` is enabled.
 -  Fixed a bug (#4990) - :doc:`Profiler <general/profiling>` didn't close ``<pre>`` tags it generated.
 -  Fixed a bug (#4990) - :doc:`Profiler <general/profiling>` didn't HTML-escape quotes for ``$_SESSION`` variables.
+-  Fixed a bug where :doc:`Input Library <libraries/input>` method ``set_cookie()`` didn't allow its *httponly* and *secure* parameters to be overriden to ``FALSE``.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 7173c9641df9b39a5f07d3b57a8c05cabefcfa52 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Feb 2017 10:37:50 +0200
Subject: [ci skip] Add changelog entries for PR #5006

---
 user_guide_src/source/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 28a862126..ed1f18666 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -31,6 +31,8 @@ Bug fixes for 3.1.4
 -  Fixed a bug (#4990) - :doc:`Profiler <general/profiling>` didn't close ``<pre>`` tags it generated.
 -  Fixed a bug (#4990) - :doc:`Profiler <general/profiling>` didn't HTML-escape quotes for ``$_SESSION`` variables.
 -  Fixed a bug where :doc:`Input Library <libraries/input>` method ``set_cookie()`` didn't allow its *httponly* and *secure* parameters to be overriden to ``FALSE``.
+-  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`get_mimes()` didn't load *application/config/mimes.php* if an environment specific config exists.
+-  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`remove_invisible_characters()` didn't remove URL-encoded ``0x7F``.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From cdf1bfb73f9d7aec0eeb7e3a0299fee25b48d6ef Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Feb 2017 11:50:12 +0200
Subject: [ci skip] Add a changelog entry for #4815, PR #5023

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ed1f18666..8283f530c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -33,6 +33,7 @@ Bug fixes for 3.1.4
 -  Fixed a bug where :doc:`Input Library <libraries/input>` method ``set_cookie()`` didn't allow its *httponly* and *secure* parameters to be overriden to ``FALSE``.
 -  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`get_mimes()` didn't load *application/config/mimes.php* if an environment specific config exists.
 -  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`remove_invisible_characters()` didn't remove URL-encoded ``0x7F``.
+-  Fixed a bug (#4815) - :doc:`Database Library <database/index>` stripped URL-encoded sequences while escaping strings with the 'mssql' driver.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 356bc66ebcd6a4d48c28fd119233e9d0bb12375f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Mar 2017 14:39:28 +0200
Subject: Fix #5044; add unit tests for img() HTML helper

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8283f530c..8d2beb74f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -34,6 +34,7 @@ Bug fixes for 3.1.4
 -  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`get_mimes()` didn't load *application/config/mimes.php* if an environment specific config exists.
 -  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`remove_invisible_characters()` didn't remove URL-encoded ``0x7F``.
 -  Fixed a bug (#4815) - :doc:`Database Library <database/index>` stripped URL-encoded sequences while escaping strings with the 'mssql' driver.
+-  Fixed a bug (#5044) - :doc:`HTML Helper <helpers/html_helper>` function :php:func:`img()` didn't accept ``data:`` URI schemes for the image source.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From ea0735264dfebd64858933e03a3b33323b14178e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 14 Mar 2017 18:42:12 +0200
Subject: Fix #5050

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8d2beb74f..fd6c1c790 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -35,6 +35,7 @@ Bug fixes for 3.1.4
 -  Fixed a bug (#5006) - :doc:`common function <general/common_functions>` :php:func:`remove_invisible_characters()` didn't remove URL-encoded ``0x7F``.
 -  Fixed a bug (#4815) - :doc:`Database Library <database/index>` stripped URL-encoded sequences while escaping strings with the 'mssql' driver.
 -  Fixed a bug (#5044) - :doc:`HTML Helper <helpers/html_helper>` function :php:func:`img()` didn't accept ``data:`` URI schemes for the image source.
+-  Fixed a bug (#5050) - :doc:`Database Library <database/index>` tried to access an undefined property in a number of error handling cases.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 62b655b92667f1e417a4f260a34ff447ddeee2c2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Mar 2017 09:14:14 +0200
Subject: Fix #5057

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index fd6c1c790..32f2b81e6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -36,6 +36,7 @@ Bug fixes for 3.1.4
 -  Fixed a bug (#4815) - :doc:`Database Library <database/index>` stripped URL-encoded sequences while escaping strings with the 'mssql' driver.
 -  Fixed a bug (#5044) - :doc:`HTML Helper <helpers/html_helper>` function :php:func:`img()` didn't accept ``data:`` URI schemes for the image source.
 -  Fixed a bug (#5050) - :doc:`Database Library <database/index>` tried to access an undefined property in a number of error handling cases.
+-  Fixed a bug (#5057) - :doc:`Database <database/index>` driver 'postgre' didn't actually apply extra options (such as 'connect_timeout') to its DSN.
 
 Version 3.1.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From df33ec2e45356895c5aec0a1ebfc325c2af4f74a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Mar 2017 17:43:58 +0200
Subject: Fix Apache header injection vulnerability in set_status_header()

---
 user_guide_src/source/changelog.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 32f2b81e6..d891b786b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -9,10 +9,11 @@ Release Date: Not Released
 
 -  **Security**
 
-   -  Updated :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) to call ``mcrypt_create_iv()`` with ``MCRYPT_DEV_URANDOM``.
+   -  Fixed a header injection vulnerability in :doc:`common function <general/common_functions>` :php:func:`set_status_header()` under Apache (thanks to Guillermo Caminer from `Flowgate <https://flowgate.net/>`_).
    -  Fixed byte-safety issues in :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) when ``mbstring.func_overload`` is enabled.
    -  Fixed byte-safety issues in :doc:`Encryption Library <libraries/encryption>` when ``mbstring.func_overload`` is enabled.
    -  Fixed byte-safety issues in :doc:`compatibility functions <general/compatibility_functions>` ``password_hash()``, ``hash_pbkdf2()`` when ``mbstring.func_overload`` is enabled.
+   -  Updated :doc:`Encrypt Library <libraries/encrypt>` (DEPRECATED) to call ``mcrypt_create_iv()`` with ``MCRYPT_DEV_URANDOM``.
 
 -  General Changes
 
-- 
cgit v1.2.3-24-g4f1b


From f58643bab5e5a868aabdaa64668cdb67a9b82fbb Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Mar 2017 17:46:23 +0200
Subject: [ci skip] Prepare 3.1.4 release

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d891b786b..1369eab96 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
 Version 3.1.4
 =============
 
-Release Date: Not Released
+Release Date: March 23, 2017
 
 -  **Security**
 
-- 
cgit v1.2.3-24-g4f1b


From f83d10b375bd028480a47ec3c0bbb2b07dcabfee Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Mar 2017 17:55:38 +0200
Subject: [ci skip] Mark the start of 3.1.5-dev

---
 user_guide_src/source/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1369eab96..d7418ffa2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,12 @@
 Change Log
 ##########
 
+Version 3.1.5
+=============
+
+Release Date: Not Released
+
+
 Version 3.1.4
 =============
 
-- 
cgit v1.2.3-24-g4f1b


From 0eb38af2eaf1127b9b82261b7ec3bf4d4b847318 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Mar 2017 19:38:59 +0200
Subject: [ci skip] Fix 3.1.4 release date ...

Apparently, I'm from the future.
---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d7418ffa2..209193bb0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -11,7 +11,7 @@ Release Date: Not Released
 Version 3.1.4
 =============
 
-Release Date: March 23, 2017
+Release Date: March 20, 2017
 
 -  **Security**
 
-- 
cgit v1.2.3-24-g4f1b


From bdcafdfa204b041493707caa277915e00a124eaf Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 28 Mar 2017 17:31:09 +0300
Subject: [ci skip] Fix 5070

---
 user_guide_src/source/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 209193bb0..00eaedaf2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.5
 
 Release Date: Not Released
 
+Bug fixes for 3.1.5
+-------------------
+
+-  Fixed a bug (#5070) - :doc:`Email Library <libraries/email>` didn't properly detect 7-bit encoding.
 
 Version 3.1.4
 =============
-- 
cgit v1.2.3-24-g4f1b


From c94b244671309f0a993fba205307b51f514242d4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 18 Apr 2017 10:53:45 +0300
Subject: [ci skip] Add changelog entry for #5084, PR #5085

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 00eaedaf2..c015f1c93 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -11,6 +11,7 @@ Bug fixes for 3.1.5
 -------------------
 
 -  Fixed a bug (#5070) - :doc:`Email Library <libraries/email>` didn't properly detect 7-bit encoding.
+-  Fixed a bug (#5084) - :doc:`XML-RPC Library <libraries/xmlrpc>` errored because of a variable name typo.
 
 Version 3.1.4
 =============
-- 
cgit v1.2.3-24-g4f1b


From e6682fc34782ccf4fc6da0409448639942f8a222 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 9 May 2017 09:46:40 +0300
Subject: [ci skip] Add changelog entry for PR #5108

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c015f1c93..dbba5a687 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,6 +12,7 @@ Bug fixes for 3.1.5
 
 -  Fixed a bug (#5070) - :doc:`Email Library <libraries/email>` didn't properly detect 7-bit encoding.
 -  Fixed a bug (#5084) - :doc:`XML-RPC Library <libraries/xmlrpc>` errored because of a variable name typo.
+-  Fixed a bug (#5108) - :doc:`Inflector Helper <helpers/inflector_helper>` function :php:func:`singular()` didn't properly handle 'quizzes'.
 
 Version 3.1.4
 =============
-- 
cgit v1.2.3-24-g4f1b


From 26ba694fb2aca751e8fa18e7c73f2c5e0c1c13ab Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 25 May 2017 11:55:11 +0300
Subject: [ci skip] Doc changes following PR #5130

---
 user_guide_src/source/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dbba5a687..c8348b0d7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.5
 
 Release Date: Not Released
 
+-  General Changes
+
+   -  Updated :doc:`Form Helper <helpers/form_helper>` function :php:func:`form_label()` to accept HTML attributes as a string.
+
 Bug fixes for 3.1.5
 -------------------
 
-- 
cgit v1.2.3-24-g4f1b


From ab0010f543d88fa19506907684a9d329d4dd94e3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 25 May 2017 12:14:41 +0300
Subject: [ci skip] Fix #5131

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c8348b0d7..aed8413f7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -17,6 +17,7 @@ Bug fixes for 3.1.5
 -  Fixed a bug (#5070) - :doc:`Email Library <libraries/email>` didn't properly detect 7-bit encoding.
 -  Fixed a bug (#5084) - :doc:`XML-RPC Library <libraries/xmlrpc>` errored because of a variable name typo.
 -  Fixed a bug (#5108) - :doc:`Inflector Helper <helpers/inflector_helper>` function :php:func:`singular()` didn't properly handle 'quizzes'.
+-  Fixed a regression (#5131) - private controller methods triggered PHP errors instead of a 404 response.
 
 Version 3.1.4
 =============
-- 
cgit v1.2.3-24-g4f1b


From 7ff61363b7f153670e9c8e4972eb5b842fc4ea53 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 13 Jun 2017 13:26:31 +0300
Subject: [ci skip] Apply PR #5150 patch to pdo/oci and add changelog entry

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index aed8413f7..97cad70d1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -18,6 +18,7 @@ Bug fixes for 3.1.5
 -  Fixed a bug (#5084) - :doc:`XML-RPC Library <libraries/xmlrpc>` errored because of a variable name typo.
 -  Fixed a bug (#5108) - :doc:`Inflector Helper <helpers/inflector_helper>` function :php:func:`singular()` didn't properly handle 'quizzes'.
 -  Fixed a regression (#5131) - private controller methods triggered PHP errors instead of a 404 response.
+-  Fixed a bug (#5150) - :doc:`Database Forge <database/forge>` method ``modify_column()`` triggered an error while renaming columns with the 'oci8', 'pdo/oci' drivers.
 
 Version 3.1.4
 =============
-- 
cgit v1.2.3-24-g4f1b


From da6ac585e32ffb036ec3cb6b0475407901146e4a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 15 Jun 2017 14:24:51 +0300
Subject: [ci skip] Add changelog entry for #5155

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 97cad70d1..362cd8c84 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -19,6 +19,7 @@ Bug fixes for 3.1.5
 -  Fixed a bug (#5108) - :doc:`Inflector Helper <helpers/inflector_helper>` function :php:func:`singular()` didn't properly handle 'quizzes'.
 -  Fixed a regression (#5131) - private controller methods triggered PHP errors instead of a 404 response.
 -  Fixed a bug (#5150) - :doc:`Database Forge <database/forge>` method ``modify_column()`` triggered an error while renaming columns with the 'oci8', 'pdo/oci' drivers.
+-  Fixed a bug (#5155) - :doc:`Query Builder <database/query_builder>` method ``count_all_results()`` returned incorrect result for queries using ``LIMIT``, ``OFFSET``.
 
 Version 3.1.4
 =============
-- 
cgit v1.2.3-24-g4f1b


From ed1a0453a9372e88058169f2028c9a2140318961 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 19 Jun 2017 08:25:23 +0300
Subject: [ci skip] Fix a bug in FV valid_email()

---
 user_guide_src/source/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 362cd8c84..4695edc72 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.5
 
 Release Date: Not Released
 
+-  **Security**
+
+   -  :doc:`Form Validation Library <libraries/form_validation>` rule ``valid_email`` could be bypassed if ``idn_to_ascii()`` is available.
+
 -  General Changes
 
    -  Updated :doc:`Form Helper <helpers/form_helper>` function :php:func:`form_label()` to accept HTML attributes as a string.
-- 
cgit v1.2.3-24-g4f1b


From 5b0e1f222cc96ed55d524008e1edcf9058e5132d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 19 Jun 2017 11:29:39 +0300
Subject: [ci skip] Prepare 3.1.5 release

---
 user_guide_src/source/changelog.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4695edc72..21a1c0c44 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
 Version 3.1.5
 =============
 
-Release Date: Not Released
+Release Date: Jun 19, 2017
 
 -  **Security**
 
@@ -28,7 +28,7 @@ Bug fixes for 3.1.5
 Version 3.1.4
 =============
 
-Release Date: March 20, 2017
+Release Date: Mar 20, 2017
 
 -  **Security**
 
-- 
cgit v1.2.3-24-g4f1b


From 47f540e82cbc1591cc7f1aa92d47a8c8c4028c63 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 19 Jun 2017 11:38:25 +0300
Subject: [ci skip] Starting 3.1.6-dev

---
 user_guide_src/source/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 21a1c0c44..3012b9eb2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,12 @@
 Change Log
 ##########
 
+Version 3.1.6
+=============
+
+Release Date: Not Released
+
+
 Version 3.1.5
 =============
 
-- 
cgit v1.2.3-24-g4f1b


From 894a3f2c9fe111af35dee4f5e8e711259b893fb6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 27 Jun 2017 16:31:17 +0300
Subject: Fix #5164

---
 user_guide_src/source/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3012b9eb2..fd7485f64 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,6 +8,11 @@ Version 3.1.6
 Release Date: Not Released
 
 
+Bug fixes for 3.1.6
+-------------------
+
+-  Fixed a bug (#5164) - :doc:`Loader Library <libraries/loader>` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name.
+
 Version 3.1.5
 =============
 
-- 
cgit v1.2.3-24-g4f1b


From 59bae57503865f6dcea91fc20fd2729b2e79bb74 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 3 Jul 2017 14:13:08 +0300
Subject: [ci skip] Fix #5168

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index fd7485f64..77648a937 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,6 +12,7 @@ Bug fixes for 3.1.6
 -------------------
 
 -  Fixed a bug (#5164) - :doc:`Loader Library <libraries/loader>` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name.
+-  Fixed a bug (#5168) - :doc:`Query Builder <database/query_builder>` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 93d759dd84dc1eefb5f968d70177973a84c1df70 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 6 Jul 2017 11:54:16 +0300
Subject: [ci skip] Add changelog entry for PR #5170

---
 user_guide_src/source/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 77648a937..b1dc618b2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.6
 
 Release Date: Not Released
 
+-  General Changes
+
+   -  Updated the :doc:`Session Library <libraries/sessions>` 'redis', 'memcached' drivers to reduce the potential of a locking race conditions.
+
 
 Bug fixes for 3.1.6
 -------------------
-- 
cgit v1.2.3-24-g4f1b


From e5b9f66a92c6352ca725520db4d9390247088a5a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 10 Jul 2017 14:42:14 +0300
Subject: [ci skip] Add changelog entry for #5128

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b1dc618b2..c6c339f07 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -17,6 +17,7 @@ Bug fixes for 3.1.6
 
 -  Fixed a bug (#5164) - :doc:`Loader Library <libraries/loader>` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name.
 -  Fixed a bug (#5168) - :doc:`Query Builder <database/query_builder>` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
+-  Fixed a bug (#5128) - :doc:`Profiler <general/profiling>` didn't wrap ``$_SESSION`` and configuration arrays in ``<pre>`` tags.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 29740e442a1d78bd65b569c92575cdbf4fc2d614 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 14 Jul 2017 13:08:35 +0300
Subject: [ci skip] Add changelog entry for #5183

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c6c339f07..828c9d30d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -18,6 +18,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5164) - :doc:`Loader Library <libraries/loader>` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name.
 -  Fixed a bug (#5168) - :doc:`Query Builder <database/query_builder>` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 -  Fixed a bug (#5128) - :doc:`Profiler <general/profiling>` didn't wrap ``$_SESSION`` and configuration arrays in ``<pre>`` tags.
+-  Fixed a bug (#5183) - :doc:`Database Library <database/index>` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 6cab78970f212a30ea923835510ffd1fb77a6ad0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 17 Jul 2017 13:14:00 +0300
Subject: [ci skip] escapeshellarg on the image src path passed to NetPBM by
 Image_lib

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 828c9d30d..d6984bb7b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -19,6 +19,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5168) - :doc:`Query Builder <database/query_builder>` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 -  Fixed a bug (#5128) - :doc:`Profiler <general/profiling>` didn't wrap ``$_SESSION`` and configuration arrays in ``<pre>`` tags.
 -  Fixed a bug (#5183) - :doc:`Database Library <database/index>` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
+-  Fixed a bug where :doc:`Image Manipulation Library <libraries/image_lib>` didn't escape image source paths passed to NetPBM as shell arguments.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 613b898234debcaea5ec9160e5249358ac7e3dfc Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 25 Aug 2017 13:24:51 +0300
Subject: [ci skip] Fix #5236

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d6984bb7b..9d6620662 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -20,6 +20,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5128) - :doc:`Profiler <general/profiling>` didn't wrap ``$_SESSION`` and configuration arrays in ``<pre>`` tags.
 -  Fixed a bug (#5183) - :doc:`Database Library <database/index>` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 -  Fixed a bug where :doc:`Image Manipulation Library <libraries/image_lib>` didn't escape image source paths passed to NetPBM as shell arguments.
+-  Fixed a bug (#5236) - :doc:`Query Builder <database/query_builder>` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"<tablename>".*`` in the ``SELECT`` clause.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From c4e7999ded26a1acbefdf7f9eebb69772860bb23 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 31 Aug 2017 16:05:37 +0300
Subject: [ci skip] Add changelog entry for #5243

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9d6620662..64c98e127 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -21,6 +21,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5183) - :doc:`Database Library <database/index>` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 -  Fixed a bug where :doc:`Image Manipulation Library <libraries/image_lib>` didn't escape image source paths passed to NetPBM as shell arguments.
 -  Fixed a bug (#5236) - :doc:`Query Builder <database/query_builder>` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"<tablename>".*`` in the ``SELECT`` clause.
+-  Fixed a bug (#5243) - :doc:`Database Library <database/index>` method ``version()`` didn't work with the 'pdo/dblib' driver.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5e88ea5b2d8c75c896094036ff7c4c3e0254258f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 4 Sep 2017 15:13:37 +0300
Subject: Fix #5246

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 64c98e127..372ceeb3b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -22,6 +22,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug where :doc:`Image Manipulation Library <libraries/image_lib>` didn't escape image source paths passed to NetPBM as shell arguments.
 -  Fixed a bug (#5236) - :doc:`Query Builder <database/query_builder>` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"<tablename>".*`` in the ``SELECT`` clause.
 -  Fixed a bug (#5243) - :doc:`Database Library <database/index>` method ``version()`` didn't work with the 'pdo/dblib' driver.
+-  Fixed a bug (#5246) - :doc:`Database transactions <database/transactions>` status wasn't reset unless ``trans_complete()`` was called.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 9385cfed8e61c4568d5ec93c8ee8900f314a5a5a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 13 Sep 2017 13:17:28 +0300
Subject: Fix #5260

---
 user_guide_src/source/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 372ceeb3b..055e2d08c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -23,6 +23,8 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5236) - :doc:`Query Builder <database/query_builder>` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"<tablename>".*`` in the ``SELECT`` clause.
 -  Fixed a bug (#5243) - :doc:`Database Library <database/index>` method ``version()`` didn't work with the 'pdo/dblib' driver.
 -  Fixed a bug (#5246) - :doc:`Database transactions <database/transactions>` status wasn't reset unless ``trans_complete()`` was called.
+-  Fixed a bug (#5260) - :doc:`Database Utilities <database/utilities>` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver.
+-  Fixed a bug where :doc:`Database Results <database/results>` method ``field_data()`` didn't parse field types with the 'mysqli' driver.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 88c1a597360f5b63371c119b64e913c9238c75b8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 25 Sep 2017 14:39:34 +0300
Subject: [ci skip] Fix potential object injection in apc cache driver;
 deprecate the apc driver

---
 user_guide_src/source/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 055e2d08c..dcfe7b481 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,8 +7,13 @@ Version 3.1.6
 
 Release Date: Not Released
 
+-  **Security**
+
+   -  Fixed a potential object injection in :doc:`Cache Library <libraries/caching>` 'apc' driver when ``save()`` is used with ``$raw = TRUE`` (thanks to Tomas Bortoli).
+
 -  General Changes
 
+   -  Deprecated :doc:`Cache Library Library <libraries/caching>` driver 'apc'.
    -  Updated the :doc:`Session Library <libraries/sessions>` 'redis', 'memcached' drivers to reduce the potential of a locking race conditions.
 
 
-- 
cgit v1.2.3-24-g4f1b


From cf728703b5852591c160cbd9566a0e508dd5759a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 25 Sep 2017 19:37:44 +0300
Subject: [ci skip] Prepare 3.1.6 release

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dcfe7b481..e5387cc5a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
 Version 3.1.6
 =============
 
-Release Date: Not Released
+Release Date: Sep 25, 2017
 
 -  **Security**
 
-- 
cgit v1.2.3-24-g4f1b