From d60f037947b7902092258e8ac920f0d12c44ccf9 Mon Sep 17 00:00:00 2001
From: Robert Coleman <git@robert.net.nz>
Date: Tue, 30 Mar 2021 01:04:57 +1300
Subject: [PATCH] add redis as a valid option for global/session_save

---
 app/code/community/Cm/RedisSession/etc/config.xml         | 8 +++-----
 app/code/core/Mage/Core/Model/Session/Abstract/Varien.php | 5 +++++
 app/etc/local.xml.additional                              | 4 ++--
 app/etc/modules/Cm_RedisSession.xml                       | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/code/community/Cm/RedisSession/etc/config.xml b/app/code/community/Cm/RedisSession/etc/config.xml
index 8c61ed4849f..bf21d925c90 100644
--- a/app/code/community/Cm/RedisSession/etc/config.xml
+++ b/app/code/community/Cm/RedisSession/etc/config.xml
@@ -38,11 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </modules>
     <global>
         <models>
-            <core_mysql4>
-                <rewrite>
-                    <session>Cm_RedisSession_Model_Session</session>
-                </rewrite>
-            </core_mysql4>
+            <cm_redissession>
+                <class>Cm_RedisSession_Model</class>
+            </cm_redissession>
         </models>
     </global>
 </config>
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
index 192c60956a2..b22ae373f4a 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
@@ -71,6 +71,11 @@ public function start($sessionName = null)
                 $sessionResource = Mage::getResourceSingleton('core/session');
                 $sessionResource->setSaveHandler();
                 break;
+            case 'redis':
+                /* @var Cm_RedisSession_Model_Session $sessionResource */
+                $sessionResource = Mage::getSingleton('cm_redissession/session');
+                $sessionResource->setSaveHandler();
+                break;
             case 'user':
                 // getSessionSavePath represents static function for custom session handler setup
                 call_user_func($this->getSessionSavePath());
diff --git a/app/etc/local.xml.additional b/app/etc/local.xml.additional
index afe94ebd305..dbf309a2d49 100644
--- a/app/etc/local.xml.additional
+++ b/app/etc/local.xml.additional
@@ -31,7 +31,7 @@ to app/etc/local.xml manually.
 -->
 <config>
     <global>
-        <session_save><![CDATA[]]></session_save> <!-- db / memcache / empty=files -->
+        <session_save><![CDATA[]]></session_save> <!-- db / memcache / redis / empty=files -->
         <session_save_path><![CDATA[]]></session_save_path><!-- e.g. for memcache session save handler tcp://10.0.0.1:11211?persistent=1&weight=2&timeout=10&retry_interval=10 -->
         <session_cache_limiter><![CDATA[]]></session_cache_limiter><!-- see http://php.net/manual/en/function.session-cache-limiter.php#82174 for possible values -->
         <cache>
@@ -119,7 +119,7 @@ to app/etc/local.xml manually.
         </full_page_cache>
 
         <!-- example of redis session storage -->
-        <session_save>db</session_save>
+        <session_save>redis</session_save>
         <redis_session>                                          <!-- All options seen here are the defaults -->
             <host>127.0.0.1</host>                               <!-- Specify an absolute path if using a unix socket -->
             <port>6379</port>
diff --git a/app/etc/modules/Cm_RedisSession.xml b/app/etc/modules/Cm_RedisSession.xml
index 5eef11fd44f..8f928faa571 100644
--- a/app/etc/modules/Cm_RedisSession.xml
+++ b/app/etc/modules/Cm_RedisSession.xml
@@ -1,7 +1,7 @@
 <config>
   <modules>
     <Cm_RedisSession>
-      <active>false</active>
+      <active>true</active>
       <codePool>community</codePool>
     </Cm_RedisSession>
   </modules>