X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconstants.h;h=b12a3890ff62a6cafcf7e4a57d158ef1863d0084;hb=9df71462f1663e01d6f4317c60b2f5ae1c4fe1da;hp=6405df29180819b0dabdddec0e8670cacaa0f40a;hpb=acd51e4987d27c762de5639cbff8ec87ff0990c3;p=m6w6%2Flibmemcached

diff --git a/libmemcached/constants.h b/libmemcached/constants.h
index 6405df29..b12a3890 100644
--- a/libmemcached/constants.h
+++ b/libmemcached/constants.h
@@ -21,7 +21,8 @@
 #define MEMCACHED_POINTS_PER_SERVER_KETAMA 160
 #define MEMCACHED_CONTINUUM_SIZE MEMCACHED_POINTS_PER_SERVER*100 /* This would then set max hosts to 100 */
 #define MEMCACHED_STRIDE 4
-#define MEMCACHED_DEFAULT_TIMEOUT 1000
+#define MEMCACHED_DEFAULT_TIMEOUT 5000
+#define MEMCACHED_DEFAULT_CONNECT_TIMEOUT 4000
 #define MEMCACHED_CONTINUUM_ADDITION 10 /* How many extra slots we should build for in the continuum */
 #define MEMCACHED_PREFIX_KEY_MAX_SIZE 128
 #define MEMCACHED_EXPIRATION_NOT_ADD 0xffffffffU
@@ -69,6 +70,9 @@ typedef enum {
   MEMCACHED_E2BIG,
   MEMCACHED_INVALID_ARGUMENTS,
   MEMCACHED_KEY_TOO_BIG,
+  MEMCACHED_AUTH_PROBLEM,
+  MEMCACHED_AUTH_FAILURE,
+  MEMCACHED_AUTH_CONTINUE,
   MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
 } memcached_return_t;
 
@@ -116,6 +120,7 @@ typedef enum {
   MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ,
   MEMCACHED_BEHAVIOR_CORK,
   MEMCACHED_BEHAVIOR_TCP_KEEPALIVE,
+  MEMCACHED_BEHAVIOR_TCP_KEEPIDLE,
   MEMCACHED_BEHAVIOR_MAX
 } memcached_behavior_t;