Merge branch 'MDL-53947-30' of git://github.com/junpataleta/moodle in…

…to MOODLE_30_STABLE
moodle · Jun 8, 2016 · e214b30 · e214b30
2 parents 0e6cbf1 + 8f62c06
commit e214b30
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/classes/session/memcached.php b/lib/classes/session/memcached.php
@@ -136,7 +136,12 @@ public function init() {
         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);
     }