summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-19 21:04:17 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-19 21:04:17 +0100
commitc3414baae25e6c6c9b33418e1745c4321babee01 (patch)
treec9c98e6b22ea486feb750d4ade29466ccb5bbca3
parentd8e25e94583706b02e0d39f7c108f4fb7ced656d (diff)
parent882c03745c3d593038750997405f5112f0e2d80d (diff)
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
-rw-r--r--system/libraries/Session/Session_driver.php2
-rw-r--r--user_guide_src/source/changelog.rst16
2 files changed, 9 insertions, 9 deletions
diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php
index c4fbde4f8..8edd31999 100644
--- a/system/libraries/Session/Session_driver.php
+++ b/system/libraries/Session/Session_driver.php
@@ -2,7 +2,7 @@
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.2.4
+ * An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8b4f4039e..7211210d7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -283,19 +283,19 @@ Release Date: Not Released
- :doc:`Session Library <libraries/sessions>` changes include:
- - Library changed to :doc:`Driver <general/drivers>` with classic 'cookie' driver as the default.
- - Added a 'native' PHP Session driver to work with ``$_SESSION``.
- - Added a new **tempdata** feature that allows setting userdata items with expiration time (``tempdata()``, ``set_tempdata()``, ``unset_tempdata()``).
- - Added default ``$config['sess_driver']`` and ``$config['sess_valid_drivers']`` items to *application/config.php* file.
- - Changed 'cookie' driver to respect php.ini's *session.gc_probability* and *session.gc_divisor* settings.
- - Changed 'cookie' driver to use HMAC authentication instead of a simple md5 checksum.
- - Changed 'cookie' driver to select only one row when using database sessions.
- - Changed 'cookie' driver to write to only write to the database at end of page execution.
+ - Completely re-written the library to use self-contained drivers via ``$config['sess_driver']``.
+ - Added 'files', 'database', 'redis' and 'memcached' drivers (using 'files' by default).
+ - Added ``$config['sess_save_path']`` setting to specify where the session data is stored, depending on the driver.
+ - Dropped support for storing session data in cookies (which renders ``$config['sess_encrypt_cookie']`` useless and is therefore also removed).
+ - Dropped official support for storing session data in databases other than MySQL and PostgreSQL.
+ - Changed table structure for the 'database' driver.
+ - Added a new **tempdata** feature that allows setting userdata items with expiration time (``mark_as_temp()``, ``tempdata()``, ``set_tempdata()``, ``unset_tempdata()``).
- Changed method ``keep_flashdata()`` to also accept an array of keys.
- Changed methods ``userdata()``, ``flashdata()`` to return an array of all userdata/flashdata when no parameter is passed.
- Deprecated method ``all_userdata()`` - it is now just an alias for ``userdata()`` with no parameters.
- Added method ``has_userdata()`` that verifies the existence of a userdata item.
- Added *debug* level log messages for key events in the session validation process.
+ - Dropped support for the *sess_match_useragent* option.
- :doc:`File Uploading Library <libraries/file_uploading>` changes include: