Upgraded imagemagick and manually altered pdf to image module to handle changes....

[yaffs-website] / web / modules / contrib / memcache / src / DrupalMemcached.php

diff --git a/web/modules/contrib/memcache/src/DrupalMemcached.php b/web/modules/contrib/memcache/src/DrupalMemcached.php
old mode 100644 (file)
new mode 100755 (executable)
index 34d4ac0..3f636bc
--- a/web/modules/contrib/memcache/src/DrupalMemcached.php
+++ b/web/modules/contrib/memcache/src/DrupalMemcached.php
@@ -32,6 +32,12 @@ class DrupalMemcached extends DrupalMemcacheBase {
     foreach ($this->settings->get('options', []) as $key => $value) {
       $this->memcache->setOption($key, $value);
     }
+
+    // SASL configuration to authenticate with Memcached.
+    // Note: this only affects the Memcached PECL extension.
+    if ($sasl_config = $this->settings->get('sasl', [])) {
+      $this->memcache->setSaslAuthData($sasl_config['username'], $sasl_config['password']);
+    }
   }
 
   /**
@@ -42,7 +48,7 @@ class DrupalMemcached extends DrupalMemcacheBase {
 
     if ($host == 'unix') {
       // Memcached expects just the path to the socket without the protocol
-      $host = substr($host, 7);
+      $host = substr($server_path, 7);
       // Port is always 0 for unix sockets.
       $port = 0;
     }
@@ -76,8 +82,12 @@ class DrupalMemcached extends DrupalMemcacheBase {
       $full_keys[$cid] = $full_key;
     }
 
-    $cas_tokens = NULL;
-    $results = $this->memcache->getMulti($full_keys, $cas_tokens, \Memcached::GET_PRESERVE_ORDER);
+    if (PHP_MAJOR_VERSION === 7) {
+      $results = $this->memcache->getMulti($full_keys, \Memcached::GET_PRESERVE_ORDER);
+    } else {
+      $cas_tokens = NULL;
+      $results = $this->memcache->getMulti($full_keys, $cas_tokens, \Memcached::GET_PRESERVE_ORDER);
+    }
 
     // If $results is FALSE, convert it to an empty array.
     if (!$results) {