Selaa lähdekoodia

Libmemcached:
- fixed undefined variable $optName
- removed invalid server to pass tests - needs some review to test if one server of a pool failed


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23219 44c647ce-9c0f-0410-b52a-842ac1e357ba

mabe 15 vuotta sitten
vanhempi
commit
67daf1a7de

+ 1 - 1
library/Zend/Cache/Backend/Libmemcached.php

@@ -126,7 +126,7 @@ class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend
                 $optId = $name;
             } else {
                 $optConst = 'Memcached::OPT_' . strtoupper($name);
-                if (defined($optName)) {
+                if (defined($optConst)) {
                     $optId = constant($optConst);
                 } else {
                     $this->_log("Unknown memcached client option '{$name}' ({$optConst})");

+ 6 - 7
tests/Zend/Cache/LibmemcachedBackendTest.php

@@ -60,13 +60,12 @@ class Zend_Cache_LibmemcachedBackendTest extends Zend_Cache_CommonExtendedBacken
             'port'   => TESTS_ZEND_CACHE_LIBMEMCACHED_PORT,
             'weight' => TESTS_ZEND_CACHE_LIBMEMCACHED_WEIGHT
         );
-        $serverFail = array(
-            'host'   => 'not.exist',
-            'port'   => TESTS_ZEND_CACHE_LIBMEMCACHED_PORT,
-            'weight' => TESTS_ZEND_CACHE_LIBMEMCACHED_WEIGHT
-        );
         $options = array(
-            'servers' => array($serverValid, $serverFail)
+            'servers' => array($serverValid),
+            'client'  => array(
+                'no_block'                 => false, // set Memcached client option by name
+                Memcached::OPT_TCP_NODELAY => false, // set Memcached client option by value
+            ),
         );
         $this->_instance = new Zend_Cache_Backend_Libmemcached($options);
         parent::setUp($notag);
@@ -75,7 +74,7 @@ class Zend_Cache_LibmemcachedBackendTest extends Zend_Cache_CommonExtendedBacken
     public function tearDown()
     {
         parent::tearDown();
-        unset($this->_instance);
+        $this->_instance = null;
         // We have to wait after a memcached flush
         sleep(1);
     }