diff options
| author | Andrey Andreev <narf@devilix.net> | 2021-01-05 13:28:01 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2021-01-05 13:28:01 +0100 |
| commit | 04fa59834e4f6906f383acf13f921104d397cf96 (patch) | |
| tree | 7192ec26e355df3b7c7f52d637078142b7ccbb8b | |
| parent | 18718545e0faa98d62df3f65d045d84494ec29ca (diff) | |
[ci skip] Add TLS support for Session library Redis connection strings (related: issue #5982, PR #5983)
| -rw-r--r-- | system/libraries/Session/drivers/Session_redis_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php index 1db02521e..df99cc74a 100644 --- a/system/libraries/Session/drivers/Session_redis_driver.php +++ b/system/libraries/Session/drivers/Session_redis_driver.php @@ -137,7 +137,7 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle { $save_path = array('path' => $matches[1]); } - elseif (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(?<options>\?.+)?#', $this->_config['save_path'], $matches)) + elseif (preg_match('#(?:(?:tcp|tls)://)?([^:?]+)(?:\:(\d+))?(?<options>\?.+)?#', $this->_config['save_path'], $matches)) { $save_path = array( 'host' => $matches[1], diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 774a6c3c8..16d224686 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -37,7 +37,7 @@ Release Date: Not Released - Removed previously deprecated *Cart Library*. - Removed previously deprecated *Javascript Library* (it was always experimental in the first place). - - Added UNIX socket connection support to :doc:`Session Library <libraries/sessions>` 'redis' driver. + - Added TLS and UNIX socket connection support to :doc:`Session Library <libraries/sessions>` 'redis' driver. - Updated :doc:`ZIP Library <libraries/zip>` method ``read_dir()`` to include hidden (dot-prefixed) files. - :doc:`Cache Library <libraries/caching>` changes include: |