X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=68b5be728997774112521ec7c6f58c9191f18eee;hb=0f1151c684378650ee6ab21b96183ce88ed496ee;hp=6d9003770b039eaa30606d43280e2936e100dc44;hpb=a83eb6704af40530cf38935cb30dd576af563e61;p=awesomized%2Flibmemcached

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 6d900377..68b5be72 100644
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -477,6 +477,7 @@ static memcached_return_t unix_socket_connect(memcached_instance_st* server)
       {
       case EINPROGRESS:
       case EALREADY:
+      case EAGAIN:
         server->events(POLLOUT);
         break;
 
@@ -537,13 +538,6 @@ static memcached_return_t network_connect(memcached_instance_st* server)
   /* Create the socket */
   while (server->address_info_next and server->fd == INVALID_SOCKET)
   {
-    /* Memcache server does not support IPV6 in udp mode, so skip if not ipv4 */
-    if (memcached_is_udp(server->root) and server->address_info_next->ai_family != AF_INET)
-    {
-      server->address_info_next= server->address_info_next->ai_next;
-      continue;
-    }
-
     int type= server->address_info_next->ai_socktype;
     if (SOCK_CLOEXEC != 0)
     {