projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added from Marcelo's patch to make sure
[awesomized/libmemcached]
/
include
/
memcached.h
diff --git
a/include/memcached.h
b/include/memcached.h
index fa2d305cd98e6d4497bf623f715c00d9d83e8675..5458974170e997ffaf1a78899c44de4970baf3f7 100644
(file)
--- a/
include/memcached.h
+++ b/
include/memcached.h
@@
-32,7
+32,7
@@
extern "C" {
#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
/* string value */
#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
/* string value */
-#define LIBMEMCACHED_VERSION_STRING "0.1
6
"
+#define LIBMEMCACHED_VERSION_STRING "0.1
7
"
typedef enum {
MEMCACHED_SUCCESS,
typedef enum {
MEMCACHED_SUCCESS,
@@
-100,6
+100,9
@@
typedef enum {
MEMCACHED_BEHAVIOR_DISTRIBUTION,
MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,
MEMCACHED_BEHAVIOR_USER_DATA,
MEMCACHED_BEHAVIOR_DISTRIBUTION,
MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,
MEMCACHED_BEHAVIOR_USER_DATA,
+ MEMCACHED_BEHAVIOR_SORT_HOSTS,
+ MEMCACHED_BEHAVIOR_VERIFY_KEY,
+ MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
} memcached_behavior;
typedef enum {
} memcached_behavior;
typedef enum {
@@
-215,6
+218,7
@@
struct memcached_st {
int send_size;
int recv_size;
int32_t poll_timeout;
int send_size;
int recv_size;
int32_t poll_timeout;
+ int32_t connect_timeout;
memcached_result_st result;
memcached_hash hash;
memcached_server_distribution distribution;
memcached_result_st result;
memcached_hash hash;
memcached_server_distribution distribution;