X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=42390a9af30cd92319c2a8695b9b24c1de5c0c21;hb=cfe8176feba42fc63e8f627f9ac613a12a368b92;hp=98d7630f589dd9194dbbd64cfb50887716404c70;hpb=af1f90c44906eb831ff632eba268236d1377058f;p=m6w6%2Flibmemcached diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c index 98d7630f..42390a9a 100644 --- a/lib/memcached_connect.c +++ b/lib/memcached_connect.c @@ -77,7 +77,7 @@ static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key) if (ptr->hosts[server_key].fd == -1) { /* Old connection junk still is in the structure */ - WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0); + WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0); /* If we have not allocated the hosts object. @@ -110,10 +110,11 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key) { if (ptr->hosts[server_key].fd == -1) { - /* Old connection junk still is in the structure */ - WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0); struct addrinfo *use; + /* Old connection junk still is in the structure */ + WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0); + if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED || (!(ptr->flags & MEM_USE_CACHE_LOOKUPS))) { @@ -223,7 +224,7 @@ test_connect: ptr->connected++; } - WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0); + WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0); } return MEMCACHED_SUCCESS;