From b4de99127bddcea1b28fe77e2549f9a2153439ba Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Thu, 1 Aug 2019 12:34:44 +0200
Subject: [PATCH] dev #95747 add supports for memcached extension
---
VERSIONS_WIP/95747 | 1 +
library/startup.php | 9 ++++++++-
library/storm | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 VERSIONS_WIP/95747
diff --git a/VERSIONS_WIP/95747 b/VERSIONS_WIP/95747
new file mode 100644
index 00000000000..e3b8446c202
--- /dev/null
+++ b/VERSIONS_WIP/95747
@@ -0,0 +1 @@
+ - ticket #95747 : Bokeh supporte l'extension PHP memcached
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index b6fb3b83c30..3e92bc5b8db 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -177,8 +177,15 @@ class Bokeh_Engine {
: ['cache_dir' => PATH_TEMP ];
// getting a Zend_Cache_Core object
+ $backend = 'File';
+
+ if ($use_memcached) {
+ $backend = extension_loaded('memcached')
+ ? 'Memcached'
+ : 'Memcache';
+ }
$cache = Zend_Cache::factory('Core',
- $use_memcached ? 'Memcached' : 'File',
+ $backend,
$frontendOptions,
$backendOptions);
diff --git a/library/storm b/library/storm
index 8e752b86bc6..94e39cb7d1d 160000
--- a/library/storm
+++ b/library/storm
@@ -1 +1 @@
-Subproject commit 8e752b86bc642f6563eb4b42b20fcbe8ece45b5c
+Subproject commit 94e39cb7d1d85f8969127523c0624474e6ad6ed9
--
GitLab