projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed unittests and vc-changelog.
[m6w6/libmemcached]
/
libmemcached
/
version.c
diff --git
a/libmemcached/version.c
b/libmemcached/version.c
index ba0b243ed9bdf746281e06066a54fc20b5a54b37..54545cb9d46ff59112b4b30a028a4fb5877d0766 100644
(file)
--- a/
libmemcached/version.c
+++ b/
libmemcached/version.c
@@
-13,10
+13,19
@@
memcached_return_t memcached_version(memcached_st *ptr)
if (ptr->flags.use_udp)
return MEMCACHED_NOT_SUPPORTED;
if (ptr->flags.use_udp)
return MEMCACHED_NOT_SUPPORTED;
+ bool was_blocking= ptr->flags.no_block;
+ memcached_return_t rc;
+
+ ptr->flags.no_block= false;
+
if (ptr->flags.binary_protocol)
if (ptr->flags.binary_protocol)
- r
eturn
memcached_version_binary(ptr);
+ r
c=
memcached_version_binary(ptr);
else
else
- return memcached_version_textual(ptr);
+ rc= memcached_version_textual(ptr);
+
+ ptr->flags.no_block= was_blocking;
+
+ return rc;
}
static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
}
static inline memcached_return_t memcached_version_textual(memcached_st *ptr)