X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbehavior.c;h=2f5311e5a01ddac70d96cc9c36576983d3b66f79;hb=a8efa12d2d90c3777f3c33347fe002884be1185d;hp=886457a59a7867fcf31e18825aa7d8a037f2a020;hpb=04ef974c23973986d4475e3cb8a876012264e2da;p=awesomized%2Flibmemcached

diff --git a/libmemcached/behavior.c b/libmemcached/behavior.c
index 886457a5..2f5311e5 100644
--- a/libmemcached/behavior.c
+++ b/libmemcached/behavior.c
@@ -55,6 +55,7 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
     ptr->server_failure_limit= (uint32_t)data;
     break;
   case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
+    memcached_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol
     if (data)
     {
       ptr->flags.verify_key= false;
@@ -87,6 +88,10 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
     ptr->flags.tcp_nodelay= set_flag(data);
     memcached_quit(ptr);
     break;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPALIVE:
+    ptr->flags.tcp_keepalive= set_flag(data);
+    memcached_quit(ptr);
+    break;
   case MEMCACHED_BEHAVIOR_DISTRIBUTION:
     return memcached_behavior_set_distribution(ptr, (memcached_server_distribution_t)data);
   case MEMCACHED_BEHAVIOR_KETAMA:
@@ -114,7 +119,7 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
       /**
         @note We try to keep the same distribution going. This should be deprecated and rewritten.
       */
-      return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA); 
+      return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA);
     }
   case MEMCACHED_BEHAVIOR_HASH:
     return memcached_behavior_set_key_hash(ptr, (memcached_hash_t)(data));
@@ -153,6 +158,10 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
     ptr->recv_size= (int32_t)data;
     memcached_quit(ptr);
     break;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPIDLE:
+    ptr->tcp_keepidle= (uint32_t)data;
+    memcached_quit(ptr);
+    break;
   case MEMCACHED_BEHAVIOR_USER_DATA:
     return MEMCACHED_FAILURE;
   case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
@@ -230,7 +239,7 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-inline bool _is_auto_eject_host(const memcached_st *ptr)
+bool _is_auto_eject_host(const memcached_st *ptr)
 {
   return ptr->flags.auto_eject_hosts;
 }
@@ -288,6 +297,8 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return (uint64_t)ptr->snd_timeout;
   case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
     return (uint64_t)ptr->rcv_timeout;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPIDLE:
+    return (uint64_t)ptr->tcp_keepidle;
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       int sock_size= 0;
@@ -324,8 +335,8 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
 
       instance= memcached_server_instance_fetch(ptr, 0);
 
-      /** 
-        @note REFACTOR 
+      /**
+        @note REFACTOR
       */
       if (instance)
       {
@@ -353,6 +364,8 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return ptr->flags.randomize_replica_read;
   case MEMCACHED_BEHAVIOR_CORK:
     return ptr->flags.cork;
+  case MEMCACHED_BEHAVIOR_TCP_KEEPALIVE:
+    return ptr->flags.tcp_keepalive;
   case MEMCACHED_BEHAVIOR_MAX:
   default:
     WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */