From 318ff4acd7932130cd3577773333653d1d0b5251 Mon Sep 17 00:00:00 2001 From: Skylar Kelty Date: Tue, 26 Apr 2016 08:35:00 +0100 Subject: [PATCH] MDL-53947 memcached: Fix memcached session warning on PHP7 --- lib/classes/session/memcached.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/classes/session/memcached.php b/lib/classes/session/memcached.php index bf1678bd516..5a1fd4df107 100644 --- a/lib/classes/session/memcached.php +++ b/lib/classes/session/memcached.php @@ -136,7 +136,12 @@ class memcached extends handler { ini_set('memcached.sess_locking', '1'); // Locking is required! // Try to configure lock and expire timeouts - ignored if memcached is before version 2.2.0. - ini_set('memcached.sess_lock_max_wait', $this->acquiretimeout); + if (version_compare($version, '3.0.0-dev') >= 0) { + ini_set('memcached.sess_lock_wait_max', $this->acquiretimeout * 1000); + } else { + ini_set('memcached.sess_lock_max_wait', $this->acquiretimeout); + } + ini_set('memcached.sess_lock_expire', $this->lockexpire); }