projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates for 0.29 release
[awesomized/libmemcached]
/
libmemcached
/
memcached_quit.c
diff --git
a/libmemcached/memcached_quit.c
b/libmemcached/memcached_quit.c
index 80b9314ac593a2350c28ae925579d42b13566fac..c202d43365debe8817580ad344f7cb6bdc6d5694 100644
(file)
--- a/
libmemcached/memcached_quit.c
+++ b/
libmemcached/memcached_quit.c
@@
-16,7
+16,6
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
{
memcached_return rc;
if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
{
memcached_return rc;
- ssize_t read_length;
char buffer[MEMCACHED_MAX_BUFFER];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
char buffer[MEMCACHED_MAX_BUFFER];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
@@
-37,9
+36,9
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
* results in server throwing away all data which is
* not read
*/
* results in server throwing away all data which is
* not read
*/
- while ((read_length=
- memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
-
> 0
);
+ ssize_t nread;
+ while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
+
&nread) == MEMCACHED_SUCCESS
);
}
memcached_io_close(ptr);
}
memcached_io_close(ptr);
@@
-49,6
+48,8
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
ptr->read_ptr= ptr->read_buffer;
memcached_server_response_reset(ptr);
}
ptr->read_ptr= ptr->read_buffer;
memcached_server_response_reset(ptr);
}
+
+ ptr->server_failure_counter++;
}
void memcached_quit(memcached_st *ptr)
}
void memcached_quit(memcached_st *ptr)