X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_auto.c;h=29bcf2a6b340261906425dbb27aaca139613a42f;hb=a7db49095a0ed78a1418003a00eef6d483c0d854;hp=e779f279a7966928f5d95e7add9cf73c4d591d6e;hpb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;p=awesomized%2Flibmemcached diff --git a/lib/memcached_auto.c b/lib/memcached_auto.c index e779f279..29bcf2a6 100644 --- a/lib/memcached_auto.c +++ b/lib/memcached_auto.c @@ -24,14 +24,22 @@ static memcached_return memcached_auto(memcached_st *ptr, offset); if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) return MEMCACHED_WRITE_FAILURE; - sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0); + sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1); if (sent_length == -1 || sent_length != send_length) return MEMCACHED_WRITE_FAILURE; memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE); - send_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE); + rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key); + + /* + So why recheck responce? Because the protocol is brain dead :) + The number returned might end up equaling one of the string + values. Less chance of a mistake with memcmp() so we will + use it. We still called memcached_response() though since it + worked its magic for non-blocking IO. + */ if (!memcmp(buffer, "ERROR\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE)) { *value= 0;