From 9dcc8c9533d4e49a6c0a1e86e7975aefb385c56a Mon Sep 17 00:00:00 2001
From: Igor Melnikov <imelnikov@ebay.com>
Date: Tue, 5 Apr 2016 21:20:46 -0500
Subject: [PATCH] MAGETWO-51068: Admin User session expired despite Session
Lifetime
Install colinmollenhour/php-redis-session-abstract from packagist
---
composer.json | 21 +--------------------
composer.lock | 31 +++++++++++++++++++++++++++----
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/composer.json b/composer.json
index e9880765b17..3734cdd372b 100644
--- a/composer.json
+++ b/composer.json
@@ -7,25 +7,6 @@
"OSL-3.0",
"AFL-3.0"
],
- "repositories": [
- {
- "type": "package",
- "package": {
- "name": "colinmollenhour/php-redis-session-abstract",
- "version": "1.0.100",
- "source": {
- "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
- "type": "git",
- "reference": "95330b7f29663dab81f53d1a438e4d927b6c5f66"
- },
- "autoload": {
- "psr-0": {
- "Cm\\RedisSession\\": "src/"
- }
- }
- }
- }
- ],
"require": {
"php": "~5.5.22|~5.6.0|~7.0.0",
"zendframework/zend-stdlib": "~2.4.6",
@@ -52,7 +33,7 @@
"zendframework/zend-http": "~2.4.6",
"magento/zendframework1": "1.12.16",
"colinmollenhour/credis": "1.6",
- "colinmollenhour/php-redis-session-abstract": "1.0.100",
+ "colinmollenhour/php-redis-session-abstract": "1.1",
"composer/composer": "1.0.0-beta1",
"monolog/monolog": "1.16.0",
"oyejorge/less.php": "1.7.0.3",
diff --git a/composer.lock b/composer.lock
index ab352467239..2f0873b9974 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "5a52eec976eea4fade155b472365d805",
- "content-hash": "2116af7fe8db4568fecdd0d554db22c3",
+ "hash": "666640f73320778f40be99a86695ef1c",
+ "content-hash": "1a3c1d3316e4448159bbcc436015ad2b",
"packages": [
{
"name": "braintree/braintree_php",
@@ -95,18 +95,41 @@
},
{
"name": "colinmollenhour/php-redis-session-abstract",
- "version": "1.0.100",
+ "version": "v1.1",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
"reference": "95330b7f29663dab81f53d1a438e4d927b6c5f66"
},
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/95330b7f29663dab81f53d1a438e4d927b6c5f66",
+ "reference": "95330b7f29663dab81f53d1a438e4d927b6c5f66",
+ "shasum": ""
+ },
+ "require": {
+ "colinmollenhour/credis": "1.6",
+ "magento/zendframework1": "1.12.16",
+ "php": "~5.5.0|~5.6.0|~7.0.0"
+ },
"type": "library",
"autoload": {
"psr-0": {
"Cm\\RedisSession\\": "src/"
}
- }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Colin Mollenhour"
+ }
+ ],
+ "description": "A Redis-based session handler with optimistic locking",
+ "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
+ "time": "2016-02-03 18:13:49"
},
{
"name": "composer/composer",
--
GitLab