projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch
[awesomized/libmemcached]
/
libmemcached-1.0
/
struct
/
memcached.h
diff --git
a/libmemcached-1.0/struct/memcached.h
b/libmemcached-1.0/struct/memcached.h
index 152f310330c8402428df3500a5a39731372c2269..2bffbebbb7aca7d5009dd7ee381f52147c745a14 100644
(file)
--- a/
libmemcached-1.0/struct/memcached.h
+++ b/
libmemcached-1.0/struct/memcached.h
@@
-54,7
+54,7
@@
struct memcached_st {
bool buffer_requests:1;
bool hash_with_namespace:1;
bool no_block:1; // Don't block
bool buffer_requests:1;
bool hash_with_namespace:1;
bool no_block:1; // Don't block
- bool
no_
reply:1;
+ bool reply:1;
bool randomize_replica_read:1;
bool support_cas:1;
bool tcp_nodelay:1;
bool randomize_replica_read:1;
bool support_cas:1;
bool tcp_nodelay:1;
@@
-62,6
+62,7
@@
struct memcached_st {
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
+ bool is_aes:1;
} flags;
memcached_server_distribution_t distribution;
} flags;
memcached_server_distribution_t distribution;
@@
-82,6
+83,7
@@
struct memcached_st {
int32_t poll_timeout;
int32_t connect_timeout; // How long we will wait on connect() before we will timeout
int32_t retry_timeout;
int32_t poll_timeout;
int32_t connect_timeout; // How long we will wait on connect() before we will timeout
int32_t retry_timeout;
+ int32_t dead_timeout;
int send_size;
int recv_size;
void *user_data;
int send_size;
int recv_size;
void *user_data;