Merge pull request #1610 from magento-chaika/chaika-pr1

Fixed issue:
MAGETWO-72798 [Backport] - Website doesn't work with Redis cache installed and PhpRedis extension enabled - for 2.1

Author: igrybkov

composer.json

@@ -32,8 +32,8 @@
         "zendframework/zend-log": "~2.4.6",
         "zendframework/zend-http": "~2.4.6",
         "magento/zendframework1": "~1.12.16",
-        "colinmollenhour/credis": "1.6",
-        "colinmollenhour/php-redis-session-abstract": "1.2",
+        "colinmollenhour/credis": "1.8.2",
+        "colinmollenhour/php-redis-session-abstract": "1.3.4",
         "colinmollenhour/cache-backend-redis": "1.9",
         "colinmollenhour/cache-backend-file": "1.4",
         "composer/composer": "<=1.0.0-beta1",

composer.lock

@@ -115,6 +115,11 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      */
     const SESSION_MAX_LIFETIME = 31536000;
 
+    /**
+     * Try to break lock for at most this many seconds
+     */
+    const DEFAULT_FAIL_AFTER = 15;
+
     /**
      * Deployment config
      *
@@ -127,6 +132,11 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
     /**
      * @param DeploymentConfig $deploymentConfig
      * @param State $appState
@@ -288,4 +298,13 @@ public function getLifetime()
         }
         return (int)$this->scopeConfig->getValue(self::XML_PATH_COOKIE_LIFETIME, StoreScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * Get number of seconds to wait before completely failing to break the lock
+     * @return int
+     */
+    public function getFailAfter()
+    {
+        return self::DEFAULT_FAIL_AFTER;
+    }
 }