Index: lib/hostares.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/hostares.c,v
retrieving revision 1.37
diff -u -r1.37 hostares.c
--- lib/hostares.c	29 Apr 2008 04:18:02 -0000	1.37
+++ lib/hostares.c	8 Jul 2008 09:44:59 -0000
@@ -297,6 +297,68 @@
   return rc;
 }
 
+#ifdef ENABLE_IPV6 /* CURLRES_IPV6 */
+/*
+ * Curl_ip2addr6() takes an ipv6 internet address as input parameter
+ * together with a pointer to the string version of the address, and it
+ * returns a Curl_addrinfo chain filled in correctly with information for this
+ * address/host.
+ *
+ * The input parameters ARE NOT checked for validity but they are expected
+ * to have been checked already when this is called.
+ */
+Curl_addrinfo *Curl_ip2addr6(struct in6_addr *in,
+			     const char *hostname, int port)
+{
+  Curl_addrinfo *ai;
+
+#if defined(VMS) &&  defined(__INITIAL_POINTER_SIZE) && \
+  (__INITIAL_POINTER_SIZE == 64)
+#pragma pointer_size save
+#pragma pointer_size short
+#pragma message disable PTRMISMATCH
+#endif
+
+  struct hostent *h;
+  struct in6_addr *addrentry;
+  struct namebuf6 {
+    struct hostent hostentry;
+    char *h_addr_list[2];
+    struct in6_addr addrentry;
+    char hostname[1];
+  };
+  struct namebuf6 *buf = malloc(sizeof (struct namebuf6) + strlen(hostname));
+
+  if(!buf)
+    return NULL;
+
+  h = &buf->hostentry;
+  h->h_addr_list = &buf->h_addr_list[0];
+  addrentry = &buf->addrentry;
+  memcpy(addrentry, in, sizeof (*in));
+  h->h_addr_list[0] = (char*)addrentry;
+  h->h_name = &buf->hostname[0];
+  h->h_aliases = NULL;
+
+  /* Now store the dotted version of the address */
+  strcpy (h->h_name, hostname);
+
+#if defined(VMS) && defined(__INITIAL_POINTER_SIZE) && \
+  (__INITIAL_POINTER_SIZE == 64)
+#pragma pointer_size restore
+#pragma message enable PTRMISMATCH
+#endif
+
+  ai = Curl_he2ai(h, port);
+
+  free(buf);
+
+  return ai;
+}
+#endif /* CURLRES_IPV6 */
+
+
+
 /*
  * Curl_getaddrinfo() - when using ares
  *
@@ -313,7 +375,10 @@
   char *bufp;
   struct SessionHandle *data = conn->data;
   in_addr_t in = inet_addr(hostname);
-
+  int family = PF_INET;
+#ifdef ENABLE_IPV6 /* CURLRES_IPV6 */
+  struct in6_addr in6;
+#endif /* CURLRES_IPV6 */
   *waitp = FALSE;
 
   if(in != CURL_INADDR_NONE) {
@@ -321,6 +386,23 @@
     return Curl_ip2addr(in, hostname, port);
   }
 
+#ifdef ENABLE_IPV6 /* CURLRES_IPV6 */
+  if (inet_pton (AF_INET6, hostname, &in6) > 0) {
+    /* This must be an IPv6 address literal.  */
+    return Curl_ip2addr6(&in6, hostname, port);
+  }
+
+  switch(data->set.ip_version) {
+  case CURL_IPRESOLVE_V4:
+    family = PF_INET;
+    break;
+  default: /* by default we try ipv6, as PF_UNSPEC isn't supported by (c-)ares */
+  case CURL_IPRESOLVE_V6:
+    family = PF_INET6;
+    break;
+  }
+#endif /* CURLRES_IPV6 */
+
   bufp = strdup(hostname);
 
   if(bufp) {
@@ -332,7 +414,7 @@
     conn->async.dns = NULL;   /* clear */
 
     /* areschannel is already setup in the Curl_open() function */
-    ares_gethostbyname(data->state.areschannel, hostname, PF_INET,
+    ares_gethostbyname(data->state.areschannel, hostname, family,
                        (ares_host_callback)Curl_addrinfo4_callback, conn);
 
     *waitp = TRUE; /* please wait for the response */
Index: lib/hostip.h
===================================================================
RCS file: /cvsroot/curl/curl/lib/hostip.h,v
retrieving revision 1.61
diff -u -r1.61 hostip.h
--- lib/hostip.h	15 Jan 2008 22:44:12 -0000	1.61
+++ lib/hostip.h	8 Jul 2008 09:44:59 -0000
@@ -104,6 +104,10 @@
  */
 #ifdef CURLRES_IPV6
 typedef struct addrinfo Curl_addrinfo;
+#ifdef CURLRES_ARES
+Curl_addrinfo *Curl_ip2addr6(struct in6_addr *in,
+			     const char *hostname, int port);
+#endif
 #else
 /* OK, so some ipv4-only include tree probably have the addrinfo struct, but
    to work even on those that don't, we provide our own look-alike! */
Index: lib/hostip4.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/hostip4.c,v
retrieving revision 1.42
diff -u -r1.42 hostip4.c
--- lib/hostip4.c	7 Nov 2007 09:21:35 -0000	1.42
+++ lib/hostip4.c	8 Jul 2008 09:44:59 -0000
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -346,6 +346,9 @@
   Curl_addrinfo *prevai = NULL;
   Curl_addrinfo *firstai = NULL;
   struct sockaddr_in *addr;
+#if (defined(ENABLE_IPV6) && defined(USE_ARES)) /* CURLRES_IPV6 */
+  struct sockaddr_in6 *addr6;
+#endif /* CURLRES_IPV6 */
   int i;
   struct in_addr *curr;
 
@@ -355,7 +358,15 @@
 
   for(i=0; (curr = (struct in_addr *)he->h_addr_list[i]) != NULL; i++) {
 
-    ai = calloc(1, sizeof(Curl_addrinfo) + sizeof(struct sockaddr_in));
+    int ss_size;
+#if (defined(ENABLE_IPV6) && defined(USE_ARES)) /* CURLRES_IPV6 */
+    if (he->h_addrtype == AF_INET6)
+      ss_size = sizeof (struct sockaddr_in6);
+    else
+#endif /* CURLRES_IPV6 */
+      ss_size = sizeof (struct sockaddr_in);
+
+    ai = calloc(1, sizeof(Curl_addrinfo) + ss_size);
 
     if(!ai)
       break;
@@ -368,27 +379,41 @@
       /* make the previous entry point to this */
       prevai->ai_next = ai;
 
-    ai->ai_family = AF_INET;              /* we only support this */
+    ai->ai_family = he->h_addrtype;
 
     /* we return all names as STREAM, so when using this address for TFTP
        the type must be ignored and conn->socktype be used instead! */
     ai->ai_socktype = SOCK_STREAM;
 
-    ai->ai_addrlen = sizeof(struct sockaddr_in);
+    ai->ai_addrlen = ss_size;
     /* make the ai_addr point to the address immediately following this struct
        and use that area to store the address */
     ai->ai_addr = (struct sockaddr *) ((char*)ai + sizeof(Curl_addrinfo));
 
-    /* FIXME: need to free this eventually */
+    /* need to free this eventually */
     ai->ai_canonname = strdup(he->h_name);
 
     /* leave the rest of the struct filled with zero */
 
-    addr = (struct sockaddr_in *)ai->ai_addr; /* storage area for this info */
+    switch (ai->ai_family) {
+    case AF_INET:
+      addr = (struct sockaddr_in *)ai->ai_addr; /* storage area for this info */
+
+      memcpy((char *)&(addr->sin_addr), curr, sizeof(struct in_addr));
+      addr->sin_family = (unsigned short)(he->h_addrtype);
+      addr->sin_port = htons((unsigned short)port);
+      break;
 
-    memcpy((char *)&(addr->sin_addr), curr, sizeof(struct in_addr));
-    addr->sin_family = (unsigned short)(he->h_addrtype);
-    addr->sin_port = htons((unsigned short)port);
+#if (defined(ENABLE_IPV6) && defined(USE_ARES)) /* CURLRES_IPV6 */
+    case AF_INET6:
+      addr6 = (struct sockaddr_in6 *)ai->ai_addr; /* storage area for this info */
+
+      memcpy((char *)&(addr6->sin6_addr), curr, sizeof(struct in6_addr));
+      addr6->sin6_family = (unsigned short)(he->h_addrtype);
+      addr6->sin6_port = htons((unsigned short)port);
+      break;
+#endif  /* CURLRES_IPV6 */
+    }
 
     prevai = ai;
   }