X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbehavior.cc;h=f5e1f0ac4691957df388e4d70d0814d029fbfff4;hb=1899ec2a3d1f4f180b0109879a966fd6603ece86;hp=7a8b98535a479130b1ef2ad1a0f71c6475a6188f;hpb=c5bd49aee7b7bcb434cc526ff67d4bccddd4ba90;p=awesomized%2Flibmemcached

diff --git a/libmemcached/behavior.cc b/libmemcached/behavior.cc
index 7a8b9853..f5e1f0ac 100644
--- a/libmemcached/behavior.cc
+++ b/libmemcached/behavior.cc
@@ -106,6 +106,7 @@ memcached_return_t memcached_behavior_set(memcached_st *shell,
 
   case MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS:
     ptr->flags.auto_eject_hosts= bool(data);
+    /* fall through */
 
   case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
     if (data == 0)
@@ -116,6 +117,10 @@ memcached_return_t memcached_behavior_set(memcached_st *shell,
     ptr->server_failure_limit= uint32_t(data);
     break;
 
+  case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT:
+    ptr->server_timeout_limit= uint32_t(data);
+    break;
+
   case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
     send_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol
     if (data)
@@ -230,11 +235,6 @@ memcached_return_t memcached_behavior_set(memcached_st *shell,
     break;
 
   case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT:
-    if (data == 0)
-    {
-      return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
-                                        memcached_literal_param("MEMCACHED_BEHAVIOR_RETRY_TIMEOUT requires a value greater then zero."));
-    }
     ptr->retry_timeout= int32_t(data);
     break;
 
@@ -379,6 +379,9 @@ uint64_t memcached_behavior_get(memcached_st *shell,
   case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
     return ptr->server_failure_limit;
 
+  case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT:
+    return ptr->server_timeout_limit;
+
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
     return ptr->flags.use_sort_hosts;
 
@@ -413,7 +416,7 @@ uint64_t memcached_behavior_get(memcached_st *shell,
         return (uint64_t) ptr->send_size;
       }
 
-      org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
+      memcached_instance_st* instance= memcached_instance_fetch(ptr, 0);
 
       if (instance) // If we have an instance we test, otherwise we just set and pray
       {
@@ -447,7 +450,7 @@ uint64_t memcached_behavior_get(memcached_st *shell,
       if (ptr->recv_size != -1) // If value is -1 then we are using the default
         return (uint64_t) ptr->recv_size;
 
-      org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
+      memcached_instance_st* instance= memcached_instance_fetch(ptr, 0);
 
       /**
         @note REFACTOR
@@ -628,6 +631,7 @@ const char *libmemcached_string_behavior(const memcached_behavior_t flag)
 {
   switch (flag)
   {
+  case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT: return "MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT";
   case MEMCACHED_BEHAVIOR_NO_BLOCK: return "MEMCACHED_BEHAVIOR_NO_BLOCK";
   case MEMCACHED_BEHAVIOR_TCP_NODELAY: return "MEMCACHED_BEHAVIOR_TCP_NODELAY";
   case MEMCACHED_BEHAVIOR_HASH: return "MEMCACHED_BEHAVIOR_HASH";