projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix issue with memcached_st structure being a different size based on
[awesomized/libmemcached]
/
libmemcached
/
memcached.h
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index 81120c5427c472eabd1c2b67fa0957438c138d80..69b469dc3ed9a1617511b8e0bad3c8ebc39ec6c7 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-62,6
+62,7
@@
struct memcached_st {
struct {
bool is_purging:1;
bool is_processing_input:1;
struct {
bool is_purging:1;
bool is_processing_input:1;
+ bool is_time_for_rebuild:1;
} state;
struct {
// Everything below here is pretty static.
} state;
struct {
// Everything below here is pretty static.
@@
-81,6
+82,7
@@
struct memcached_st {
bool use_sort_hosts:1;
bool use_udp:1;
bool verify_key:1;
bool use_sort_hosts:1;
bool use_udp:1;
bool verify_key:1;
+ bool tcp_keepalive:1;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
@@
-94,6
+96,7
@@
struct memcached_st {
uint32_t io_msg_watermark;
uint32_t io_bytes_watermark;
uint32_t io_key_prefetch;
uint32_t io_msg_watermark;
uint32_t io_bytes_watermark;
uint32_t io_key_prefetch;
+ uint32_t tcp_keepidle;
int cached_errno;
int32_t poll_timeout;
int32_t connect_timeout;
int cached_errno;
int32_t poll_timeout;
int32_t connect_timeout;
@@
-122,17
+125,7
@@
struct memcached_st {
memcached_trigger_key_fn get_key_failure;
memcached_trigger_delete_key_fn delete_trigger;
memcached_callback_st *callbacks;
memcached_trigger_key_fn get_key_failure;
memcached_trigger_delete_key_fn delete_trigger;
memcached_callback_st *callbacks;
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
- struct {
- const sasl_callback_t *callbacks;
- /*
- ** Did we allocate data inside the callbacks, or did the user
- ** supply that.
- */
- bool is_allocated:1;
- } sasl;
-
-#endif
+ struct memcached_sasl_st *sasl;
char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
struct {
bool is_allocated:1;
char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
struct {
bool is_allocated:1;