7.15.4 coming up

Nah, we refer people to the generic site that lists the mirrors instead of
trying to maintain an accurate list in this file (too).
2006-06-12 06:53:10 +00:00 · 2006-06-12 06:51:15 +00:00 · 2006-06-10 17:35:28 +00:00 · 2006-06-09 21:08:02 +00:00 · 2006-06-09 12:07:34 +00:00 · 2006-06-09 08:25:16 +00:00
747 changed files with 60711 additions and 27711 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -12,3 +12,4 @@ depcomp
 config.guess
 config.sub
 ltmain.sh
+libcurl.pc
--- a/1592
+++ b/1592
--- a/CHANGES.2004
+++ b/CHANGES.2004
--- a/CHANGES.2005
+++ b/CHANGES.2005
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE

-Copyright (c) 1996 - 2004, Daniel Stenberg, <daniel@haxx.se>.
+Copyright (c) 1996 - 2006, Daniel Stenberg, <daniel@haxx.se>.

 All rights reserved.

--- a/12
+++ b/12
@@ -15,12 +15,6 @@ Compile and build instructions follow below.
  CHANGES.0     contains ancient changes.
  CHANGES.$year contains changes for the particular year.

-  tests/memanalyze.pl
-                is for analyzing the output generated by curl if -DCURLDEBUG
-                is used when compiling (run configure with --enable-debug)
-
-  buildconf     builds the makefiles and configure stuff
-
  Makefile.dist is included as the root Makefile in distribution archives

  perl/         is a subdirectory with various perl scripts
@@ -59,12 +53,6 @@ installed:
   give you an older version of the file that isn't up-to-date. That file was
   checked in once and won't be updated very regularly.

- o yacc/bison 
-
-   If you don't have yacc or bison, you must rename the lib/getdate.c.cvs file
-   to lib/getdate.c to be able to build libcurl. yacc/bison is normally used
-   to generate the lib/getdate.c file from the lib/getdate.y source file.
-
 MAC OS X

 With Mac OS X 10.2 and the associated Developer Tools, the installed versions
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2005, 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
@@ -23,14 +23,17 @@

 AUTOMAKE_OPTIONS = foreign

-EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist	\
-  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
+EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist curl-config.in \
+ curl-style.el sample.emacs RELEASE-NOTES buildconf buildconf.bat libcurl.pc.in

 bin_SCRIPTS = curl-config

 SUBDIRS = lib src
 DIST_SUBDIRS = $(SUBDIRS) tests include packages docs

+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcurl.pc
+
 dist-hook:
 	rm -rf $(top_builddir)/tests/log
 	find $(distdir) -name "*.dist" -exec rm {} \;
@@ -48,6 +51,15 @@ pdf:

 check: test

+if CROSSCOMPILING
+test-full: test
+test-torture: test
+
+test:
+	@echo "NOTICE: we can't run the tests when cross-compiling!"
+
+else
+
 test:
 	@(cd tests; $(MAKE) all quiet-test)

@@ -57,6 +69,8 @@ test-full:
 test-torture:
 	@(cd tests; $(MAKE) all torture-test)

+endif
+
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2005, 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
@@ -30,16 +30,83 @@ ssl:
 	make

 borland:
-	cd lib & make -f Makefile.b32
-	cd src & make -f Makefile.b32
+	cd lib
+	make -f Makefile.b32
+	cd ..\src
+	make -f Makefile.b32
+
+borland-ssl:
+	cd lib
+	make -f Makefile.b32 WITH_SSL=1
+	cd ..\src
+	make -f Makefile.b32 WITH_SSL=1
+
+borland-ssl-zlib:
+	cd lib
+	make -f Makefile.b32 WITH_SSL=1 WITH_ZLIB=1
+	cd ..\src
+	make -f Makefile.b32 WITH_SSL=1 WITH_ZLIB=1
+
+borland-clean:
+	cd lib
+	make -f Makefile.b32 clean
+	cd ..\src
+	make -f Makefile.b32 clean
+
+watcom:
+	cd lib
+	wmake -f Makefile.Watcom
+	cd ..\src
+	wmake -f Makefile.Watcom
+
+watcom-clean:
+	cd lib
+	wmake -f Makefile.Watcom clean
+	cd ..\src
+	wmake -f Makefile.Watcom clean

 mingw32:
-	cd lib & make -f Makefile.m32 ZLIB=1
-	cd src & make -f Makefile.m32 ZLIB=1
+	$(MAKE) -C lib -f Makefile.m32 ZLIB=1
+	$(MAKE) -C src -f Makefile.m32 ZLIB=1

 mingw32-ssl:
-	cd lib & make -f Makefile.m32 SSL=1 ZLIB=1
-	cd src & make -f Makefile.m32 SSL=1 ZLIB=1
+	$(MAKE) -C lib -f Makefile.m32 SSL=1 ZLIB=1
+	$(MAKE) -C src -f Makefile.m32 SSL=1 ZLIB=1
+
+mingw32-clean:
+	$(MAKE) -C lib -f Makefile.m32 clean
+	$(MAKE) -C src -f Makefile.m32 clean
+
+vc-clean:
+	cd lib
+	nmake -f Makefile.vc6 clean
+	cd ..\src
+	nmake -f Makefile.vc6 clean
+
+vc-all:
+	cd lib
+	nmake -f Makefile.vc6 cfg=release
+	nmake -f Makefile.vc6 cfg=release-ssl
+	nmake -f Makefile.vc6 cfg=release-zlib
+	nmake -f Makefile.vc6 cfg=release-ssl-zlib
+	nmake -f Makefile.vc6 cfg=release-ssl-dll
+	nmake -f Makefile.vc6 cfg=release-zlib-dll
+	nmake -f Makefile.vc6 cfg=release-ssl-dll-zlib-dll
+	nmake -f Makefile.vc6 cfg=release-dll
+	nmake -f Makefile.vc6 cfg=release-dll-ssl-dll
+	nmake -f Makefile.vc6 cfg=release-dll-zlib-dll
+	nmake -f Makefile.vc6 cfg=release-dll-ssl-dll-zlib-dll
+	nmake -f Makefile.vc6 cfg=debug
+	nmake -f Makefile.vc6 cfg=debug-ssl
+	nmake -f Makefile.vc6 cfg=debug-zlib
+	nmake -f Makefile.vc6 cfg=debug-ssl-zlib
+	nmake -f Makefile.vc6 cfg=debug-ssl-dll
+	nmake -f Makefile.vc6 cfg=debug-zlib-dll
+	nmake -f Makefile.vc6 cfg=debug-ssl-dll-zlib-dll
+	nmake -f Makefile.vc6 cfg=debug-dll
+	nmake -f Makefile.vc6 cfg=debug-dll-ssl-dll
+	nmake -f Makefile.vc6 cfg=debug-dll-zlib-dll
+	nmake -f Makefile.vc6 cfg=debug-dll-ssl-dll-zlib-dll

 vc:
 	cd lib
@@ -47,27 +114,75 @@ vc:
 	cd ..\src
 	nmake /f Makefile.vc6

+vc-zlib:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-zlib
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-zlib
+
 vc-ssl:
 	cd lib
 	nmake /f Makefile.vc6 cfg=release-ssl
 	cd ..\src
 	nmake /f Makefile.vc6 cfg=release-ssl

+vc-ssl-zlib:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-ssl-zlib
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-ssl-zlib
+
 vc-ssl-dll:
 	cd lib
 	nmake /f Makefile.vc6 cfg=release-ssl-dll
 	cd ..\src
-	nmake /f Makefile.vc6
+	nmake /f Makefile.vc6 cfg=release-ssl-dll

-vc-libcurl-ssl-dll:
+vc-dll-ssl-dll:
 	cd lib
-	nmake /f Makefile.vc6 cfg=release-libcurl-ssl-dll
+	nmake /f Makefile.vc6 cfg=release-dll-ssl-dll
 	cd ..\src
-	nmake /f Makefile.vc6
+	nmake /f Makefile.vc6 cfg=release-dll-ssl-dll
+
+vc-dll:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-dll
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-dll
+
+vc-dll-zlib-dll:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-dll-zlib-dll
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-dll-zlib-dll
+
+vc-dll-ssl-dll-zlib-dll:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-dll-ssl-dll-zlib-dll
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-dll-ssl-dll-zlib-dll
+
+vc-ssl-dll-zlib-dll:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-ssl-dll-zlib-dll
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-ssl-dll-zlib-dll
+
+vc-zlib-dll:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-zlib-dll
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-zlib-dll
+
+vc-sspi:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release WINDOWS_SSPI=1
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release WINDOWS_SSPI=1

 djgpp:
-	make -C lib -f Makefile.dj
-	make -C src -f Makefile.dj
+	$(MAKE) -C lib -f Makefile.dj
+	$(MAKE) -C src -f Makefile.dj

 cygwin:
 	./configure
@@ -82,8 +197,28 @@ amiga:
 	cd ./src && make -f makefile.amiga

 netware:
-	cd lib && make -f Makefile.netware
-	cd src && make -f Makefile.netware
+	$(MAKE) -C lib -f Makefile.netware
+	$(MAKE) -C src -f Makefile.netware
+
+netware-ares:
+	$(MAKE) -C lib -f Makefile.netware WITH_ARES=1
+	$(MAKE) -C src -f Makefile.netware WITH_ARES=1
+
+netware-ssl:
+	$(MAKE) -C lib -f Makefile.netware WITH_SSL=1
+	$(MAKE) -C src -f Makefile.netware WITH_SSL=1
+
+netware-ssl-zlib:
+	$(MAKE) -C lib -f Makefile.netware WITH_SSL=1 WITH_ZLIB=1
+	$(MAKE) -C src -f Makefile.netware WITH_SSL=1 WITH_ZLIB=1
+
+netware-zlib:
+	$(MAKE) -C lib -f Makefile.netware WITH_ZLIB=1
+	$(MAKE) -C src -f Makefile.netware WITH_ZLIB=1
+
+netware-clean:
+	$(MAKE) -C lib -f Makefile.netware clean
+	$(MAKE) -C src -f Makefile.netware clean

 unix: all

--- a/43
+++ b/43
@@ -1,12 +1,12 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                             \___|\___/|_| \_\_____|

 README

-  Curl is a command line tool for transfering data specified with URL
+  Curl is a command line tool for transferring data specified with URL
  syntax. Find out how to use Curl by reading the curl.1 man page or the
  MANUAL document. Find out how to install Curl by reading the INSTALL
  document.
@@ -26,39 +26,14 @@ CONTACT
  If you have problems, questions, ideas or suggestions, please contact us
  by posting to a suitable mailing list. See http://curl.haxx.se/mail/

-  Many major contributors to the project are listed in the THANKS document.
+  All contributors to the project are listed in the THANKS document.

 WEB SITE

-  Visit the curl web site or mirrors for the latest news:
+  Visit the curl web site or mirrors for the latest news and downloads:

-        Sweden    -- http://curl.haxx.se/
-        Australia -- http://curl.planetmirror.com/
-        Denmark   -- http://curl.cofman.dk/
-        Estonia   -- http://curl.wildyou.net/
-        Germany   -- http://curl.mirror.at.stealer.net/
-        Germany   -- http://curl.netmirror.org/
-        Russia    -- http://curl.tsuren.net/
-        Thailand  -- http://curl.siamu.ac.th/
-        US (CA)   -- http://curl.mirror.redwire.net/
-        US        -- http://curl.signal42.com/
-
-DOWNLOAD
-
-  The official download mirror sites are:
-
-        Australia -- http://curl.planetmirror.com/download.html
-        Estonia   -- http://curl.wildyou.net/download.html
-        Germany   -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
-        Germany   -- http://curl.mirror.at.stealer.net/download.html
-        Germany   -- http://curl.netmirror.org/download.html
-        Germany   -- http://www.mirrorspace.org/curl/
-        Hongkong  -- http://www.execve.net/curl/
-        Russia    -- http://curl.tsuren.net/download.html
-        Sweden    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
-        Sweden    -- http://cool.haxx.se/curl/
-        Thailand  -- http://curl.siamu.ac.th/download.html
-        US (CA)   -- http://curl.mirror.redwire.net/download.html
+        Sweden       http://curl.haxx.se/
+        Mirrors      http://curlm.haxx.se/

 CVS

--- a/104
+++ b/104
@@ -1,62 +1,72 @@
-Curl and libcurl 7.12.0.
+Curl and libcurl 7.15.4

- Public curl release number:               81
- Releases counted from the very beginning: 108
- Available command line options:           96
- Available curl_easy_setopt() options:     113
- Number of public functions in libcurl:    36
-
-A special thanks to:
-
- archivas.com and Alan Pinstein, for paying me to focus on their requests
+ Public curl release number:               94
+ Releases counted from the very beginning: 121
+ Available command line options:           112
+ Available curl_easy_setopt() options:     132
+ Number of public functions in libcurl:    49
+ Amount of public web site mirrors:        33
+ Number of known libcurl bindings:         32
+ Number of contributors:                   492

 This release includes the following changes:

- o added ability to "upload" to file:// URLs
- o added curl_global_init_mem()
- o removed curl_formparse()
- o the MSVC project file in the release archive is automatically built
- o curl --proxy-digest is a new command line option
- o the Windows version of libcurl can use wldap32.dll for LDAP
- o added curl_easy_strerror(), curl_multi_strerror() and curl_share_strerror()
- o IPv6-enabled Windows hosts now resolves names threaded/asynch as well
- o configure --with-libidn can be used to point out the root dir of a libidn
-   installation (version 0.4.5 or later) for curl to use, then libcurl can
-   resolve and use IDNA names (domain names with "international" letters)
+ o NTLM2 session response support
+ o CURLOPT_COOKIELIST set to "SESS" clears all session cookies
+ o CURLINFO_LASTSOCKET returned sockets are now checked more before returned
+ o curl-config got a --checkfor option to compare version numbers
+ o line end conversions for FTP ASCII transfers
+ o curl_multi_socket() API added (still mostly untested)
+ o conversion callback options for EBCDIC <=> ASCII conversions
+ o added CURLINFO_FTP_ENTRY_PATH
+ o less blocking for the multi interface during (Open)SSL connect negotiation

 This release includes the following bugfixes:

- o incoming cookies with domains set with a prefixed dot now works better
- o CURLOPT_COOKIEFILE and CURLOPT_COOKIE can be used in the same request
- o improved peer certificate name verification
- o allocation failures cause no leaks nor crashes
- o the progress meter display now handles file sizes up to full 8 exabytes
-   (which is as high a signed 64 bit number can reach)
- o general HTTP authentication improvements
- o HTTP Digest authentication with the proxy works
- o mulipart formposting with -F and file names with spaces work again
- o curl_easy_duphandle() now works when ares-enabled
- o HTTP Digest authentication works a lot more like the RFC says
- o curl works with telnet and stdin properly on Windows
- o configure --without-ssl works even when pkg-config has OpenSSL details
- o src/hugehelp.c builds correct again in non-configure build environments
+ o builds fine on cygwin
+ o md5-sess with Digest authentication
+ o dict with letters such as space in a word
+ o dict with url-encoded words in the URL
+ o libcurl.m4 when default=yes but no libcurl was found
+ o numerous bugs fixed in the TFTP code
+ o possible memory leak when adding easy handles to multi stack
+ o TFTP works in a more portable fashion (== on more platforms)
+ o WSAGetLastError() is now used (better) on Windows
+ o GnuTLS non-block case that could cause data trashing
+ o deflate code survives lack of zlib header
+ o CURLOPT_INTERFACE works with hostname
+ o configure runs fine with ICC
+ o closed control connection with FTP when easy handle was removed from multi
+ o curl --trace crash when built with VS2005
+ o SSL connect time-out
+ o improved NTLM functionality
+ o following redirects with more than one question mark in source URL
+ o fixed debug build crash with -d
+ o generates a fine AIX Toolbox RPM spec
+ o treat FTP AUTH failures properly
+ o TFTP transfers could trash data
+ o -d + -G combo crash

-Other curl-related news since the previous public release:
+Other curl-related news:

- o The CVS repository was moved to cool.haxx.se
- o AdacURL 7.11.2 was released: http://www.almroth.com/adacurl/
- o PycURL 7.11.3 was released: http://pycurl.sourceforge.net
- o A new German download mirror: http://www.mirrorspace.org/curl/
- o Two new mailing lists are available:
-   curl-and-python - for python programmers using pycurl or curl
-   curl-perl-commmits - receives commits done to the curl-perl CVS module
+ o tclcurl 0.15.3 was released:
+   http://personal1.iddeo.es/andresgarci/tclcurl/english/
+
+New curl mirrors:
+
+ o http://curl.webdesign-zdg.de/ in Frankfurt, Germany
+ o http://curl.de-mirror.de/ in Aachen, Germany
+ o http://curl.osmirror.nl/ in Amsterdam, the Netherlands
+ o http://curl.usphp.com/ in Florida, US
+ o http://curl.oslevel.de/ in Karlsruhe, Germany

 This release would not have looked like this without help, code, reports and
 advice from friends like these:

- Gisle Vanem, Tommy Tam, Luca Altea, James Bursa, Mihai Ionescu, Michael
- Benedict, Andr<64>s Garc<72>a, Joe Halpin, Seshubabu Pasam, Peter Sylvester, Robert
- D. Young, Jesse Noller, David Byron, Massimiliano Ziccardi, Mohun Biswas,
- Renaud Duhaut
+ Dan Fandrich, Ilja van Sprundel, David McCreedy, Tor Arntsen, Xavier Bouchoux,
+ David Byron, Michele Bini, Ates Goral, Katie Wang, Robson Braga Araujo,
+ Ale Vesely, Paul Querna, Gisle Vanem, Mark Eichin, Roland Blom, Andreas
+ Ntaflos, David Shaw, Michael Wallner, Olaf St<53>ben, Mikael Sennerholm,
+ Brian Dessent

        Thanks! (and sorry if I forgot to mention someone)
--- a/12
+++ b/12
@@ -1,13 +1,5 @@
-Issues not sorted in any particular order.
-  #[num] refers to bug report numbers.
-  UNASSIGNED means that no person has publicly stated to work on the issue.
-  DELETE means the issue is subject for dismissal
-
-To get fixed in 7.12.0 (planned release: June 2004)
+To get fixed in 7.15.4 (planned release: June 2006)
 ======================

-To get fixed in 7.12.1 (planned release: August 2004)
-======================
-
-* FTP 3rd party transfers
+66 - 

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,3 +1,393 @@
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 1998 - 2006, 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
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id$
+###########################################################################
+
+dnl CURL_CHECK_HEADER_WINDOWS
+dnl -------------------------------------------------
+dnl Check for compilable and valid windows.h header 
+
+AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
+  AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+      ],[
+        int dummy=2*WINVER;
+      ])
+    ],[
+      ac_cv_header_windows_h="yes"
+    ],[
+      ac_cv_header_windows_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_windows_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
+      [Define to 1 if you have the windows.h header file.])
+    AC_DEFINE_UNQUOTED(WIN32_LEAN_AND_MEAN, 1,
+      [Define to avoid automatic inclusion of winsock.h])
+  fi
+])
+
+
+dnl CURL_CHECK_HEADER_WINSOCK
+dnl -------------------------------------------------
+dnl Check for compilable and valid winsock.h header 
+
+AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
+  AC_CACHE_CHECK([for winsock.h], [ac_cv_header_winsock_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock.h>
+      ],[
+        int dummy=WSACleanup();
+      ])
+    ],[
+      ac_cv_header_winsock_h="yes"
+    ],[
+      ac_cv_header_winsock_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_winsock_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1,
+      [Define to 1 if you have the winsock.h header file.])
+  fi
+])
+
+
+dnl CURL_CHECK_HEADER_WINSOCK2
+dnl -------------------------------------------------
+dnl Check for compilable and valid winsock2.h header 
+
+AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
+  AC_CACHE_CHECK([for winsock2.h], [ac_cv_header_winsock2_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock2.h>
+      ],[
+        int dummy=2*IPPROTO_ESP;
+      ])
+    ],[
+      ac_cv_header_winsock2_h="yes"
+    ],[
+      ac_cv_header_winsock2_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_winsock2_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, 1,
+      [Define to 1 if you have the winsock2.h header file.])
+  fi
+])
+
+
+dnl CURL_CHECK_HEADER_WS2TCPIP
+dnl -------------------------------------------------
+dnl Check for compilable and valid ws2tcpip.h header
+
+AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
+  AC_CACHE_CHECK([for ws2tcpip.h], [ac_cv_header_ws2tcpip_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+      ],[
+        int dummy=2*IP_PKTINFO;
+      ])
+    ],[
+      ac_cv_header_ws2tcpip_h="yes"
+    ],[
+      ac_cv_header_ws2tcpip_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_ws2tcpip_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, 1,
+      [Define to 1 if you have the ws2tcpip.h header file.])
+  fi
+])
+
+
+dnl CURL_CHECK_TYPE_SOCKLEN_T
+dnl -------------------------------------------------
+dnl Check for existing socklen_t type, and provide
+dnl an equivalent type if socklen_t not available
+
+AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
+  AC_CHECK_TYPE([socklen_t], ,[
+    AC_CACHE_CHECK([for socklen_t equivalent], 
+      [curl_cv_socklen_t_equiv], [
+      curl_cv_socklen_t_equiv="unknown"
+      for arg2 in "struct sockaddr" void; do
+        for t in int size_t unsigned long "unsigned long"; do
+          AC_COMPILE_IFELSE([
+            AC_LANG_PROGRAM([
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+              int getpeername (int, $arg2 *, $t *);
+            ],[
+              $t len=0;
+              getpeername(0,0,&len);
+            ])
+          ],[
+             curl_cv_socklen_t_equiv="$t"
+             break 2
+          ])
+        done
+      done
+    ])
+    if test "$curl_cv_socklen_t_equiv" = "unknown"; then
+      AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+    else
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+        [type to use in place of socklen_t if not defined])
+    fi
+  ],[
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+  ])
+])
+
+
+dnl CURL_CHECK_FUNC_GETNAMEINFO
+dnl -------------------------------------------------
+dnl Test if the getnameinfo function is available, 
+dnl and check the types of five of its arguments.
+dnl If the function succeeds HAVE_GETNAMEINFO will be
+dnl defined, defining the types of the arguments in
+dnl GETNAMEINFO_TYPE_ARG1, GETNAMEINFO_TYPE_ARG2,
+dnl GETNAMEINFO_TYPE_ARG46 and GETNAMEINFO_TYPE_ARG7.
+dnl This function is experimental and its results shall
+dnl not be trusted while this notice is in place ------
+
+AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
+  AC_REQUIRE([CURL_CHECK_TYPE_SOCKLEN_T])dnl
+  AC_CHECK_HEADERS(sys/types.h sys/socket.h netdb.h)
+  #
+  AC_MSG_CHECKING([for getnameinfo])
+  AC_LINK_IFELSE([
+      AC_LANG_FUNC_LINK_TRY([getnameinfo])
+    ],[
+      AC_MSG_RESULT([yes])
+      curl_cv_getnameinfo="yes"
+    ],[
+      AC_MSG_RESULT([no])
+      curl_cv_getnameinfo="no"
+  ])
+  #
+  if test "$curl_cv_getnameinfo" != "yes"; then
+    AC_MSG_CHECKING([deeper for getnameinfo])
+    AC_TRY_LINK([
+      ],[
+        getnameinfo();
+      ],[
+        AC_MSG_RESULT([yes])
+        curl_cv_getnameinfo="yes"
+      ],[
+        AC_MSG_RESULT([but still no])
+        curl_cv_getnameinfo="no"
+    ])
+  fi
+  #
+  if test "$curl_cv_getnameinfo" != "yes"; then
+    AC_MSG_CHECKING([deeper and deeper for getnameinfo])
+    AC_TRY_LINK([
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#endif
+      ],[
+        getnameinfo(0, 0, 0, 0, 0, 0, 0);
+      ],[ 
+        AC_MSG_RESULT([yes])
+        curl_cv_getnameinfo="yes"
+      ],[
+        AC_MSG_RESULT([but still no])
+        curl_cv_getnameinfo="no"
+    ])
+  fi
+  #
+  if test "$curl_cv_getnameinfo" = "yes"; then
+    AC_CACHE_CHECK([types of arguments for getnameinfo],
+      [curl_cv_func_getnameinfo_args], [
+      curl_cv_func_getnameinfo_args="unknown"
+      for gni_arg1 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
+        for gni_arg2 in 'socklen_t' 'size_t' 'int'; do
+          for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do
+            for gni_arg7 in 'int' 'unsigned int'; do
+              AC_COMPILE_IFELSE([
+                AC_LANG_PROGRAM([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#if (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501)
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h> 
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#define GNICALLCONV WSAAPI
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#define GNICALLCONV
+#endif
+                  extern int GNICALLCONV getnameinfo($gni_arg1, $gni_arg2,
+                                         char *, $gni_arg46,
+                                         char *, $gni_arg46,
+                                         $gni_arg7);
+                ],[
+                  $gni_arg2 salen=0;
+                  $gni_arg46 hostlen=0;
+                  $gni_arg46 servlen=0;
+                  $gni_arg7 flags=0;
+                  int res = getnameinfo(0, salen, 0, hostlen, 0, servlen, flags);
+                ])
+              ],[
+                 curl_cv_func_getnameinfo_args="$gni_arg1,$gni_arg2,$gni_arg46,$gni_arg7"
+                 break 4
+              ])
+            done
+          done
+        done
+      done
+    ]) # AC_CACHE_CHECK
+    if test "$curl_cv_func_getnameinfo_args" = "unknown"; then
+      AC_MSG_WARN([Cannot find proper types to use for getnameinfo args])
+      AC_MSG_WARN([HAVE_GETNAMEINFO will not be defined])
+    else
+      gni_prev_IFS=$IFS; IFS=','
+      set dummy `echo "$curl_cv_func_getnameinfo_args" | sed 's/\*/\*/g'`
+      IFS=$gni_prev_IFS
+      shift
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG1, $[1],
+        [Define to the type of arg 1 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG2, $[2],
+        [Define to the type of arg 2 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG46, $[3],
+        [Define to the type of args 4 and 6 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, $[4],
+        [Define to the type of arg 7 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(HAVE_GETNAMEINFO, 1,
+        [Define to 1 if you have the getnameinfo function.])
+      ac_cv_func_getnameinfo="yes"
+    fi
+  fi
+]) # AC_DEFUN
+
+
+dnl CURL_CHECK_NONBLOCKING_SOCKET
+dnl -------------------------------------------------
 dnl Check for how to set a socket to non-blocking state. There seems to exist
 dnl four known different ways, with the one used almost everywhere being POSIX
 dnl and XPG3, while the other different ways for different systems (old BSD,
@@ -59,12 +449,27 @@ dnl FIONBIO test was also bad
 dnl the code was bad, try a different program now, test 3

  AC_TRY_COMPILE([
-/* headers for ioctlsocket test (cygwin?) */
+/* headers for ioctlsocket test (Windows) */
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#endif
 ],[
 /* ioctlsocket source code */
- int socket;
- unsigned long flags = ioctlsocket(socket, FIONBIO, &flags);
+ SOCKET sd;
+ unsigned long flags = 0;
+ sd = socket(0, 0, 0);
+ ioctlsocket(sd, FIONBIO, &flags);
 ],[
 dnl ioctlsocket test was good
 nonblock="ioctlsocket"
@@ -87,9 +492,7 @@ AC_DEFINE(HAVE_IOCTLSOCKET_CASE, 1, [use Ioctlsocket() for non-blocking sockets]
 dnl Ioctlsocket didnt compile, do test 5!
  AC_TRY_COMPILE([
 /* headers for SO_NONBLOCK test (BeOS) */
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <socket.h>
 ],[
 /* SO_NONBLOCK source code */
 long b = 1;
@@ -124,54 +527,48 @@ dnl end of non-blocking try-compile test
  fi
 ])

-dnl Check for socklen_t: historically on BSD it is an int, and in
-dnl POSIX 1g it is a type of its own, but some platforms use different
-dnl types for the argument to getsockopt, getpeername, etc.  So we
-dnl have to test to find something that will work.
-AC_DEFUN([TYPE_SOCKLEN_T],
+
+dnl TYPE_SOCKADDR_STORAGE
+dnl -------------------------------------------------
+dnl Check for struct sockaddr_storage. Most IPv6-enabled hosts have it, but
+dnl AIX 4.3 is one known exception.
+AC_DEFUN([TYPE_SOCKADDR_STORAGE],
 [
-   AC_CHECK_TYPE([socklen_t], ,[
-      AC_MSG_CHECKING([for socklen_t equivalent])
-      AC_CACHE_VAL([curl_cv_socklen_t_equiv],
-      [
-         # Systems have either "struct sockaddr *" or
-         # "void *" as the second argument to getpeername
-         curl_cv_socklen_t_equiv=
-         for arg2 in "struct sockaddr" void; do
-            for t in int size_t unsigned long "unsigned long"; do
-               AC_TRY_COMPILE([
-                  #ifdef HAVE_SYS_TYPES_H
-                  #include <sys/types.h>
-                  #endif
-                  #ifdef HAVE_SYS_SOCKET_H
-                  #include <sys/socket.h>
-                  #endif
-
-                  int getpeername (int, $arg2 *, $t *);
-               ],[
-                  $t len;
-                  getpeername(0,0,&len);
-               ],[
-                  curl_cv_socklen_t_equiv="$t"
-                  break
-               ])
-            done
-         done
-
-         if test "x$curl_cv_socklen_t_equiv" = x; then
-            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
-         fi
-      ])
-      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
-      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
-			[type to use in place of socklen_t if not defined])],
-      [#include <sys/types.h>
-#include <sys/socket.h>])
+   AC_CHECK_TYPE([struct sockaddr_storage],
+        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
+                  [if struct sockaddr_storage is defined]), ,
+   [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
+   ])
 ])

+
+dnl TYPE_IN_ADDR_T
+dnl -------------------------------------------------
 dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
-dnl and a few other things. If not found, we set it to unsigned int, as even
-dnl 64-bit implementations use to set it to a 32-bit type.
+dnl and a few other things.
 AC_DEFUN([TYPE_IN_ADDR_T],
 [
   AC_CHECK_TYPE([in_addr_t], ,[
@@ -181,15 +578,33 @@ AC_DEFUN([TYPE_IN_ADDR_T],
         curl_cv_in_addr_t_equiv=
         for t in "unsigned long" int size_t unsigned long; do
            AC_TRY_COMPILE([
-               #ifdef HAVE_SYS_TYPES_H
-               #include <sys/types.h>
-               #endif
-               #ifdef HAVE_SYS_SOCKET_H
-               #include <sys/socket.h>
-               #endif
-               #ifdef HAVE_ARPA_INET_H
-               #include <arpa/inet.h>
-               #endif
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
            ],[
               $t data = inet_addr ("1.2.3.4");
            ],[
@@ -205,10 +620,36 @@ AC_DEFUN([TYPE_IN_ADDR_T],
      AC_MSG_RESULT($curl_cv_in_addr_t_equiv)
      AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
 			[type to use in place of in_addr_t if not defined])],
-      [#include <sys/types.h>
+      [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#include <arpa/inet.h>])
-])
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
+  ]) dnl AC_CHECK_TYPE
+]) dnl AC_DEFUN

 dnl ************************************************************
 dnl check for "localhost", if it doesn't exist, we can't do the
@@ -236,7 +677,7 @@ exit (h == NULL ? 1 : 0); }],[
 ])

 dnl ************************************************************
-dnl check for working getaddrinfo()
+dnl check for working getaddrinfo() that works with AI_NUMERICHOST
 dnl
 AC_DEFUN([CURL_CHECK_WORKING_GETADDRINFO],[
  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
@@ -251,6 +692,7 @@ int main(void)
    int error;

    memset(&hints, 0, sizeof(hints));
+    hints.ai_flags = AI_NUMERICHOST;
    hints.ai_family = AF_UNSPEC;
    hints.ai_socktype = SOCK_STREAM;
    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
@@ -324,8 +766,24 @@ dnl program worked:
 [ ac_cv_working_ni_withscopeid="yes" ],
 dnl program failed:
 [ ac_cv_working_ni_withscopeid="no" ],
-dnl we cross-compile:
-[ ac_cv_working_ni_withscopeid="yes" ]
+dnl we cross-compile, check the headers using the preprocessor
+[
+
+ AC_EGREP_CPP(WORKS,
+[
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+#ifdef NI_WITHSCOPEID
+WORKS
+#endif
+],
+  ac_cv_working_ni_withscopeid="yes",
+  ac_cv_working_ni_withscopeid="no" )
+
+ ]
 ) dnl end of AC_RUN_IFELSE

 ]) dnl end of AC_CACHE_CHECK
@@ -378,34 +836,25 @@ dnl      int strerror_r(int errnum, char *buf, size_t n);
 dnl
 AC_DEFUN([CURL_CHECK_STRERROR_R],
 [
-  dnl determine of strerror_r is present
-  AC_CHECK_FUNCS(strerror_r,[
+  AC_CHECK_FUNCS(strerror_r)
+
+  if test "x$ac_cv_func_strerror_r" = "xyes"; then
+
    AC_MSG_CHECKING(whether strerror_r is declared)
    AC_EGREP_CPP(strerror_r,[
 #include <string.h>],[
-      strerror_r="yes"
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
-      AC_MSG_CHECKING(whether strerror_r with -D_THREAD_SAFE is declared)
+      AC_MSG_CHECKING(whether strerror_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(strerror_r,[
-#define _THREAD_SAFE
+#define _REENTRANT
 #include <string.h>],[
-        strerror_r="yes"
-	CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
+	CPPFLAGS="-D_REENTRANT $CPPFLAGS"
 	AC_MSG_RESULT(yes)],
-	AC_MSG_RESULT(no))])])
-
-  if test "x$strerror_r" = "xyes"; then
-
-    dnl check if strerror_r is properly declared in the headers
-    AC_CHECK_DECL(strerror_r, ,
-     AC_DEFINE(HAVE_NO_STRERROR_R_DECL, 1, [we have no strerror_r() proto])
-,
-[#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-])
+	AC_MSG_RESULT(no)
+        AC_DEFINE(HAVE_NO_STRERROR_R_DECL, 1, [we have no strerror_r() proto])
+       ) dnl with _THREAD_SAFE
+    ]) dnl plain cpp for it

    dnl determine if this strerror_r() is glibc or POSIX
    AC_MSG_CHECKING([for a glibc strerror_r API])
@@ -423,13 +872,30 @@ main () {
    return 0;
 }
 ],
+    GLIBC_STRERROR_R="1"
    AC_DEFINE(HAVE_GLIBC_STRERROR_R, 1, [we have a glibc-style strerror_r()])
    AC_MSG_RESULT([yes]),
-    AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no]),
+
+    dnl Use an inferior method of strerror_r detection while cross-compiling
+    AC_EGREP_CPP(yes, [
+#include <features.h>
+#ifdef __GLIBC__
+yes
+#endif
+], 
+      dnl looks like glibc, so assume a glibc-style strerror_r()
+      GLIBC_STRERROR_R="1"
+      AC_DEFINE(HAVE_GLIBC_STRERROR_R, 1, [we have a glibc-style strerror_r()])
+      AC_MSG_RESULT([yes]),
+      AC_MSG_NOTICE([cannot determine strerror_r() style: edit lib/config.h manually!])
+    ) dnl while cross-compiling
    )

-    AC_MSG_CHECKING([for a POSIX strerror_r API])
-    AC_TRY_RUN([
+    if test -z "$GLIBC_STRERROR_R"; then
+
+      AC_MSG_CHECKING([for a POSIX strerror_r API])
+      AC_TRY_RUN([
 #include <string.h>
 #include <errno.h>
 int
@@ -444,12 +910,16 @@ main () {
    return 0;
 }
 ],
-    AC_DEFINE(HAVE_POSIX_STRERROR_R, 1, [we have a POSIX-style strerror_r()])
-    AC_MSG_RESULT([yes]),
-    AC_MSG_RESULT([no])
+      AC_DEFINE(HAVE_POSIX_STRERROR_R, 1, [we have a POSIX-style strerror_r()])
+      AC_MSG_RESULT([yes]),
+      AC_MSG_RESULT([no]) ,
+      dnl cross-compiling!
+      AC_MSG_NOTICE([cannot determine strerror_r() style: edit lib/config.h manually!])
    )

-  fi
+    fi dnl if not using glibc API
+
+  fi dnl we have a strerror_r

 ])

@@ -634,12 +1104,45 @@ if test "$ac_cv_func_gethostbyname_r" = "yes"; then
 fi
 ])

+
+dnl **********************************************************************
+dnl CURL_DETECT_ICC ([ACTION-IF-YES])
+dnl
+dnl check if this is the Intel ICC compiler, and if so run the ACTION-IF-YES
+dnl sets the $ICC variable to "yes" or "no"
+dnl **********************************************************************
+AC_DEFUN([CURL_DETECT_ICC],
+[
+    ICC="no"
+    AC_MSG_CHECKING([for icc in use])
+    if test "$GCC" = "yes"; then
+       dnl check if this is icc acting as gcc in disguise
+       AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
+         dnl action if the text is found, this it has not been replaced by the
+         dnl cpp
+         ICC="no",
+         dnl the text was not found, it was replaced by the cpp
+         ICC="yes"
+         AC_MSG_RESULT([yes])
+         [$1]
+       )
+    fi
+    if test "$ICC" = "no"; then
+        # this is not ICC
+        AC_MSG_RESULT([no])
+    fi
+])
+
 dnl We create a function for detecting which compiler we use and then set as
 dnl pendantic compiler options as possible for that particular compiler. The
 dnl options are only used for debug-builds.

 AC_DEFUN([CURL_CC_DEBUG_OPTS],
 [
+    if test "z$ICC" = "z"; then
+      CURL_DETECT_ICC
+    fi
+
    if test "$GCC" = "yes"; then

       dnl figure out gcc version!
@@ -650,17 +1153,6 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
       gccnum=`(expr $num1 "*" 100 + $num2) 2>/dev/null`
       AC_MSG_RESULT($gccver)

-       AC_MSG_CHECKING([if this is icc in disguise])
-       AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
-         dnl action if the text is found, this it has not been replaced by the
-         dnl cpp
-         ICC="no"
-         AC_MSG_RESULT([no]),
-         dnl the text was not found, it was replaced by the cpp
-         ICC="yes"
-         AC_MSG_RESULT([yes])
-       )
-
       if test "$ICC" = "yes"; then
         dnl this is icc, not gcc.

@@ -681,15 +1173,20 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
         fi
       else dnl $ICC = yes
         dnl this is a set of options we believe *ALL* gcc versions support:
-         WARN="-W -Wall -Wwrite-strings -pedantic -Wno-long-long -Wpointer-arith -Wnested-externs -Winline -Wmissing-declarations -Wmissing-prototypes -Wsign-compare"
+         WARN="-W -Wall -Wwrite-strings -pedantic -Wpointer-arith -Wnested-externs -Winline -Wmissing-prototypes"

         dnl -Wcast-align is a bit too annoying on all gcc versions ;-)

+         if test "$gccnum" -ge "207"; then
+           dnl gcc 2.7 or later
+           WARN="$WARN -Wmissing-declarations"
+         fi
+
         if test "$gccnum" -gt "295"; then
           dnl only if the compiler is newer than 2.95 since we got lots of
           dnl "`_POSIX_C_SOURCE' is not defined" in system headers with
           dnl gcc 2.95.4 on FreeBSD 4.9!
-           WARN="$WARN -Wundef"
+           WARN="$WARN -Wundef -Wno-long-long -Wsign-compare"
         fi

         if test "$gccnum" -ge "296"; then
@@ -703,15 +1200,18 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
         fi

         dnl -Wunreachable-code seems totally unreliable on my gcc 3.3.2 on
-         dnl on i686-Linux as it gives us heaps with false positives
+         dnl on i686-Linux as it gives us heaps with false positives.
+         dnl Also, on gcc 4.0.X it is totally unbearable and complains all
+         dnl over making it unusable for generic purposes. Let's not use it.
+
         if test "$gccnum" -ge "303"; then
           dnl gcc 3.3 and later
           WARN="$WARN -Wendif-labels -Wstrict-prototypes"
         fi

         if test "$gccnum" -ge "304"; then
-           # try -Wunreachable-code on gcc 3.4
-           WARN="$WARN -Wunreachable-code"
+           # try these on gcc 3.4
+           WARN="$WARN -Wdeclaration-after-statement"
         fi

         for flag in $CPPFLAGS; do
@@ -754,3 +1254,88 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],

 ]) dnl end of AC_DEFUN()

+
+dnl Determine the name of the library to pass to dlopen() based on the name
+dnl that would normally be given to AC_CHECK_LIB.  The preprocessor symbol
+dnl given is set to the quoted library file name. 
+dnl The standard dynamic library file name is first generated, based on the
+dnl current system type, then a search is performed for that file on the
+dnl standard dynamic library path.  If it is a symbolic link, the destination
+dnl of the link is used as the file name, after stripping off any minor
+dnl version numbers. If a library file can't be found, a guess is made.
+dnl This macro assumes AC_PROG_LIBTOOL has been called and requires perl
+dnl to be available in the PATH, or $PERL to be set to its location.
+dnl
+dnl CURL_DLLIB_NAME(VARIABLE, library_name)
+dnl e.g. CURL_DLLIB_NAME(LDAP_NAME, ldap) on a Linux system might result
+dnl in LDAP_NAME holding the string "libldap.so.2".
+
+AC_DEFUN([CURL_DLLIB_NAME],
+[
+AC_MSG_CHECKING([name of dynamic library $2])
+dnl The shared library extension variable name changes from version to
+dnl version of libtool.  Try a few names then just set one statically.
+test -z "$shared_ext" && shared_ext="$shrext_cmds"
+test -z "$shared_ext" && shared_ext="$shrext"
+test -z "$shared_ext" && shared_ext=".so"
+
+dnl Create the library link name of the correct form for this platform
+LIBNAME_LINK_SPEC=`echo "$library_names_spec" | $SED 's/^.* //'`
+DLGUESSLIB=`name=$2 eval echo "$libname_spec"`
+DLGUESSFILE=`libname="$DLGUESSLIB" release="" major="" versuffix="" eval echo "$LIBNAME_LINK_SPEC"`
+
+dnl Synthesize a likely dynamic library name in case we can't find an actual one
+SO_NAME_SPEC="$soname_spec"
+dnl soname_spec undefined when identical to the 1st entry in library_names_spec
+test -z "$SO_NAME_SPEC" && SO_NAME_SPEC=`echo "$library_names_spec" | $SED 's/ .*$//'`
+DLGUESSSOFILE=`libname="$DLGUESSLIB" release="" major="" versuffix="" eval echo "$SO_NAME_SPEC"`
+
+if test "$cross_compiling" = yes; then
+  dnl Can't look at filesystem when cross-compiling
+  AC_DEFINE_UNQUOTED($1, "$DLGUESSSOFILE", [$2 dynamic library file])
+  AC_MSG_RESULT([$DLGUESSSOFILE (guess while cross-compiling)])
+else
+
+  DLFOUNDFILE=""
+  if test "$sys_lib_dlsearch_path_spec" ; then
+    dnl Search for the link library name and see what it points to.
+    for direc in $sys_lib_dlsearch_path_spec ; do
+      DLTRYFILE="$direc/$DLGUESSFILE"
+      dnl Find where the symbolic link for this name points
+      changequote(<<, >>)dnl
+      <<
+      DLFOUNDFILE=`${PERL:-perl} -e 'use File::Basename; (basename(readlink($ARGV[0])) =~ /^(.*[^\d]\.\d+)[\d\.]*$/ && print ${1}) || exit 1;' "$DLTRYFILE" 2>&5`
+      >>
+      changequote([, ])dnl
+      if test "$?" -eq "0"; then
+        dnl Found the file link
+        break
+      fi
+    done
+  fi
+
+  if test -z "$DLFOUNDFILE" ; then
+    dnl Couldn't find a link library, so guess at a name.
+    DLFOUNDFILE="$DLGUESSSOFILE"
+  fi
+
+  AC_DEFINE_UNQUOTED($1, "$DLFOUNDFILE", [$2 dynamic library file])
+  AC_MSG_RESULT($DLFOUNDFILE)
+fi
+])
+
+# This is only a temporary fix. This macro is here to replace the broken one
+# delivered by the automake project (including the 1.9.6 release). As soon as
+# they ship a working version we SHOULD remove this work-around.
+
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} \"$am_aux_dir/missing\""
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
--- a/ares/.cvsignore
+++ b/ares/.cvsignore
@@ -6,3 +6,18 @@ ahost
 config.log
 config.status
 aclocal.m4
+.deps
+Makefile.in
+config.guess
+config.h
+config.h.in
+config.sub
+libtool
+ltmain.sh
+stamp-h1
+*.lo
+.libs
+depcomp
+libcares.la
+missing
+ares_version.h.dist
--- a/ares/AUTHORS
+++ b/ares/AUTHORS
@@ -0,0 +1,16 @@
+c-ares is based on ares, and these are the people that have worked on it since
+the fork was made:
+
+Daniel Stenberg
+Dominick Meglio
+liren at vivisimo.com
+James Bursa
+Duncan Wilcox
+Dirk Manske
+Dan Fandrich
+Gisle Vanem
+Gunter Knauf
+Henrik Stoerner
+Yang Tse
+Nick Mathewson
+Alexander Lazic
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,260 @@
  Changelog for the c-ares project

+* May 10, 2006
+
+- Bram Matthys brought my attention to a libtool peculiarity where detecting
+  things such as C++ compiler actually is a bad thing and since we don't need
+  that detection I added a work-around, much inspired by a previous patch by
+  Paolo Bonzini. This also shortens the configure script quite a lot.
+
+* May 3, 2006
+
+- Nick Mathewson added the ARES_OPT_SOCK_STATE_CB option that when set makes
+  c-ares call a callback on socket state changes. A better way than the
+  ares_getsock() to get full control over the socket state.
+
+* January 9, 2006
+
+- Alexander Lazic improved the getservbyport_r() configure check.
+
+* January 6, 2006
+
+- Alexander Lazic pointed out that the buildconf should use the ACLOCAL_FLAGS
+  variable for easier controlling what it does and how it runs.
+
+* January 5, 2006
+
+- James Bursa fixed c-ares to find the hosts file on RISC OS, and made it
+  build with newer gcc versions that no longer defines "riscos".
+
+* December 22
+
+- Daniel Stenberg added ares_getsock() that extracts the set of sockets to
+  wait for action on. Similar to ares_fds() but not restricted to using
+  select() for the waiting.
+
+* November 25
+
+- Yang Tse fixed some send() / recv() compiler warnings
+
+* September 18
+
+- Added constants that will be used by ares_getaddrinfo
+
+- Made ares_getnameinfo use the reentrant getservbyport (getservbyport_r) if it
+  is available to ensure it works properly in a threaded environment.
+
+* September 10
+
+- configure fix for detecting a member in the sockaddr_in6 struct which failed
+  on ipv6-enabled HP-UX 11.00
+
+Version 1.3.0 (August 29, 2004)
+
+* August 21
+
+- Alfredo Tupone provided a fix for the Windows code in get_iphlpapi_dns_info()
+  when getting the DNS server etc.
+
+* June 19
+
+- Added some checks for the addrinfo structure.
+
+* June 2
+
+- William Ahern:
+
+  Make UDP sockets non-blocking. I've confirmed that at least on Linux 2.4 a
+  read event can come back from poll() on a valid SOCK_DGRAM socket but
+  recv(2) will still block. This patch doesn't ignore EAGAIN in
+  read_udp_packets(), though maybe it should. (This patch was edited by Daniel
+  Stenberg and a new configure test was added (imported from curl's configure)
+  to properly detect what non-blocking socket approach to use.)
+
+  I'm not quite sure how this was happening, but I've been seeing PTR queries
+  which seem to return empty responses. At least, they were empty when calling
+  ares_expand_name() on the record. Here's a patch which guarantees to
+  NUL-terminate the expanded name. The old behavior failed to NUL-terminate if
+  len was 0, and this was causing strlen() to run past the end of the buffer
+  after calling ares_expand_name() and getting ARES_SUCCESS as the return
+  value. If q is not greater than *s then it's equal and *s is always
+  allocated with at least one byte.
+
+* May 16
+
+- Added ares_getnameinfo which mimics the getnameinfo API (another feature
+  that could use testing).
+
+* May 14
+
+- Added an inet_ntop function from BIND for systems that do not have it.
+
+* April 9
+
+- Made sortlist support IPv6 (this can probably use some testing).
+
+- Made sortlist support CIDR matching for IPv4.
+
+* April 8
+
+- Added preliminary IPv6 support to ares_gethostbyname. Currently, sortlist
+  does not work with IPv6. Also provided an implementation of bitncmp from
+  BIND for systems that do not supply this function. This will be used to add
+  IPv6 support to sortlist.
+
+- Made ares_gethostbyaddr support IPv6 by specifying AF_INET6 as the family.
+  The function can lookup IPv6 addresses both from files (/etc/hosts) and
+  DNS lookups.
+
+* April 7
+
+- Tupone Alfredo fixed includes of arpa/nameser_compat.h to build fine on Mac
+  OS X.
+
+* April 5
+
+- Dominick Meglio: Provided implementations of inet_net_pton and inet_pton
+  from BIND for systems that do not include these functions.
+
+* March 11, 2005
+
+- Dominick Meglio added ares_parse_aaaa_reply.c and did various
+  adjustments. The first little steps towards IPv6 support!
+
+* November 7
+
+- Fixed the VC project and makefile to use ares_cancel and ares_version
+
+* October 24
+
+- The released ares_version.h from 1.2.1 says 1.2.0 due to a maketgz flaw.
+  This is now fixed.
+
+Version 1.2.1 (October 20, 2004)
+
+* September 29
+
+- Henrik Stoerner fix: got a report that Tru64 Unix (the unix from Digital
+  when they made Alpha's) uses /etc/svc.conf for the purpose fixed below for
+  other OSes. He made c-ares check for and understand it if present.
+
+- Now c-ares will use local host name lookup _before_ DNS resolving by default
+  if nothing else is told.
+
+* September 26
+
+- Henrik Stoerner: found out that c-ares does not look at the /etc/host.conf
+  file to determine the sequence in which to search /etc/hosts and DNS.  So on
+  systems where this order is defined by /etc/host.conf instead of a "lookup"
+  entry in /etc/resolv.conf, c-ares will always default to looking in DNS
+  first, and /etc/hosts second.
+
+  c-ares now looks at
+
+  1) resolv.conf (for the "lookup" line);
+  2) nsswitch.fon (for the "hosts:" line);
+  3) host.conf (for the "order" line).
+
+  First match wins.
+
+- Dominick Meglio patched: C-ares on Windows assumed that the HOSTS file is
+  located in a static location. It assumed
+  C:\Windows\System32\Drivers\Etc. This is a poor assumption to make. In fact,
+  the location of the HOSTS file can be changed via a registry setting.
+
+  There is a key called DatabasePath which specifies the path to the HOSTS
+  file:
+  http://www.microsoft.com/technet/itsolutions/network/deploy/depovg/tcpip2k.mspx
+
+  The patch will make c-ares correctly consult the registry for the location
+  of this file.
+
+* August 29
+
+- Gisle Vanem fixed the MSVC build files.
+
+* August 20
+
+- Gisle Vanem made c-ares build and work with his Watt-32 TCP/IP stack.
+
+* August 13
+
+- Harshal Pradhan made a minor syntax change in ares_init.c to make it build
+  fine with MSVC 7.1
+
+* July 24
+
+- Made the lib get built static only if --enable-debug is used.
+
+- Gisle Vanem fixed:
+
+  Basically in loops like handle_errors(), 'query->next' was assigned a local
+  variable and then query was referenced after the memory was freed by
+  next_server(). I've changed that so next_server() and end_query() returns
+  the next query. So callers should use this ret-value.
+
+  The next problem was that 'server->tcp_buffer_pos' had a random value at
+  entry to 1st recv() (luckily causing Winsock to return ENOBUFS).
+
+  I've also added a ares_writev() for Windows to streamline the code a bit
+  more.
+
+* July 20
+- Fixed a few variable return types for some system calls. Made configure
+  check for ssize_t to make it possible to use that when receiving the send()
+  error code. This is necessary to prevent compiler warnings on some systems.
+
+- Made configure create config.h, and all source files now include setup.h that
+  might include the proper config.h (or a handicrafted alternative).
+
+- Switched to 'ares_socket_t' type for sockets in ares, since Windows don't
+  use 'int' for that.
+
+- automake-ified and libool-ified c-ares. Now it builds libcares as a shared
+  lib on most platforms if wanted. (This bloated the size of the release
+  archive with another 200K!)
+
+- Makefile.am now uses Makefile.inc for the c sources, h headers and man
+  pages, to make it easier for other makefiles to use the exact same set of
+  files.
+
+- Adjusted 'maketgz' to use the new automake magic when building distribution
+  archives.
+
+- Anyone desires HTML and/or PDF versions of the man pages in the release
+  archives?
+
+* July 3
+- G<>nter Knauf made c-ares build and run on Novell Netware.
+
+* July 1
+- Gisle Vanem provided Makefile.dj to build with djgpp, added a few more djgpp
+  fixes and made ares not use 'errno' to provide further info on Windows.
+
+* June 30
+- Gisle Vanem made it build with djgpp and run fine with the Watt-32 stack.
+
+* June 10
+- Gisle Vanem's init patch for Windows:
+
+  The init_by_resolv_conf() function fetches the DNS-server(s)
+  from a series of registry branches.
+
+  This can be wrong in the case where DHCP has assigned nameservers, but the
+  user has overridden these servers with other prefered settings. Then it's
+  wrong to use the DHCPNAMESERVER setting in registry.
+
+  In the case of no global DHCP-assigned or fixed servers, but DNS server(s)
+  per adapter, one has to query the adapter branches.  But how can c-ares know
+  which adapter is valid for use? AFAICS it can't. There could be one adapter
+  that is down (e.g. a VPN adapter).
+
+  So it's better to leave this to the IP Helper API (iphlapi) available in
+  Win-98/2000 and later. My patch falls-back to the old way if not available.
+
+* June 8
+- James Bursa fixed an init issue for RISC OS.
+
 * May 11
 - Nico Stappenbelt reported that when processing domain and search lines in
  the resolv.conf file, the first entry encountered is processed and used as
--- a/ares/FILES
+++ b/ares/FILES
@@ -10,6 +10,10 @@ maketgz
 aclocal.m4
 acinclude.m4
 Makefile.in
+Makefile.dj
+Makefile.m32
+Makefile.netware
+Makefile.vc6
 install-sh
 mkinstalldirs
 configure
--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -0,0 +1,71 @@
+AUTOMAKE_OPTIONS = foreign
+
+lib_LTLIBRARIES = libcares.la
+
+man_MANS = $(MANPAGES)
+
+MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/vc.dsw vc/ahost/ahost.dep \
+ vc/ahost/ahost.dsp vc/areslib/areslib.dep vc/areslib/areslib.dsp	   \
+ vc/areslib/areslib.dsw
+
+# adig and ahost are just sample programs and thus not mentioned with the
+# regular sources and headers
+EXTRA_DIST = CHANGES README.cares Makefile.inc adig.c ahost.c $(man_MANS) \
+ $(MSVCFILES) AUTHORS
+
+
+VER=-version-info 1:0:0
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
+# 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that age
+# must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information: 
+#
+# 1.Start with version information of 0:0:0 for each libtool library.
+#
+# 2.Update the version information only immediately before a public release of
+# your software. More frequent updates are unnecessary, and only guarantee
+# that the current interface number gets larger faster.
+#
+# 3.If the library source code has changed at all since the last update, then
+# increment revision (c:r+1:a)
+#
+# 4.If any interfaces have been added, removed, or changed since the last
+# update, increment current, and set revision to 0. (c+1:r=0:a)
+#
+# 5.If any interfaces have been added since the last public release, then
+# increment age. (c:r:a+1)
+#
+# 6.If any interfaces have been removed since the last public release, then
+# set age to 0. (c:r:a=0)
+#
+
+if NO_UNDEFINED
+# The -no-undefined flag is crucial for this to build fine on some platforms
+UNDEF = -no-undefined
+endif
+
+
+libcares_la_LDFLAGS = $(UNDEF) $(VER)
+
+# Makefile.inc provides the CSOURCES and HHEADERS defines
+include Makefile.inc
+
+libcares_la_SOURCES = $(CSOURCES) $(HHEADERS)
+
+# where to install the c-ares headers
+libcares_ladir = $(includedir)
+# what headers to install on 'make install':
+libcares_la_HEADERS = ares.h ares_version.h
+
+# Make files named *.dist replace the file without .dist extension
+dist-hook:
+	find $(distdir) -name "*.dist" -exec rm {} \;
+	(distit=`find $(srcdir) -name "*.dist"`; \
+	for file in $$distit; do \
+	  strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \
+	  cp $$file $(distdir)$$strip; \
+	done)
--- a/ares/Makefile.dj
+++ b/ares/Makefile.dj
@@ -0,0 +1,55 @@
+#
+# c-ares Makefile for djgpp/gcc/Watt-32.
+#   By Gisle Vanem <giva@bgnett.no> 2004.
+#
+.SUFFIXES: .exe
+
+include Makefile.inc
+
+WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
+
+CC      = gcc
+CFLAGS  = -O2 -Wall -DWATT32 -Dselect=select_s -DHAVE_AF_INET6 \
+          -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET -DHAVE_STRUCT_IN6_ADDR \
+          -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
+          -DHAVE_ARPA_NAMESER_H -DNS_INADDRSZ=4 \
+          -DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID -I$(WATT32_ROOT)/inc
+
+LDFLAGS = -s
+EX_LIBS = $(WATT32_ROOT)/lib/libwatt.a
+
+OBJ_DIR = djgpp
+
+OBJECTS = $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
+
+all: $(OBJ_DIR) libcares.a ahost.exe adig.exe
+	@echo Welcome to c-ares.
+
+$(OBJ_DIR):
+	- mkdir $(OBJ_DIR)
+
+libcares.a: $(OBJECTS)
+	ar rs $@ $?
+
+ahost.exe: ahost.c libcares.a
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+adig.exe: adig.c libcares.a
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+clean:
+	rm -f $(OBJECTS) libcares.a
+
+vclean realclean: clean
+	rm -f ahost.exe adig.exe depend.dj
+	- rmdir $(OBJ_DIR)
+
+$(OBJ_DIR)/%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+	@echo
+
+depend:
+	$(CC) -MM $(CFLAGS) $(CSOURCES) | \
+	sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/$$(OBJ_DIR)\/\1/' > depend.dj
+
+-include depend.dj
--- a/ares/Makefile.in
+++ b/ares/Makefile.in
@@ -1,79 +0,0 @@
-# $Id$
-
-SHELL=/bin/sh
-INSTALL=@INSTALL@
-RANLIB=@RANLIB@
-VPATH=@srcdir@
-srcdir=@srcdir@
-top_srcdir=@top_srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-
-LIB=libcares.a
-CC=@CC@
-CPPFLAGS=@CPPFLAGS@
-CFLAGS=@CFLAGS@ ${WARN_CFLAGS} ${ERROR_CFLAGS}
-DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
-OBJS=	ares__close_sockets.o ares__get_hostent.o ares__read_line.o \
-	ares_destroy.o ares_expand_name.o ares_fds.o \
-	ares_free_hostent.o ares_free_string.o ares_gethostbyaddr.o \
-	ares_gethostbyname.o ares_init.o ares_mkquery.o ares_parse_a_reply.o \
-	ares_parse_ptr_reply.o ares_process.o ares_query.o ares_search.o \
-	ares_send.o ares_strerror.o ares_timeout.o ares_version.o \
-	ares_expand_string.o ares_cancel.o
-
-MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3   \
-        ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3	      \
-        ares_gethostbyname.3 ares_init.3 ares_init_options.3 ares_mkquery.3   \
-        ares_parse_a_reply.3 ares_parse_ptr_reply.3 ares_process.3	      \
-        ares_query.3 ares_search.3 ares_send.3 ares_strerror.3 ares_timeout.3 \
-        ares_version.3 ares_cancel.3
-
-$(LIB): ${OBJS}
-	ar cru $@ ${OBJS}
-	${RANLIB} $@
-
-all: $(LIB) demos
-
-demos: adig ahost
-
-tags:
-	etags *.[ch]
-
-adig: adig.o $(LIB)
-	${CC} ${LDFLAGS} -o $@ adig.o $(LIB) ${LIBS}
-
-ahost: ahost.o $(LIB)
-	${CC} ${LDFLAGS} -o $@ ahost.o $(LIB) ${LIBS}
-
-${OBJS}: ares.h ares_dns.h ares_private.h
-
-.c.o:
-	${CC} -c ${ALL_CFLAGS} $<
-
-check:
-
-install:
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
-	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
-	chmod u-w ${DESTDIR}${libdir}/$(LIB)
-	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
-	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
-	(for man in $(MANPAGES); do \
-	   ${INSTALL} -m 444 ${srcdir}/$${man} ${DESTDIR}${mandir}/man3; \
-	done)
-
-clean:
-	rm -f ${OBJS} $(LIB) adig.o adig ahost.o ahost
-
-distclean: clean
-	rm -f config.cache config.log config.status Makefile
--- a/ares/Makefile.inc
+++ b/ares/Makefile.inc
@@ -0,0 +1,18 @@
+CSOURCES = ares_fds.c ares_getsock.c ares_process.c ares_free_hostent.c	\
+ares_query.c ares__close_sockets.c ares_free_string.c ares_search.c	\
+ares__get_hostent.c ares_gethostbyaddr.c ares_send.c ares__read_line.c	\
+ares_gethostbyname.c ares_strerror.c ares_cancel.c ares_init.c		\
+ares_timeout.c ares_destroy.c ares_mkquery.c ares_version.c		\
+ares_expand_name.c ares_parse_a_reply.c windows_port.c			\
+ares_expand_string.c ares_parse_ptr_reply.c ares_parse_aaaa_reply.c	\
+ares_getnameinfo.c inet_net_pton.c bitncmp.c inet_ntop.c
+
+HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h          \
+           nameser.h inet_net_pton.h inet_ntop.h ares_ipv6.h bitncmp.h
+
+MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3 \
+ ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3                \
+ ares_gethostbyname.3 ares_init.3 ares_init_options.3 ares_mkquery.3        \
+ ares_parse_a_reply.3 ares_parse_ptr_reply.3 ares_process.3                 \
+ ares_query.3 ares_search.3 ares_send.3 ares_strerror.3 ares_timeout.3      \
+ ares_version.3 ares_cancel.3 ares_parse_aaaa_reply.3 ares_getnameinfo.3
--- a/ares/Makefile.m32
+++ b/ares/Makefile.m32
@@ -0,0 +1,68 @@
+#############################################################
+# $Id$
+#
+## Makefile for building libcares.a with MingW32 (GCC-3.2)
+## Use: make -f Makefile.m32 [demos]
+##
+## Quick hack by Guenter; comments to: /dev/nul
+
+CC = gcc
+RANLIB = ranlib
+
+########################################################
+## Nothing more to do below this line!
+
+LIB=libcares.a
+CC=gcc
+CFLAGS=-O2 -Wall
+LDFLAGS=-s
+LIBS=-lwsock32
+
+MANPAGES := $(patsubst %.c,%.o,$(wildcard ares_*.3))
+
+OBJS	:= $(patsubst %.c,%.o,$(wildcard ares_*.c))
+OBJS	+= windows_port.o inet_ntop.o inet_net_pton.o bitncmp.o
+
+$(LIB): ${OBJS}
+	ar cru $@ ${OBJS}
+	${RANLIB} $@
+
+all: $(LIB) demos
+
+demos: adig.exe ahost.exe
+
+tags:
+	etags *.[ch]
+
+adig.exe: adig.o $(LIB)
+	${CC} ${LDFLAGS} -o $@ adig.o $(LIB) ${LIBS}
+
+ahost.exe: ahost.o $(LIB)
+	${CC} ${LDFLAGS} -o $@ ahost.o $(LIB) ${LIBS}
+
+${OBJS}: ares.h ares_dns.h ares_private.h
+
+.c.o:
+	${CC} -c ${CFLAGS} $<
+
+check:
+
+install:
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
+	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
+	chmod u-w ${DESTDIR}${libdir}/$(LIB)
+	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
+	(for man in $(MANPAGES); do \
+	   ${INSTALL} -m 444 ${srcdir}/$${man} ${DESTDIR}${mandir}/man3; \
+	done)
+
+clean:
+	rm -f ${OBJS} $(LIB) adig.o adig.exe ahost.o ahost.exe
+
+distclean: clean
+	rm -f config.cache config.log config.status Makefile
+
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -0,0 +1,328 @@
+#################################################################
+#
+## Makefile for building libares.lib (NetWare version - gnu make)
+## Use: make -f Makefile.netware
+##
+## Comments to: Guenter Knauf <eflash@gmx.net>
+#
+#################################################################
+
+# Edit the path below to point to the base of your Novell NDK.
+ifndef NDKBASE
+NDKBASE	= c:/novell
+endif
+
+ifndef INSTDIR
+INSTDIR	= ../curl-$(LIBCURL_VERSION_STR)-bin-nw
+endif
+
+# Edit the vars below to change NLM target settings.
+TARGETS = adig.nlm ahost.nlm
+LTARGET = libcares.lib
+VERSION	= $(LIBCARES_VERSION)
+COPYR	= Copyright (C) 1996 - 2006, Daniel Stenberg, <daniel@haxx.se>
+DESCR	= cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
+MTSAFE	= YES
+STACK	= 64000
+SCREEN	= none
+#EXPORTS	=
+# Comment the line below if you dont want to load protected automatically.
+#LDRING	= 3
+
+# Edit the var below to point to your lib architecture.
+ifndef LIBARCH
+LIBARCH = LIBC
+endif
+
+# must be equal to DEBUG or NDEBUG
+DB	= NDEBUG
+# DB	= DEBUG
+# DB	= CURLDEBUG
+# Optimization: -O<n> or debugging: -g
+ifeq ($(DB),NDEBUG)
+	OPT	= -O2
+	OBJDIR	= release
+else
+	OPT	= -g
+	OBJDIR	= debug
+endif
+
+# Include the version info retrieved from curlver.h
+-include $(OBJDIR)/version.inc
+
+# The following line defines your compiler.
+ifdef METROWERKS
+	CC = mwccnlm
+else
+	CC = gcc
+endif
+YACC	= bison -y
+CP	= cp -afv
+# RM	= rm -f
+# if you want to mark the target as MTSAFE you will need a tool for
+# generating the xdc data for the linker; here's a minimal tool:
+# http://www.gknw.com/development/prgtools/mkxdc.zip
+MPKXDC	= mkxdc
+
+# Global flags for all compilers
+CFLAGS	= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
+
+ifeq ($(CC),mwccnlm)
+LD	= mwldnlm
+LDFLAGS	= -nostdlib $(PRELUDE) $(OBJS) $(<:.def=.o) -o $@ -commandfile
+AR	= mwldnlm
+ARFLAGS	= -type library -w nocmdline $(OBJDIR)/*.o -o
+CFLAGS	+= -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
+CFLAGS	+= -relax_pointers
+#CFLAGS	+= -w on
+ifeq ($(LIBARCH),LIBC)
+	PRELUDE = $(SDK_LIBC)/imports/libcpre.o
+	CFLAGS += -align 4
+else
+	PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+#	CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
+	CFLAGS += -align 1
+endif
+else
+LD	= nlmconv
+LDFLAGS	= -T
+AR	= ar
+ARFLAGS	= -cq
+CFLAGS	+= -fno-builtin -fpcc-struct-return -fno-strict-aliasing
+CFLAGS	+= -Wall -Wno-format -Wno-uninitialized # -pedantic
+ifeq ($(LIBARCH),LIBC)
+	PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
+else
+	PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
+	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+endif
+endif
+
+NDK_ROOT = $(NDKBASE)/ndk
+SDK_CLIB = $(NDK_ROOT)/nwsdk
+SDK_LIBC = $(NDK_ROOT)/libc
+
+ifeq ($(LIBARCH),LIBC)
+	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
+	# INCLUDES += -I$(SDK_LIBC)/include/winsock
+	CFLAGS += -D_POSIX_SOURCE
+#	CFLAGS += -D__ANSIC__
+else
+	INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+	# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
+	CFLAGS += -DNETDB_USE_INTERNET
+endif
+CFLAGS	+= -I. $(INCLUDES)
+
+ifeq ($(MTSAFE),YES)
+	XDCOPT = -n
+endif
+ifeq ($(MTSAFE),NO)
+	XDCOPT = -u
+endif
+
+ifeq ($(findstring linux,$(OSTYPE)),linux)
+DL	= '
+#-include $(NDKBASE)/nlmconv/ncpfs.inc
+endif
+
+# Makefile.inc provides the CSOURCES and HHEADERS defines
+include Makefile.inc
+
+OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES)))
+
+.PHONY: lib nlm prebuild dist install clean
+
+lib: prebuild $(LTARGET)
+
+nlm: prebuild $(TARGETS) 
+
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h arpa/nameser.h
+
+dist: all
+	-$(RM) $(OBJS) $(OBJDIR)/*.map $(OBJDIR)/*.ncv
+	-$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.xdc $(OBJDIR)/version.inc
+
+install: $(INSTDIR) all
+	@$(CP) *.nlm $(INSTDIR)
+	@$(CP) ../CHANGES $(INSTDIR)
+	@$(CP) ../COPYING $(INSTDIR)
+	@$(CP) ../README $(INSTDIR)
+	@$(CP) ../RELEASE-NOTES $(INSTDIR)
+
+clean:
+	-$(RM) $(LTARGET) $(TARGETS) config.h
+	-$(RM) -r $(OBJDIR)
+	-$(RM) -r arpa
+
+%.lib: $(OBJS)
+	@echo Creating $@
+	@-$(RM) $@
+	@$(AR) $(ARFLAGS) $@ $^
+
+%.nlm: $(OBJDIR)/%.def $(OBJDIR)/%.o $(OBJDIR)/%.xdc $(OBJS)
+	@echo Linking $@
+	@-$(RM) $@
+	@$(LD) $(LDFLAGS) $<
+
+$(INSTDIR):
+	@mkdir $(INSTDIR)
+
+$(OBJDIR):
+	@mkdir $(OBJDIR)
+
+$(OBJDIR)/%.o: %.c
+#	@echo Compiling $<
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)/version.inc: ares_version.h $(OBJDIR)
+	@echo Creating $@
+	@awk -f ../packages/NetWare/get_ver.awk $< > $@
+
+$(OBJDIR)/%.xdc: Makefile.netware
+	@echo Creating $@
+	@$(MPKXDC) $(XDCOPT) $@
+
+$(OBJDIR)/%.def: Makefile.netware
+	@echo Creating $@
+	@echo $(DL)# DEF file for linking with $(LD)$(DL) > $@
+	@echo $(DL)# Do not edit this file - it is created by make!$(DL) >> $@
+	@echo $(DL)# All your changes will be lost!!$(DL) >> $@
+	@echo $(DL)#$(DL) >> $@
+	@echo $(DL)copyright "$(COPYR)"$(DL) >> $@
+	@echo $(DL)description "$(DESCR)"$(DL) >> $@
+	@echo $(DL)version $(VERSION)$(DL) >> $@
+ifdef NLMTYPE
+	@echo $(DL)type $(NLMTYPE)$(DL) >> $@
+endif
+ifdef STACK
+	@echo $(DL)stack $(STACK)$(DL) >> $@
+endif
+ifdef SCREEN
+	@echo $(DL)screenname "$(SCREEN)"$(DL) >> $@
+else
+	@echo $(DL)screenname "DEFAULT"$(DL) >> $@
+endif
+ifeq ($(DB),DEBUG)
+	@echo $(DL)debug$(DL) >> $@
+endif
+	@echo $(DL)threadname "$^"$(DL) >> $@
+ifdef XDCOPT
+	@echo $(DL)xdcdata $(@:.def=.xdc)$(DL) >> $@
+endif
+ifeq ($(LDRING),0)
+	@echo $(DL)flag_on 16$(DL) >> $@
+endif
+ifeq ($(LDRING),3)
+	@echo $(DL)flag_on 512$(DL) >> $@
+endif
+ifeq ($(LIBARCH),CLIB)
+	@echo $(DL)start _Prelude$(DL) >> $@
+	@echo $(DL)exit _Stop$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/clib.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/threads.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/nlmlib.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/socklib.imp$(DL) >> $@
+	@echo $(DL)module clib$(DL) >> $@
+else
+	@echo $(DL)flag_on 64$(DL) >> $@
+	@echo $(DL)pseudopreemption$(DL) >> $@
+	@echo $(DL)start _LibCPrelude$(DL) >> $@
+	@echo $(DL)exit _LibCPostlude$(DL) >> $@
+	@echo $(DL)check _LibCCheckUnload$(DL) >> $@
+	@echo $(DL)import @$(SDK_LIBC)/imports/libc.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_LIBC)/imports/netware.imp$(DL) >> $@
+	@echo $(DL)module libc$(DL) >> $@
+endif
+ifdef MODULES
+	@echo $(DL)module $(MODULES)$(DL) >> $@
+endif
+ifdef EXPORTS
+	@echo $(DL)export $(EXPORTS)$(DL) >> $@
+endif
+ifdef IMPORTS
+	@echo $(DL)import $(IMPORTS)$(DL) >> $@
+endif
+ifeq ($(LD),nlmconv)
+	@echo $(DL)input $(OBJS)$(DL) >> $@
+	@echo $(DL)input $(PRELUDE)$(DL) >> $@
+	@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
+endif
+
+config.h: Makefile.netware
+	@echo Creating $@
+	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
+	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
+	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
+	@echo $(DL)*/$(DL) >> $@
+	@echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
+	@echo $(DL)#define VERSION "$(LIBCARES_VERSION_STR)"$(DL) >> $@
+	@echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@
+	@echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ARPA_NAMESER_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_PTON 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
+	@echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SOCKET 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
+	@echo $(DL)#define RETSIGTYPE void$(DL) >> $@
+	@echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@
+	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
+	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_AF_INET6 1$(DL) >> $@
+	@echo $(DL)#define HAVE_PF_INET6 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRUCT_IN6_ADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@
+	@echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@
+	@echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@
+ifdef NW_WINSOCK
+	@echo $(DL)#define HAVE_CLOSESOCKET 1$(DL) >> $@
+else
+	@echo $(DL)#define HAVE_SYS_TYPES_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SOCKET_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SOCKIO_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_NETDB_H 1$(DL) >> $@
+endif
+ifdef OLD_NOVELLSDK
+	@echo $(DL)#define socklen_t int$(DL) >> $@
+endif
+
+arpa/nameser.h: nameser.h
+	@echo Fix missing header $@
+	@-mkdir arpa
+	@$(CP) $< arpa
+
+
--- a/ares/Makefile.vc6
+++ b/ares/Makefile.vc6
@@ -0,0 +1,190 @@
+# $Id$
+#
+# C-ares makefile for MSVC6+
+# G. Vanem <giva@bgnett.no>.
+#
+
+CFG_MODEL   = MD
+DEBUG_MODEL = d
+USE_WATT32  = 0
+
+#
+# Configurations:
+#  -MD   - msvcrt.dll,  threads, release (normal)
+#  -MDd  - msvcrtd.dll, threads, debug
+#  -ML   - libc, no threads,     release
+#  -MLd  - libc, no threads,     debug
+#  -MT   - libc, threads,        release
+#  -MTd  - libc, threads,        debug
+
+CC = cl
+
+CFLAGS  = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi
+LDFLAGS = -machine:i386 -map
+
+OBJ_DIR  = VC6_obj
+DEF_FILE = cares.def
+
+!if "$(USE_WATT32)" == "1"
+CFLAGS  = $(CFLAGS) -UWIN32 -DWATT32 -I$(WATT_ROOT)\inc
+EX_LIBS = $(WATT_ROOT)\lib\wattcpvc_imp.lib
+
+!else
+CFLAGS  = $(CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN
+EX_LIBS = advapi32.lib ws2_32.lib
+!endif
+
+!if "$(DEBUG_MODEL)" == "d"
+CFLAGS  = $(CFLAGS) -D_DEBUG -GZ
+LDFLAGS = $(LDFLAGS) -debug -fixed:no
+
+!else
+CFLAGS  = $(CFLAGS) -O2 -Og
+LDFLAGS = $(LDFLAGS) -release
+!endif
+
+OBJECTS = $(OBJ_DIR)\ares_fds.obj              \
+          $(OBJ_DIR)\ares_process.obj          \
+          $(OBJ_DIR)\ares_free_hostent.obj     \
+          $(OBJ_DIR)\ares_query.obj            \
+          $(OBJ_DIR)\ares__close_sockets.obj   \
+          $(OBJ_DIR)\ares_free_string.obj      \
+          $(OBJ_DIR)\ares_search.obj           \
+          $(OBJ_DIR)\ares__get_hostent.obj     \
+          $(OBJ_DIR)\ares_gethostbyaddr.obj    \
+          $(OBJ_DIR)\ares_getsock.obj          \
+          $(OBJ_DIR)\ares_send.obj             \
+          $(OBJ_DIR)\ares__read_line.obj       \
+          $(OBJ_DIR)\ares_gethostbyname.obj    \
+          $(OBJ_DIR)\ares_getnameinfo.obj      \
+          $(OBJ_DIR)\ares_strerror.obj         \
+          $(OBJ_DIR)\ares_cancel.obj           \
+          $(OBJ_DIR)\ares_init.obj             \
+          $(OBJ_DIR)\ares_timeout.obj          \
+          $(OBJ_DIR)\ares_destroy.obj          \
+          $(OBJ_DIR)\ares_mkquery.obj          \
+          $(OBJ_DIR)\ares_version.obj          \
+          $(OBJ_DIR)\ares_expand_name.obj      \
+          $(OBJ_DIR)\ares_parse_a_reply.obj    \
+          $(OBJ_DIR)\ares_parse_aaaa_reply.obj \
+          $(OBJ_DIR)\windows_port.obj          \
+          $(OBJ_DIR)\ares_expand_string.obj    \
+          $(OBJ_DIR)\ares_parse_ptr_reply.obj  \
+          $(OBJ_DIR)\bitncmp.obj               \
+          $(OBJ_DIR)\inet_net_pton.obj         \
+          $(OBJ_DIR)\inet_ntop.obj
+
+all: $(OBJ_DIR) cares.lib cares.dll cares_imp.lib ahost.exe adig.exe
+
+$(OBJ_DIR):
+       mkdir $(OBJ_DIR)
+
+cares.lib: $(OBJ_DIR) $(OBJECTS)
+       lib -nologo -out:$@ $(OBJECTS)
+
+cares_imp.lib cares.dll: $(OBJ_DIR) $(DEF_FILE) $(OBJECTS)
+       link $(LDFLAGS) -dll -implib:cares_imp.lib -out:cares.dll \
+            -def:$(DEF_FILE) $(OBJECTS) $(EX_LIBS)
+
+$(DEF_FILE): $(OBJECTS) Makefile.VC6
+       @echo ; Generated. DO NOT EDIT  > $@
+       @echo LIBRARY cares.dll        >> $@
+       @echo EXPORTS                  >> $@
+       @echo   ares_cancel            >> $@
+       @echo   ares_destroy           >> $@
+       @echo   ares_expand_name       >> $@
+       @echo   ares_expand_string     >> $@
+       @echo   ares_fds               >> $@
+       @echo   ares_free_hostent      >> $@
+       @echo   ares_free_string       >> $@
+       @echo   ares_gethostbyaddr     >> $@
+       @echo   ares_gethostbyname     >> $@
+       @echo   ares_getsock           >> $@
+       @echo   ares_init              >> $@
+       @echo   ares_init_options      >> $@
+       @echo   ares_mkquery           >> $@
+       @echo   ares_parse_a_reply     >> $@
+       @echo   ares_parse_ptr_reply   >> $@
+       @echo   ares_process           >> $@
+       @echo   ares_query             >> $@
+       @echo   ares_search            >> $@
+       @echo   ares_strerror          >> $@
+       @echo   ares_strncasecmp       >> $@
+       @echo   ares_strcasecmp        >> $@
+       @echo   ares_timeout           >> $@
+       @echo   ares_version           >> $@
+       @echo   ares_inet_net_pton     >> $@
+       @echo   ares_inet_ntop         >> $@
+       @echo   ares_inet_pton         >> $@
+       @echo   ares_writev            >> $@
+       @echo   ares_getnameinfo       >> $@
+       @echo   ares_gettimeofday      >> $@
+       @echo   ares_parse_aaaa_reply  >> $@
+
+ahost.exe: $(OBJ_DIR) $(OBJ_DIR)\ahost.obj cares_imp.lib
+       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\ahost.obj cares_imp.lib $(EX_LIBS)
+
+adig.exe: $(OBJ_DIR) $(OBJ_DIR)\adig.obj $(OBJ_DIR)\getopt.obj cares_imp.lib
+       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\adig.obj $(OBJ_DIR)\getopt.obj cares_imp.lib $(EX_LIBS)
+
+clean:
+       - del $(OBJ_DIR)\*.obj *.ilk *.pdb *.pbt *.pbi *.pbo *._xe *.map
+
+vclean realclean: clean
+       - del $(DEF_FILE) cares.lib cares_imp.* cares.dll ahost.exe adig.exe
+       - rd $(OBJ_DIR)
+
+.c{$(OBJ_DIR)}.obj:
+       $(CC) $(CFLAGS) -Fo$*.obj -c $<
+
+#
+# Copyright "gcc -MM .."
+#
+$(OBJ_DIR)\ares_fds.obj: ares_fds.c setup.h ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h nameser.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c setup.h ares.h ares_private.h \
+  ares_ipv6.h
+$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h nameser.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c setup.h ares.h \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h ares.h
+$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h nameser.h ares.h ares_private.h \
+  ares_ipv6.h
+$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h ares.h ares_private.h \
+  ares_ipv6.h inet_net_pton.h
+$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h nameser.h ares.h \
+  ares_private.h ares_ipv6.h inet_net_pton.h
+$(OBJ_DIR)\ares_send.obj: ares_send.c setup.h nameser.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h ares.h ares_private.h \
+  ares_ipv6.h
+$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h nameser.h ares.h \
+  ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h
+$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h ares.h
+$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h nameser.h ares.h ares_private.h \
+  ares_ipv6.h inet_net_pton.h
+$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c setup.h ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h nameser.h ares.h ares_dns.h
+$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h ares_version.h
+$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h nameser.h ares.h \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c setup.h nameser.h ares.h \
+  ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h nameser.h ares.h ares_private.h \
+  ares_ipv6.h
+$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h nameser.h ares.h \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c setup.h nameser.h ares.h \
+  ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h nameser.h ares.h \
+  ares_dns.h inet_net_pton.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h nameser.h ares.h \
+  ares_private.h ares_ipv6.h inet_ntop.h
+$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c setup.h nameser.h ares_ipv6.h \
+  inet_net_pton.h
+$(OBJ_DIR)\bitncmp.obj: bitncmp.c bitncmp.h
+$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h nameser.h ares_ipv6.h inet_ntop.h
--- a/ares/NEWS
+++ b/ares/NEWS
@@ -1,3 +1,6 @@
+Major changes since:
+* see the CHANGES file
+
 Major changes in release 1.1.1:
 * ares should now compile as C++ code (no longer uses reserved word
  "class").
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -1,4 +1,637 @@

+
+dnl CURL_CHECK_HEADER_WINDOWS
+dnl -------------------------------------------------
+dnl Check for compilable and valid windows.h header 
+
+AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
+  AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+      ],[
+        int dummy=2*WINVER;
+      ])
+    ],[
+      ac_cv_header_windows_h="yes"
+    ],[
+      ac_cv_header_windows_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_windows_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
+      [Define to 1 if you have the windows.h header file.])
+    AC_DEFINE_UNQUOTED(WIN32_LEAN_AND_MEAN, 1,
+      [Define to avoid automatic inclusion of winsock.h])
+  fi
+])
+
+
+dnl CURL_CHECK_HEADER_WINSOCK
+dnl -------------------------------------------------
+dnl Check for compilable and valid winsock.h header 
+
+AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
+  AC_CACHE_CHECK([for winsock.h], [ac_cv_header_winsock_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock.h>
+      ],[
+        int dummy=WSACleanup();
+      ])
+    ],[
+      ac_cv_header_winsock_h="yes"
+    ],[
+      ac_cv_header_winsock_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_winsock_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1,
+      [Define to 1 if you have the winsock.h header file.])
+  fi
+])
+
+
+dnl CURL_CHECK_HEADER_WINSOCK2
+dnl -------------------------------------------------
+dnl Check for compilable and valid winsock2.h header 
+
+AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
+  AC_CACHE_CHECK([for winsock2.h], [ac_cv_header_winsock2_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock2.h>
+      ],[
+        int dummy=2*IPPROTO_ESP;
+      ])
+    ],[
+      ac_cv_header_winsock2_h="yes"
+    ],[
+      ac_cv_header_winsock2_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_winsock2_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, 1,
+      [Define to 1 if you have the winsock2.h header file.])
+  fi
+])
+
+
+dnl CURL_CHECK_HEADER_WS2TCPIP
+dnl -------------------------------------------------
+dnl Check for compilable and valid ws2tcpip.h header
+
+AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
+  AC_CACHE_CHECK([for ws2tcpip.h], [ac_cv_header_ws2tcpip_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+      ],[
+        int dummy=2*IP_PKTINFO;
+      ])
+    ],[
+      ac_cv_header_ws2tcpip_h="yes"
+    ],[
+      ac_cv_header_ws2tcpip_h="no"
+    ])
+  ])
+  if test "x$ac_cv_header_ws2tcpip_h" = "xyes"; then
+    AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, 1,
+      [Define to 1 if you have the ws2tcpip.h header file.])
+  fi
+])
+
+
+dnl CURL_CHECK_TYPE_SOCKLEN_T
+dnl -------------------------------------------------
+dnl Check for existing socklen_t type, and provide
+dnl an equivalent type if socklen_t not available
+
+AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
+  AC_CHECK_TYPE([socklen_t], ,[
+    AC_CACHE_CHECK([for socklen_t equivalent], 
+      [curl_cv_socklen_t_equiv], [
+      curl_cv_socklen_t_equiv="unknown"
+      for arg2 in "struct sockaddr" void; do
+        for t in int size_t unsigned long "unsigned long"; do
+          AC_COMPILE_IFELSE([
+            AC_LANG_PROGRAM([
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+              int getpeername (int, $arg2 *, $t *);
+            ],[
+              $t len=0;
+              getpeername(0,0,&len);
+            ])
+          ],[
+             curl_cv_socklen_t_equiv="$t"
+             break 2
+          ])
+        done
+      done
+    ])
+    if test "$curl_cv_socklen_t_equiv" = "unknown"; then
+      AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+    else
+      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+        [type to use in place of socklen_t if not defined])
+    fi
+  ],[
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+  ])
+])
+
+
+dnl CURL_CHECK_FUNC_GETNAMEINFO
+dnl -------------------------------------------------
+dnl Test if the getnameinfo function is available, 
+dnl and check the types of five of its arguments.
+dnl If the function succeeds HAVE_GETNAMEINFO will be
+dnl defined, defining the types of the arguments in
+dnl GETNAMEINFO_TYPE_ARG1, GETNAMEINFO_TYPE_ARG2,
+dnl GETNAMEINFO_TYPE_ARG46 and GETNAMEINFO_TYPE_ARG7.
+dnl This function is experimental and its results shall
+dnl not be trusted while this notice is in place ------
+
+AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
+  AC_REQUIRE([CURL_CHECK_TYPE_SOCKLEN_T])dnl
+  AC_CHECK_HEADERS(sys/types.h sys/socket.h netdb.h)
+  #
+  AC_MSG_CHECKING([for getnameinfo])
+  AC_LINK_IFELSE([
+      AC_LANG_FUNC_LINK_TRY([getnameinfo])
+    ],[
+      AC_MSG_RESULT([yes])
+      curl_cv_getnameinfo="yes"
+    ],[
+      AC_MSG_RESULT([no])
+      curl_cv_getnameinfo="no"
+  ])
+  #
+  if test "$curl_cv_getnameinfo" != "yes"; then
+    AC_MSG_CHECKING([deeper for getnameinfo])
+    AC_TRY_LINK([
+      ],[
+        getnameinfo();
+      ],[
+        AC_MSG_RESULT([yes])
+        curl_cv_getnameinfo="yes"
+      ],[
+        AC_MSG_RESULT([but still no])
+        curl_cv_getnameinfo="no"
+    ])
+  fi
+  #
+  if test "$curl_cv_getnameinfo" != "yes"; then
+    AC_MSG_CHECKING([deeper and deeper for getnameinfo])
+    AC_TRY_LINK([
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#endif
+      ],[
+        getnameinfo(0, 0, 0, 0, 0, 0, 0);
+      ],[ 
+        AC_MSG_RESULT([yes])
+        curl_cv_getnameinfo="yes"
+      ],[
+        AC_MSG_RESULT([but still no])
+        curl_cv_getnameinfo="no"
+    ])
+  fi
+  #
+  if test "$curl_cv_getnameinfo" = "yes"; then
+    AC_CACHE_CHECK([types of arguments for getnameinfo],
+      [curl_cv_func_getnameinfo_args], [
+      curl_cv_func_getnameinfo_args="unknown"
+      for gni_arg1 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
+        for gni_arg2 in 'socklen_t' 'size_t' 'int'; do
+          for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do
+            for gni_arg7 in 'int' 'unsigned int'; do
+              AC_COMPILE_IFELSE([
+                AC_LANG_PROGRAM([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#if (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501)
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h> 
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#define GNICALLCONV WSAAPI
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#define GNICALLCONV
+#endif
+                  extern int GNICALLCONV getnameinfo($gni_arg1, $gni_arg2,
+                                         char *, $gni_arg46,
+                                         char *, $gni_arg46,
+                                         $gni_arg7);
+                ],[
+                  $gni_arg2 salen=0;
+                  $gni_arg46 hostlen=0;
+                  $gni_arg46 servlen=0;
+                  $gni_arg7 flags=0;
+                  int res = getnameinfo(0, salen, 0, hostlen, 0, servlen, flags);
+                ])
+              ],[
+                 curl_cv_func_getnameinfo_args="$gni_arg1,$gni_arg2,$gni_arg46,$gni_arg7"
+                 break 4
+              ])
+            done
+          done
+        done
+      done
+    ]) # AC_CACHE_CHECK
+    if test "$curl_cv_func_getnameinfo_args" = "unknown"; then
+      AC_MSG_WARN([Cannot find proper types to use for getnameinfo args])
+      AC_MSG_WARN([HAVE_GETNAMEINFO will not be defined])
+    else
+      gni_prev_IFS=$IFS; IFS=','
+      set dummy `echo "$curl_cv_func_getnameinfo_args" | sed 's/\*/\*/g'`
+      IFS=$gni_prev_IFS
+      shift
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG1, $[1],
+        [Define to the type of arg 1 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG2, $[2],
+        [Define to the type of arg 2 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG46, $[3],
+        [Define to the type of args 4 and 6 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, $[4],
+        [Define to the type of arg 7 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(HAVE_GETNAMEINFO, 1,
+        [Define to 1 if you have the getnameinfo function.])
+      ac_cv_func_getnameinfo="yes"
+    fi
+  fi
+]) # AC_DEFUN
+
+
+dnl CURL_CHECK_NONBLOCKING_SOCKET
+dnl -------------------------------------------------
+dnl Check for how to set a socket to non-blocking state. There seems to exist
+dnl four known different ways, with the one used almost everywhere being POSIX
+dnl and XPG3, while the other different ways for different systems (old BSD,
+dnl Windows and Amiga).
+dnl
+dnl There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
+dnl O_NONBLOCK define is found but does not work. This condition is attempted
+dnl to get caught in this script by using an excessive number of #ifdefs...
+dnl
+AC_DEFUN([CURL_CHECK_NONBLOCKING_SOCKET],
+[
+  AC_MSG_CHECKING([non-blocking sockets style])
+
+  AC_TRY_COMPILE([
+/* headers for O_NONBLOCK test */
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+],[
+/* try to compile O_NONBLOCK */
+
+#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# if defined(__SVR4) || defined(__srv4__)
+#  define PLATFORM_SOLARIS
+# else
+#  define PLATFORM_SUNOS4
+# endif
+#endif
+#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX4)
+# define PLATFORM_AIX_V3
+#endif
+
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
+#error "O_NONBLOCK does not work on this platform"
+#endif
+  int socket;
+  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
+],[
+dnl the O_NONBLOCK test was fine
+nonblock="O_NONBLOCK"
+AC_DEFINE(HAVE_O_NONBLOCK, 1, [use O_NONBLOCK for non-blocking sockets])
+],[
+dnl the code was bad, try a different program now, test 2
+
+  AC_TRY_COMPILE([
+/* headers for FIONBIO test */
+#include <unistd.h>
+#include <stropts.h>
+],[
+/* FIONBIO source test (old-style unix) */
+ int socket;
+ int flags = ioctl(socket, FIONBIO, &flags);
+],[
+dnl FIONBIO test was good
+nonblock="FIONBIO"
+AC_DEFINE(HAVE_FIONBIO, 1, [use FIONBIO for non-blocking sockets])
+],[
+dnl FIONBIO test was also bad
+dnl the code was bad, try a different program now, test 3
+
+  AC_TRY_COMPILE([
+/* headers for ioctlsocket test (Windows) */
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#endif
+],[
+/* ioctlsocket source code */
+ SOCKET sd;
+ unsigned long flags = 0;
+ sd = socket(0, 0, 0);
+ ioctlsocket(sd, FIONBIO, &flags);
+],[
+dnl ioctlsocket test was good
+nonblock="ioctlsocket"
+AC_DEFINE(HAVE_IOCTLSOCKET, 1, [use ioctlsocket() for non-blocking sockets])
+],[
+dnl ioctlsocket didnt compile!, go to test 4
+
+  AC_TRY_LINK([
+/* headers for IoctlSocket test (Amiga?) */
+#include <sys/ioctl.h>
+],[
+/* IoctlSocket source code */
+ int socket;
+ int flags = IoctlSocket(socket, FIONBIO, (long)1);
+],[
+dnl ioctlsocket test was good
+nonblock="IoctlSocket"
+AC_DEFINE(HAVE_IOCTLSOCKET_CASE, 1, [use Ioctlsocket() for non-blocking sockets])
+],[
+dnl Ioctlsocket didnt compile, do test 5!
+  AC_TRY_COMPILE([
+/* headers for SO_NONBLOCK test (BeOS) */
+#include <socket.h>
+],[
+/* SO_NONBLOCK source code */
+ long b = 1;
+ int socket;
+ int flags = setsockopt(socket, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
+],[
+dnl the SO_NONBLOCK test was good
+nonblock="SO_NONBLOCK"
+AC_DEFINE(HAVE_SO_NONBLOCK, 1, [use SO_NONBLOCK for non-blocking sockets])
+],[
+dnl test 5 didnt compile!
+nonblock="nada"
+AC_DEFINE(HAVE_DISABLED_NONBLOCKING, 1, [disabled non-blocking sockets])
+])
+dnl end of fifth test
+
+])
+dnl end of forth test
+
+])
+dnl end of third test
+
+])
+dnl end of second test
+
+])
+dnl end of non-blocking try-compile test
+  AC_MSG_RESULT($nonblock)
+
+  if test "$nonblock" = "nada"; then
+    AC_MSG_WARN([non-block sockets disabled])
+  fi
+])
+
+
+dnl TYPE_SOCKADDR_STORAGE
+dnl -------------------------------------------------
+dnl Check for struct sockaddr_storage. Most IPv6-enabled hosts have it, but
+dnl AIX 4.3 is one known exception.
+AC_DEFUN([TYPE_SOCKADDR_STORAGE],
+[
+   AC_CHECK_TYPE([struct sockaddr_storage],
+        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
+                  [if struct sockaddr_storage is defined]), ,
+   [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
+   ])
+])
+
+
+dnl TYPE_IN_ADDR_T
+dnl -------------------------------------------------
+dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
+dnl and a few other things.
+AC_DEFUN([TYPE_IN_ADDR_T],
+[
+   AC_CHECK_TYPE([in_addr_t], ,[
+      AC_MSG_CHECKING([for in_addr_t equivalent])
+      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
+      [
+         curl_cv_in_addr_t_equiv=
+         for t in "unsigned long" int size_t unsigned long; do
+            AC_TRY_COMPILE([
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
+            ],[
+               $t data = inet_addr ("1.2.3.4");
+            ],[
+               curl_cv_in_addr_t_equiv="$t"
+               break
+            ])
+         done
+
+         if test "x$curl_cv_in_addr_t_equiv" = x; then
+            AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
+         fi
+      ])
+      AC_MSG_RESULT($curl_cv_in_addr_t_equiv)
+      AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
+			[type to use in place of in_addr_t if not defined])],
+      [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#endif
+  ]) dnl AC_CHECK_TYPE
+]) dnl AC_DEFUN
+
+
 dnl We create a function for detecting which compiler we use and then set as
 dnl pendantic compiler options as possible for that particular compiler. The
 dnl options are only used for debug-builds.
@@ -99,3 +732,133 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],

 ]) dnl end of AC_DEFUN()

+
+dnl This macro determines if the specified struct exists in the specified file
+dnl Syntax:
+dnl CARES_CHECK_STRUCT(headers, struct name, if found, [if not found])
+
+AC_DEFUN([CARES_CHECK_STRUCT], [
+  AC_MSG_CHECKING([for struct $2])
+  AC_TRY_COMPILE([$1], 
+    [
+      struct $2 struct_instance;
+    ], ac_struct="yes", ac_found="no")
+  if test "$ac_struct" = "yes" ; then
+    AC_MSG_RESULT(yes)
+    $3
+  else
+    AC_MSG_RESULT(no)
+    $4
+  fi
+])
+
+dnl This macro determines if the specified constant exists in the specified file
+dnl Syntax:
+dnl CARES_CHECK_CONSTANT(headers, constant name, if found, [if not found])
+
+AC_DEFUN([CARES_CHECK_CONSTANT], [
+  AC_MSG_CHECKING([for $2])
+  AC_EGREP_CPP(VARIABLEWASDEFINED,
+   [
+      $1
+
+      #ifdef $2
+        VARIABLEWASDEFINED
+      #else
+        NJET
+      #endif
+    ], ac_constant="yes", ac_constant="no"
+  )
+  if test "$ac_constant" = "yes" ; then
+    AC_MSG_RESULT(yes)
+    $3
+  else
+    AC_MSG_RESULT(no)
+    $4
+  fi
+])
+
+
+dnl This macro determines how many parameters getservbyport_r takes
+AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [
+  AC_MSG_CHECKING([how many arguments getservbyport_r takes])
+  AC_TRY_LINK(
+    [#include <netdb.h>],
+    [
+      int p1, p5;
+      char *p2, p4[4096];
+      struct servent *p3, *p6;
+      getservbyport_r(p1, p2, p3, p4, p5, &p6);
+    ], ac_func_getservbyport_r=6,
+    [AC_TRY_LINK(
+      [#include <netdb.h>],
+      [
+        int p1, p5;
+        char *p2, p4[4096];
+        struct servent *p3;
+        getservbyport_r(p1, p2, p3, p4, p5);
+      ], ac_func_getservbyport_r=5,
+      [AC_TRY_LINK(
+        [#include <netdb.h>],
+        [
+          int p1;
+          char *p2;
+          struct servent *p3;
+          struct servent_data p4;
+          getservbyport_r(p1, p2, p3, &p4);
+        ], ac_func_getservbyport_r=4, ac_func_getservbyport_r=0
+      )]
+    )]
+  )
+if test $ac_func_getservbyport_r != "0" ; then
+  AC_MSG_RESULT($ac_func_getservbyport_r)
+  AC_DEFINE(HAVE_GETSERVBYPORT_R, 1, [Specifies whether getservbyport_r is present])
+  AC_DEFINE_UNQUOTED(GETSERVBYPORT_R_ARGS, $ac_func_getservbyport_r, [Specifies the number of arguments to 
+getservbyport_r])
+  if test $ac_func_getservbyport_r = "4" ; then
+   AC_DEFINE(GETSERVBYPORT_R_BUFSIZE, sizeof(struct servent_data), [Specifies the size of the buffer to pass to 
+getservbyport_r])
+  else
+   AC_DEFINE(GETSERVBYPORT_R_BUFSIZE, 4096, [Specifies the size of the buffer to pass to getservbyport_r])
+  fi
+else
+  AC_MSG_RESULT([not found])
+fi
+])
+
+# Prevent libtool for checking how to run C++ compiler and check for other
+# tools we don't want to use. We do this by m4-defining the _LT_AC_TAGCONFIG
+# variable to the code to run, as by default it uses a much more complicated
+# approach. The code below that is actually added seems to be used for cases
+# where configure has trouble figuring out what C compiler to use but where
+# the installed libtool has an idea.
+#
+# This function is a re-implemented version of the Paolo Bonzini fix posted to
+# the c-ares mailing list by Bram Matthys on May 6 2006. My version removes
+# redundant code but also adds the LTCFLAGS check that wasn't in that patch.
+#
+# Some code in this function was extracted from the generated configure script.
+#
+# CARES_CLEAR_LIBTOOL_TAGS
+AC_DEFUN([CARES_CLEAR_LIBTOOL_TAGS],
+  [m4_define([_LT_AC_TAGCONFIG], [
+  if test -f "$ltmain"; then
+    if test ! -f "${ofile}"; then
+      AC_MSG_WARN([output file `$ofile' does not exist])
+    fi
+
+    if test -z "$LTCC"; then
+      eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+      if test -z "$LTCC"; then
+        AC_MSG_WARN([output file `$ofile' does not look like a libtool
+script])
+      else
+        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+      fi
+    fi
+    if test -z "$LTCFLAGS"; then
+      eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+    fi
+  fi
+  ])]
+)
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

 #ifdef WIN32
@@ -26,17 +27,26 @@
 #include <unistd.h>
 #include <netdb.h>
 #endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+
 #include "ares.h"
 #include "ares_dns.h"
+#include "inet_ntop.h"
+
+#ifdef WATT32
+#undef WIN32  /* Redefined in MingW headers */
+#endif

 #ifndef INADDR_NONE
-#define	INADDR_NONE 0xffffffff
+#define INADDR_NONE 0xffffffff
 #endif

 /* Mac OS X portability check */
@@ -44,8 +54,10 @@
 #define T_SRV 33 /* server selection */
 #endif

+#ifndef optind
 extern int optind;
 extern char *optarg;
+#endif

 struct nv {
  const char *name;
@@ -53,58 +65,58 @@ struct nv {
 };

 static const struct nv flags[] = {
-  { "usevc",		ARES_FLAG_USEVC },
-  { "primary",		ARES_FLAG_PRIMARY },
-  { "igntc",		ARES_FLAG_IGNTC },
-  { "norecurse",	ARES_FLAG_NORECURSE },
-  { "stayopen",		ARES_FLAG_STAYOPEN },
-  { "noaliases",	ARES_FLAG_NOALIASES }
+  { "usevc",            ARES_FLAG_USEVC },
+  { "primary",          ARES_FLAG_PRIMARY },
+  { "igntc",            ARES_FLAG_IGNTC },
+  { "norecurse",        ARES_FLAG_NORECURSE },
+  { "stayopen",         ARES_FLAG_STAYOPEN },
+  { "noaliases",        ARES_FLAG_NOALIASES }
 };
 static const int nflags = sizeof(flags) / sizeof(flags[0]);

 static const struct nv classes[] = {
-  { "IN",	C_IN },
-  { "CHAOS",	C_CHAOS },
-  { "HS",	C_HS },
-  { "ANY",	C_ANY }
+  { "IN",       C_IN },
+  { "CHAOS",    C_CHAOS },
+  { "HS",       C_HS },
+  { "ANY",      C_ANY }
 };
 static const int nclasses = sizeof(classes) / sizeof(classes[0]);

 static const struct nv types[] = {
-  { "A",	T_A },
-  { "NS",	T_NS },
-  { "MD",	T_MD },
-  { "MF",	T_MF },
-  { "CNAME",	T_CNAME },
-  { "SOA",	T_SOA },
-  { "MB",	T_MB },
-  { "MG",	T_MG },
-  { "MR",	T_MR },
-  { "NULL",	T_NULL },
-  { "WKS",	T_WKS },
-  { "PTR",	T_PTR },
-  { "HINFO",	T_HINFO },
-  { "MINFO",	T_MINFO },
-  { "MX",	T_MX },
-  { "TXT",	T_TXT },
-  { "RP",	T_RP },
-  { "AFSDB",	T_AFSDB },
-  { "X25",	T_X25 },
-  { "ISDN",	T_ISDN },
-  { "RT",	T_RT },
-  { "NSAP",	T_NSAP },
-  { "NSAP_PTR",	T_NSAP_PTR },
-  { "SIG",	T_SIG },
-  { "KEY",	T_KEY },
-  { "PX",	T_PX },
-  { "GPOS",	T_GPOS },
-  { "AAAA",	T_AAAA },
-  { "LOC",	T_LOC },
-  { "SRV",	T_SRV },
-  { "AXFR",	T_AXFR },
-  { "MAILB",	T_MAILB },
-  { "MAILA",	T_MAILA },
-  { "ANY",	T_ANY }
+  { "A",        T_A },
+  { "NS",       T_NS },
+  { "MD",       T_MD },
+  { "MF",       T_MF },
+  { "CNAME",    T_CNAME },
+  { "SOA",      T_SOA },
+  { "MB",       T_MB },
+  { "MG",       T_MG },
+  { "MR",       T_MR },
+  { "NULL",     T_NULL },
+  { "WKS",      T_WKS },
+  { "PTR",      T_PTR },
+  { "HINFO",    T_HINFO },
+  { "MINFO",    T_MINFO },
+  { "MX",       T_MX },
+  { "TXT",      T_TXT },
+  { "RP",       T_RP },
+  { "AFSDB",    T_AFSDB },
+  { "X25",      T_X25 },
+  { "ISDN",     T_ISDN },
+  { "RT",       T_RT },
+  { "NSAP",     T_NSAP },
+  { "NSAP_PTR", T_NSAP_PTR },
+  { "SIG",      T_SIG },
+  { "KEY",      T_KEY },
+  { "PX",       T_PX },
+  { "GPOS",     T_GPOS },
+  { "AAAA",     T_AAAA },
+  { "LOC",      T_LOC },
+  { "SRV",      T_SRV },
+  { "AXFR",     T_AXFR },
+  { "MAILB",    T_MAILB },
+  { "MAILA",    T_MAILA },
+  { "ANY",      T_ANY }
 };
 static const int ntypes = sizeof(types) / sizeof(types[0]);

@@ -123,10 +135,10 @@ static const char *rcodes[] = {

 static void callback(void *arg, int status, unsigned char *abuf, int alen);
 static const unsigned char *display_question(const unsigned char *aptr,
-					     const unsigned char *abuf,
-					     int alen);
+                                             const unsigned char *abuf,
+                                             int alen);
 static const unsigned char *display_rr(const unsigned char *aptr,
-				       const unsigned char *abuf, int alen);
+                                       const unsigned char *abuf, int alen);
 static const char *type_name(int type);
 static const char *class_name(int dnsclass);
 static void usage(void);
@@ -145,7 +157,7 @@ int main(int argc, char **argv)
  WORD wVersionRequested = MAKEWORD(1,1);
  WSADATA wsaData;
  WSAStartup(wVersionRequested, &wsaData);
-#endif  
+#endif

  options.flags = ARES_FLAG_NOCHECKRESP;
  options.servers = NULL;
@@ -153,80 +165,80 @@ int main(int argc, char **argv)
  while ((c = getopt(argc, argv, "f:s:c:t:T:U:")) != -1)
    {
      switch (c)
-	{
-	case 'f':
-	  /* Add a flag. */
-	  for (i = 0; i < nflags; i++)
-	    {
-	      if (strcmp(flags[i].name, optarg) == 0)
-		break;
-	    }
-	  if (i == nflags)
-	    usage();
-	  options.flags |= flags[i].value;
-	  break;
+        {
+        case 'f':
+          /* Add a flag. */
+          for (i = 0; i < nflags; i++)
+            {
+              if (strcmp(flags[i].name, optarg) == 0)
+                break;
+            }
+          if (i == nflags)
+            usage();
+          options.flags |= flags[i].value;
+          break;

-	case 's':
-	  /* Add a server, and specify servers in the option mask. */
-	  hostent = gethostbyname(optarg);
-	  if (!hostent || hostent->h_addrtype != AF_INET)
-	    {
-	      fprintf(stderr, "adig: server %s not found.\n", optarg);
-	      return 1;
-	    }
-	  options.servers = realloc(options.servers, (options.nservers + 1)
-				    * sizeof(struct in_addr));
-	  if (!options.servers)
-	    {
-	      fprintf(stderr, "Out of memory!\n");
-	      return 1;
-	    }
-	  memcpy(&options.servers[options.nservers], hostent->h_addr,
-		 sizeof(struct in_addr));
-	  options.nservers++;
-	  optmask |= ARES_OPT_SERVERS;
-	  break;
+        case 's':
+          /* Add a server, and specify servers in the option mask. */
+          hostent = gethostbyname(optarg);
+          if (!hostent || hostent->h_addrtype != AF_INET)
+            {
+              fprintf(stderr, "adig: server %s not found.\n", optarg);
+              return 1;
+            }
+          options.servers = realloc(options.servers, (options.nservers + 1)
+                                    * sizeof(struct in_addr));
+          if (!options.servers)
+            {
+              fprintf(stderr, "Out of memory!\n");
+              return 1;
+            }
+          memcpy(&options.servers[options.nservers], hostent->h_addr,
+                 sizeof(struct in_addr));
+          options.nservers++;
+          optmask |= ARES_OPT_SERVERS;
+          break;

-	case 'c':
-	  /* Set the query class. */
-	  for (i = 0; i < nclasses; i++)
-	    {
-	      if (strcasecmp(classes[i].name, optarg) == 0)
-		break;
-	    }
-	  if (i == nclasses)
-	    usage();
-	  dnsclass = classes[i].value;
-	  break;
+        case 'c':
+          /* Set the query class. */
+          for (i = 0; i < nclasses; i++)
+            {
+              if (strcasecmp(classes[i].name, optarg) == 0)
+                break;
+            }
+          if (i == nclasses)
+            usage();
+          dnsclass = classes[i].value;
+          break;

-	case 't':
-	  /* Set the query type. */
-	  for (i = 0; i < ntypes; i++)
-	    {
-	      if (strcasecmp(types[i].name, optarg) == 0)
-		break;
-	    }
-	  if (i == ntypes)
-	    usage();
-	  type = types[i].value;
-	  break;
+        case 't':
+          /* Set the query type. */
+          for (i = 0; i < ntypes; i++)
+            {
+              if (strcasecmp(types[i].name, optarg) == 0)
+                break;
+            }
+          if (i == ntypes)
+            usage();
+          type = types[i].value;
+          break;

-	case 'T':
-	  /* Set the TCP port number. */
-	  if (!isdigit((unsigned char)*optarg))
-	    usage();
-	  options.tcp_port = strtol(optarg, NULL, 0);
-	  optmask |= ARES_OPT_TCP_PORT;
-	  break;
+        case 'T':
+          /* Set the TCP port number. */
+          if (!isdigit((unsigned char)*optarg))
+            usage();
+          options.tcp_port = (unsigned short)strtol(optarg, NULL, 0);
+          optmask |= ARES_OPT_TCP_PORT;
+          break;

-	case 'U':
-	  /* Set the UDP port number. */
-	  if (!isdigit((unsigned char)*optarg))
-	    usage();
-	  options.udp_port = strtol(optarg, NULL, 0);
-	  optmask |= ARES_OPT_UDP_PORT;
-	  break;
-	}
+        case 'U':
+          /* Set the UDP port number. */
+          if (!isdigit((unsigned char)*optarg))
+            usage();
+          options.udp_port = (unsigned short)strtol(optarg, NULL, 0);
+          optmask |= ARES_OPT_UDP_PORT;
+          break;
+        }
    }
  argc -= optind;
  argv += optind;
@@ -238,7 +250,7 @@ int main(int argc, char **argv)
  if (status != ARES_SUCCESS)
    {
      fprintf(stderr, "ares_init_options: %s\n",
-	      ares_strerror(status));
+              ares_strerror(status));
      return 1;
    }

@@ -252,7 +264,7 @@ int main(int argc, char **argv)
  else
    {
      for (; *argv; argv++)
-	ares_query(channel, *argv, dnsclass, type, callback, *argv);
+        ares_query(channel, *argv, dnsclass, type, callback, *argv);
    }

  /* Wait for all queries to complete. */
@@ -262,14 +274,14 @@ int main(int argc, char **argv)
      FD_ZERO(&write_fds);
      nfds = ares_fds(channel, &read_fds, &write_fds);
      if (nfds == 0)
-	break;
+        break;
      tvp = ares_timeout(channel, NULL, &tv);
      count = select(nfds, &read_fds, &write_fds, NULL, tvp);
      if (count < 0 && errno != EINVAL)
-	{
-	  perror("select");
-	  return 1;
-	}
+        {
+          perror("select");
+          return 1;
+        }
      ares_process(channel, &read_fds, &write_fds);
    }

@@ -295,7 +307,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
    {
      printf("%s\n", ares_strerror(status));
      if (!abuf)
-	return;
+        return;
    }

  /* Won't happen, but check anyway, for safety. */
@@ -319,11 +331,11 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
  /* Display the answer header. */
  printf("id: %d\n", id);
  printf("flags: %s%s%s%s%s\n",
-	 qr ? "qr " : "",
-	 aa ? "aa " : "",
-	 tc ? "tc " : "",
-	 rd ? "rd " : "",
-	 ra ? "ra " : "");
+         qr ? "qr " : "",
+         aa ? "aa " : "",
+         tc ? "tc " : "",
+         rd ? "rd " : "",
+         ra ? "ra " : "");
  printf("opcode: %s\n", opcodes[opcode]);
  printf("rcode: %s\n", rcodes[rcode]);

@@ -334,7 +346,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
    {
      aptr = display_question(aptr, abuf, alen);
      if (aptr == NULL)
-	return;
+        return;
    }

  /* Display the answers. */
@@ -343,7 +355,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
    {
      aptr = display_rr(aptr, abuf, alen);
      if (aptr == NULL)
-	return;
+        return;
    }

  /* Display the NS records. */
@@ -352,7 +364,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
    {
      aptr = display_rr(aptr, abuf, alen);
      if (aptr == NULL)
-	return;
+        return;
    }

  /* Display the additional records. */
@@ -361,13 +373,13 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
    {
      aptr = display_rr(aptr, abuf, alen);
      if (aptr == NULL)
-	return;
+        return;
    }
 }

 static const unsigned char *display_question(const unsigned char *aptr,
-					     const unsigned char *abuf,
-					     int alen)
+                                             const unsigned char *abuf,
+                                             int alen)
 {
  char *name;
  int type, dnsclass, status;
@@ -405,13 +417,13 @@ static const unsigned char *display_question(const unsigned char *aptr,
 }

 static const unsigned char *display_rr(const unsigned char *aptr,
-				       const unsigned char *abuf, int alen)
+                                       const unsigned char *abuf, int alen)
 {
  const unsigned char *p;
  char *name;
  int type, dnsclass, ttl, dlen, status;
  long len;
-  struct in_addr addr;
+  char addr[46];

  /* Parse the RR name. */
  status = ares_expand_name(aptr, abuf, alen, &name, &len);
@@ -462,7 +474,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      /* For these types, the RR data is just a domain name. */
      status = ares_expand_name(aptr, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
      printf("\t%s.", name);
      free(name);
      break;
@@ -472,13 +484,13 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      p = aptr;
      len = *p;
      if (p + len + 1 > aptr + dlen)
-	return NULL;
-      printf("\t%.*s", len, p + 1);
+        return NULL;
+      printf("\t%.*s", (int)len, p + 1);
      p += len + 1;
      len = *p;
      if (p + len + 1 > aptr + dlen)
-	return NULL;
-      printf("\t%.*s", len, p + 1);
+        return NULL;
+      printf("\t%.*s", (int)len, p + 1);
      break;

    case T_MINFO:
@@ -486,13 +498,13 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      p = aptr;
      status = ares_expand_name(p, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
      printf("\t%s.", name);
      free(name);
      p += len;
      status = ares_expand_name(p, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
      printf("\t%s.", name);
      free(name);
      break;
@@ -502,11 +514,11 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       * then a domain name.
       */
      if (dlen < 2)
-	return NULL;
-      printf("\t%d", (aptr[0] << 8) | aptr[1]);
+        return NULL;
+      printf("\t%d", DNS__16BIT(aptr));
      status = ares_expand_name(aptr + 2, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
      printf("\t%s.", name);
      free(name);
      break;
@@ -518,24 +530,21 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      p = aptr;
      status = ares_expand_name(p, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
      printf("\t%s.\n", name);
      free(name);
      p += len;
      status = ares_expand_name(p, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
      printf("\t\t\t\t\t\t%s.\n", name);
      free(name);
      p += len;
      if (p + 20 > aptr + dlen)
-	return NULL;
-      printf("\t\t\t\t\t\t( %d %d %d %d %d )",
-	     (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3],
-	     (p[4] << 24) | (p[5] << 16) | (p[6] << 8) | p[7],
-	     (p[8] << 24) | (p[9] << 16) | (p[10] << 8) | p[11],
-	     (p[12] << 24) | (p[13] << 16) | (p[14] << 8) | p[15],
-	     (p[16] << 24) | (p[17] << 16) | (p[18] << 8) | p[19]);
+        return NULL;
+      printf("\t\t\t\t\t\t( %lu %lu %lu %lu %lu )",
+             DNS__32BIT(p), DNS__32BIT(p+4), DNS__32BIT(p+8),
+             DNS__32BIT(p+12), DNS__32BIT(p+16));
      break;

    case T_TXT:
@@ -543,21 +552,27 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       * strings. */
      p = aptr;
      while (p < aptr + dlen)
-	{
-	  len = *p;
-	  if (p + len + 1 > aptr + dlen)
-	    return NULL;
-	  printf("\t%.*s", len, p + 1);
-	  p += len + 1;
-	}
+        {
+          len = *p;
+          if (p + len + 1 > aptr + dlen)
+            return NULL;
+          printf("\t%.*s", (int)len, p + 1);
+          p += len + 1;
+        }
      break;

    case T_A:
      /* The RR data is a four-byte Internet address. */
      if (dlen != 4)
-	return NULL;
-      memcpy(&addr, aptr, sizeof(struct in_addr));
-      printf("\t%s", inet_ntoa(addr));
+        return NULL;
+      printf("\t%s", ares_inet_ntop(AF_INET,aptr,addr,sizeof(addr)));
+      break;
+
+    case T_AAAA:
+      /* The RR data is a 16-byte IPv6 address. */
+      if (dlen != 16)
+        return NULL;
+      printf("\t%s", ares_inet_ntop(AF_INET6,aptr,addr,sizeof(addr)));
      break;

    case T_WKS:
@@ -568,20 +583,21 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      /* The RR data is three two-byte numbers representing the
       * priority, weight, and port, followed by a domain name.
       */
-      
+
      printf("\t%d", DNS__16BIT(aptr));
      printf(" %d", DNS__16BIT(aptr + 2));
      printf(" %d", DNS__16BIT(aptr + 4));
-      
+
      status = ares_expand_name(aptr + 6, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.", name);
      free(name);
      break;
-      
+
    default:
      printf("\t[Unknown RR; cannot parse]");
+      break;
    }
  printf("\n");

@@ -595,7 +611,7 @@ static const char *type_name(int type)
  for (i = 0; i < ntypes; i++)
    {
      if (types[i].value == type)
-	return types[i].name;
+        return types[i].name;
    }
  return "(unknown)";
 }
@@ -607,7 +623,7 @@ static const char *class_name(int dnsclass)
  for (i = 0; i < nclasses; i++)
    {
      if (classes[i].value == dnsclass)
-	return classes[i].name;
+        return classes[i].name;
    }
  return "(unknown)";
 }
@@ -615,6 +631,6 @@ static const char *class_name(int dnsclass)
 static void usage(void)
 {
  fprintf(stderr, "usage: adig [-f flag] [-s server] [-c class] "
-	  "[-t type] [-p port] name ...\n");
+          "[-t type] [-p port] name ...\n");
  exit(1);
 }
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

 #ifdef WIN32
@@ -28,11 +29,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "ares.h"
 #include "ares_dns.h"
+#include "inet_ntop.h"
+#include "inet_net_pton.h"

 #ifndef INADDR_NONE
-#define	INADDR_NONE 0xffffffff
+#define INADDR_NONE 0xffffffff
+#endif
+
+#ifndef HAVE_STRUCT_IN6_ADDR
+struct in6_addr
+{
+  unsigned char s6_addr[16];
+};
 #endif

 static void callback(void *arg, int status, struct hostent *host);
@@ -44,13 +55,14 @@ int main(int argc, char **argv)
  int status, nfds;
  fd_set read_fds, write_fds;
  struct timeval *tvp, tv;
-  struct in_addr addr;
+  struct in_addr addr4;
+  struct in6_addr addr6;

 #ifdef WIN32
  WORD wVersionRequested = MAKEWORD(1,1);
  WSADATA wsaData;
  WSAStartup(wVersionRequested, &wsaData);
-#endif  
+#endif

  if (argc <= 1)
    usage();
@@ -65,14 +77,21 @@ int main(int argc, char **argv)
  /* Initiate the queries, one per command-line argument. */
  for (argv++; *argv; argv++)
    {
-      addr.s_addr = inet_addr(*argv);
-      if (addr.s_addr == INADDR_NONE)
-	ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
+      if (ares_inet_pton(AF_INET, *argv, &addr4) == 1)
+        {
+          ares_gethostbyaddr(channel, &addr4, sizeof(addr4), AF_INET, callback,
+                             *argv);
+        }
+      else if (ares_inet_pton(AF_INET6, *argv, &addr6) == 1)
+        {
+          ares_gethostbyaddr(channel, &addr6, sizeof(addr6), AF_INET6, callback,
+                             *argv);
+        }
      else
-	{
-	  ares_gethostbyaddr(channel, &addr, sizeof(addr), AF_INET, callback,
-			     *argv);
-	}
+        {
+          /* assume user wants A-records */
+          ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
+        }
    }

  /* Wait for all queries to complete. */
@@ -82,7 +101,7 @@ int main(int argc, char **argv)
      FD_ZERO(&write_fds);
      nfds = ares_fds(channel, &read_fds, &write_fds);
      if (nfds == 0)
-	break;
+        break;
      tvp = ares_timeout(channel, NULL, &tv);
      select(nfds, &read_fds, &write_fds, NULL, tvp);
      ares_process(channel, &read_fds, &write_fds);
@@ -94,7 +113,6 @@ int main(int argc, char **argv)

 static void callback(void *arg, int status, struct hostent *host)
 {
-  struct in_addr addr;
  char **p;

  if (status != ARES_SUCCESS)
@@ -105,8 +123,21 @@ static void callback(void *arg, int status, struct hostent *host)

  for (p = host->h_addr_list; *p; p++)
    {
-      memcpy(&addr, *p, sizeof(struct in_addr));
-      printf("%-32s\t%s\n", host->h_name, inet_ntoa(addr));
+      char addr_buf[46] = "??";
+
+      ares_inet_ntop(host->h_addrtype, *p, addr_buf, sizeof(addr_buf));
+      printf("%-32s\t%s", host->h_name, addr_buf);
+#if 0
+      if (host->h_aliases[0])
+        {
+           int i;
+
+	   printf (", Aliases: ");
+	   for (i = 0; host->h_aliases[i]; i++)
+               printf("%s ", host->h_aliases[i]);
+        }
+#endif
+      puts("");
    }
 }

--- a/ares/ares.h
+++ b/ares/ares.h
@@ -20,63 +20,133 @@

 #include <sys/types.h>

-#ifdef _AIX
+#if defined(_AIX) || defined(NETWARE)
 /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
   libc5-based Linux systems. Only include it on system that are known to
   require it! */
 #include <sys/select.h>
 #endif

-#ifdef WIN32
-#include <winsock.h>
-#include <windows.h>
+#if defined(WATT32)
+  #include <netinet/in.h>
+  #include <sys/socket.h>
+  #include <tcp.h>
+#elif defined(WIN32)
+  #include <winsock2.h>
+  #include <windows.h>
 #else
-#include <netinet/in.h>
+  #include <netinet/in.h>
+  #include <sys/socket.h>
 #endif

-#define ARES_SUCCESS		0
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define ARES_SUCCESS            0

 /* Server error codes (ARES_ENODATA indicates no relevant answer) */
-#define ARES_ENODATA		1
-#define ARES_EFORMERR		2
-#define ARES_ESERVFAIL		3
-#define ARES_ENOTFOUND		4
-#define ARES_ENOTIMP		5
-#define ARES_EREFUSED		6
+#define ARES_ENODATA            1
+#define ARES_EFORMERR           2
+#define ARES_ESERVFAIL          3
+#define ARES_ENOTFOUND          4
+#define ARES_ENOTIMP            5
+#define ARES_EREFUSED           6

 /* Locally generated error codes */
-#define ARES_EBADQUERY		7
-#define ARES_EBADNAME		8
-#define ARES_EBADFAMILY		9
-#define ARES_EBADRESP		10
-#define ARES_ECONNREFUSED	11
-#define ARES_ETIMEOUT		12
-#define ARES_EOF		13
-#define ARES_EFILE		14
-#define ARES_ENOMEM		15
-#define ARES_EDESTRUCTION	16
-#define ARES_EBADSTR		17
+#define ARES_EBADQUERY          7
+#define ARES_EBADNAME           8
+#define ARES_EBADFAMILY         9
+#define ARES_EBADRESP           10
+#define ARES_ECONNREFUSED       11
+#define ARES_ETIMEOUT           12
+#define ARES_EOF                13
+#define ARES_EFILE              14
+#define ARES_ENOMEM             15
+#define ARES_EDESTRUCTION       16
+#define ARES_EBADSTR            17
+
+/* ares_getnameinfo error codes */
+#define ARES_EBADFLAGS          18
+
+/* ares_getaddrinfo error codes */
+#define ARES_ENONAME            19
+#define ARES_EBADHINTS          20

 /* Flag values */
-#define ARES_FLAG_USEVC		(1 << 0)
-#define ARES_FLAG_PRIMARY	(1 << 1)
-#define ARES_FLAG_IGNTC		(1 << 2)
-#define ARES_FLAG_NORECURSE	(1 << 3)
-#define ARES_FLAG_STAYOPEN	(1 << 4)
-#define ARES_FLAG_NOSEARCH	(1 << 5)
-#define ARES_FLAG_NOALIASES	(1 << 6)
-#define ARES_FLAG_NOCHECKRESP	(1 << 7)
+#define ARES_FLAG_USEVC         (1 << 0)
+#define ARES_FLAG_PRIMARY       (1 << 1)
+#define ARES_FLAG_IGNTC         (1 << 2)
+#define ARES_FLAG_NORECURSE     (1 << 3)
+#define ARES_FLAG_STAYOPEN      (1 << 4)
+#define ARES_FLAG_NOSEARCH      (1 << 5)
+#define ARES_FLAG_NOALIASES     (1 << 6)
+#define ARES_FLAG_NOCHECKRESP   (1 << 7)

 /* Option mask values */
-#define ARES_OPT_FLAGS		(1 << 0)
-#define ARES_OPT_TIMEOUT	(1 << 1)
-#define ARES_OPT_TRIES		(1 << 2)
-#define ARES_OPT_NDOTS		(1 << 3)
-#define ARES_OPT_UDP_PORT	(1 << 4)
-#define ARES_OPT_TCP_PORT	(1 << 5)
-#define ARES_OPT_SERVERS	(1 << 6)
-#define ARES_OPT_DOMAINS	(1 << 7)
-#define ARES_OPT_LOOKUPS	(1 << 8)
+#define ARES_OPT_FLAGS          (1 << 0)
+#define ARES_OPT_TIMEOUT        (1 << 1)
+#define ARES_OPT_TRIES          (1 << 2)
+#define ARES_OPT_NDOTS          (1 << 3)
+#define ARES_OPT_UDP_PORT       (1 << 4)
+#define ARES_OPT_TCP_PORT       (1 << 5)
+#define ARES_OPT_SERVERS        (1 << 6)
+#define ARES_OPT_DOMAINS        (1 << 7)
+#define ARES_OPT_LOOKUPS        (1 << 8)
+#define ARES_OPT_SOCK_STATE_CB  (1 << 9)
+
+/* Nameinfo flag values */
+#define ARES_NI_NOFQDN                  (1 << 0)
+#define ARES_NI_NUMERICHOST             (1 << 1)
+#define ARES_NI_NAMEREQD                (1 << 2)
+#define ARES_NI_NUMERICSERV             (1 << 3)
+#define ARES_NI_DGRAM                   (1 << 4)
+#define ARES_NI_TCP                     0
+#define ARES_NI_UDP                     ARES_NI_DGRAM
+#define ARES_NI_SCTP                    (1 << 5)
+#define ARES_NI_DCCP                    (1 << 6)
+#define ARES_NI_NUMERICSCOPE            (1 << 7)
+#define ARES_NI_LOOKUPHOST              (1 << 8)
+#define ARES_NI_LOOKUPSERVICE           (1 << 9)
+/* Reserved for future use */
+#define ARES_NI_IDN                     (1 << 10)
+#define ARES_NI_IDN_ALLOW_UNASSIGNED    (1 << 11)
+#define ARES_NI_IDN_USE_STD3_ASCII_RULES (1 << 12)
+
+/* Addrinfo flag values */
+#define ARES_AI_CANONNAME               (1 << 0)
+#define ARES_AI_NUMERICHOST             (1 << 1)
+#define ARES_AI_PASSIVE                 (1 << 2)
+#define ARES_AI_NUMERICSERV             (1 << 3)
+#define ARES_AI_V4MAPPED                (1 << 4)
+#define ARES_AI_ALL                     (1 << 5)
+#define ARES_AI_ADDRCONFIG              (1 << 6)
+/* Reserved for future use */
+#define ARES_AI_IDN                     (1 << 10)
+#define ARES_AI_IDN_ALLOW_UNASSIGNED    (1 << 11)
+#define ARES_AI_IDN_USE_STD3_ASCII_RULES (1 << 12)
+#define ARES_AI_CANONIDN                (1 << 13)
+
+#define ARES_AI_MASK (ARES_AI_CANONNAME|ARES_AI_NUMERICHOST|ARES_AI_PASSIVE| \
+                      ARES_AI_NUMERICSERV|ARES_AI_V4MAPPED|ARES_AI_ALL| \
+                      ARES_AI_ADDRCONFIG)
+#define ARES_GETSOCK_MAXNUM 16 /* ares_getsock() can return info about this
+                                  many sockets */
+#define ARES_GETSOCK_READABLE(bits,num) (bits & (1<< (num)))
+#define ARES_GETSOCK_WRITABLE(bits,num) (bits & (1 << ((num) + \
+                                         ARES_GETSOCK_MAXNUM)))
+
+#ifdef WIN32
+typedef void (*ares_sock_state_cb)(void *data,
+                                   SOCKET socket,
+                                   int readable,
+                                   int writable);
+#else
+typedef void (*ares_sock_state_cb)(void *data,
+                                   int socket,
+                                   int readable,
+                                   int writable);
+#endif

 struct ares_options {
  int flags;
@@ -90,51 +160,65 @@ struct ares_options {
  char **domains;
  int ndomains;
  char *lookups;
+  ares_sock_state_cb sock_state_cb;
+  void *sock_state_cb_data;
 };

 struct hostent;
 struct timeval;
+struct sockaddr;
 struct ares_channeldata;
 typedef struct ares_channeldata *ares_channel;
 typedef void (*ares_callback)(void *arg, int status, unsigned char *abuf,
-			      int alen);
+                              int alen);
 typedef void (*ares_host_callback)(void *arg, int status,
-				   struct hostent *hostent);
+                                   struct hostent *hostent);
+typedef void (*ares_nameinfo_callback)(void *arg, int status,
+                                       char *node, char *service);

 int ares_init(ares_channel *channelptr);
 int ares_init_options(ares_channel *channelptr, struct ares_options *options,
-		      int optmask);
+                      int optmask);
 void ares_destroy(ares_channel channel);
 void ares_cancel(ares_channel channel);
 void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
-	       ares_callback callback, void *arg);
+               ares_callback callback, void *arg);
 void ares_query(ares_channel channel, const char *name, int dnsclass,
-		int type, ares_callback callback, void *arg);
+                int type, ares_callback callback, void *arg);
 void ares_search(ares_channel channel, const char *name, int dnsclass,
-		 int type, ares_callback callback, void *arg);
+                 int type, ares_callback callback, void *arg);
 void ares_gethostbyname(ares_channel channel, const char *name, int family,
-			ares_host_callback callback, void *arg);
+                        ares_host_callback callback, void *arg);
 void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
-			int family, ares_host_callback callback, void *arg);
-
+                        int family, ares_host_callback callback, void *arg);
+void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa,
+                      socklen_t salen, int flags,
+                      ares_nameinfo_callback callback,
+                      void *arg);
 int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
+int ares_getsock(ares_channel channel, int *socks, int numsocks);
 struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
-			     struct timeval *tv);
+                             struct timeval *tv);
 void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds);

 int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
-		 int rd, unsigned char **buf, int *buflen);
+                 int rd, unsigned char **buf, int *buflen);
 int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, char **s, long *enclen);
+                     int alen, char **s, long *enclen);
 int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, unsigned char **s, long *enclen);
+                     int alen, unsigned char **s, long *enclen);
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
-		       struct hostent **host);
+                       struct hostent **host);
+int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
+                       struct hostent **host);
 int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
-			 int addrlen, int family, struct hostent **host);
+                         int addrlen, int family, struct hostent **host);
 void ares_free_string(void *str);
 void ares_free_hostent(struct hostent *host);
 const char *ares_strerror(int code);
-void ares_free_errmem(char *mem);
+
+#ifdef  __cplusplus
+}
+#endif

 #endif /* ARES__H */
--- a/ares/ares__close_sockets.c
+++ b/ares/ares__close_sockets.c
@@ -13,15 +13,17 @@
 * without express or implied warranty.
 */

+#include "setup.h"
+
 #include <stdlib.h>
-#ifdef WIN32
-#else
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
 #include "ares.h"
 #include "ares_private.h"

-void ares__close_sockets(struct server_state *server)
+void ares__close_sockets(ares_channel channel, struct server_state *server)
 {
  struct send_request *sendreq;

@@ -42,14 +44,16 @@ void ares__close_sockets(struct server_state *server)
  server->tcp_lenbuf_pos = 0;

  /* Close the TCP and UDP sockets. */
-  if (server->tcp_socket != -1)
+  if (server->tcp_socket != ARES_SOCKET_BAD)
    {
+      SOCK_STATE_CALLBACK(channel, server->tcp_socket, 0, 0);
      closesocket(server->tcp_socket);
-      server->tcp_socket = -1;
+      server->tcp_socket = ARES_SOCKET_BAD;
    }
-  if (server->udp_socket != -1)
+  if (server->udp_socket != ARES_SOCKET_BAD)
    {
+      SOCK_STATE_CALLBACK(channel, server->udp_socket, 0, 0);
      closesocket(server->udp_socket);
-      server->udp_socket = -1;
+      server->udp_socket = ARES_SOCKET_BAD;
    }
 }
--- a/ares/ares__get_hostent.c
+++ b/ares/ares__get_hostent.c
@@ -13,11 +13,10 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -31,113 +30,130 @@

 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"

-int ares__get_hostent(FILE *fp, struct hostent **host)
+int ares__get_hostent(FILE *fp, int family, struct hostent **host)
 {
  char *line = NULL, *p, *q, *canonical, **alias;
  int status, linesize, end_at_hostname, naliases;
  struct in_addr addr;
+  struct in6_addr addr6;
+  int addrlen = sizeof(struct in_addr);
  struct hostent *hostent = NULL;

  while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
    {
      /* Skip comment lines; terminate line at comment character. */
      if (*line == '#' || !*line)
-	continue;
+        continue;
      p = strchr(line, '#');
      if (p)
-	*p = 0;
+        *p = 0;

      /* Get the address part. */
      p = line;
      while (*p && !isspace((unsigned char)*p))
-	p++;
+        p++;
      if (!*p)
-	continue;
+        continue;
      *p = 0;
      addr.s_addr = inet_addr(line);
      if (addr.s_addr == INADDR_NONE)
-	continue;
+       {
+          if (ares_inet_pton(AF_INET6, line, &addr6) > 0)
+            {
+              if (family != AF_INET6)
+                continue;
+              addrlen = sizeof(struct in6_addr);
+            }
+          else
+            continue;
+       }
+      else if (family != AF_INET)
+        continue;

      /* Get the canonical hostname. */
      p++;
      while (isspace((unsigned char)*p))
-	p++;
+        p++;
      if (!*p)
-	continue;
+        continue;
      q = p;
      while (*q && !isspace((unsigned char)*q))
-	q++;
+        q++;
      end_at_hostname = (*q == 0);
      *q = 0;
      canonical = p;

      naliases = 0;
      if (!end_at_hostname)
-	{
-	  /* Count the aliases. */
-	  p = q + 1;
-	  while (isspace((unsigned char)*p))
-	    p++;
-	  while (*p)
-	    {
-	      while (*p && !isspace((unsigned char)*p))
-		p++;
-	      while (isspace((unsigned char)*p))
-		p++;
-	      naliases++;
-	    }
-	}
+        {
+          /* Count the aliases. */
+          p = q + 1;
+          while (isspace((unsigned char)*p))
+            p++;
+          while (*p)
+            {
+              while (*p && !isspace((unsigned char)*p))
+                p++;
+              while (isspace((unsigned char)*p))
+                p++;
+              naliases++;
+            }
+        }

      /* Allocate memory for the host structure. */
      hostent = malloc(sizeof(struct hostent));
      if (!hostent)
-	break;
+        break;
      hostent->h_aliases = NULL;
      hostent->h_addr_list = NULL;
      hostent->h_name = strdup(canonical);
      if (!hostent->h_name)
-	break;
+        break;
      hostent->h_addr_list = malloc(2 * sizeof(char *));
      if (!hostent->h_addr_list)
-	break;
-      hostent->h_addr_list[0] = malloc(sizeof(struct in_addr));
+        break;
+      hostent->h_addr_list[0] = malloc(addrlen);
      if (!hostent->h_addr_list[0])
-	break;
+        break;
      hostent->h_aliases = malloc((naliases + 1) * sizeof(char *));
      if (!hostent->h_aliases)
-	break;
+        break;

      /* Copy in aliases. */
      naliases = 0;
      if (!end_at_hostname)
-	{
-	  p = canonical + strlen(canonical) + 1;
-	  while (isspace((unsigned char)*p))
-	    p++;
-	  while (*p)
-	    {
-	      q = p;
-	      while (*q && !isspace((unsigned char)*q))
-		q++;
-	      hostent->h_aliases[naliases] = malloc(q - p + 1);
-	      if (hostent->h_aliases[naliases] == NULL)
-		break;
-	      memcpy(hostent->h_aliases[naliases], p, q - p);
-	      hostent->h_aliases[naliases][q - p] = 0;
-	      p = q;
-	      while (isspace((unsigned char)*p))
-		p++;
-	      naliases++;
-	    }
-	  if (*p)
-	    break;
-	}
+        {
+          p = canonical + strlen(canonical) + 1;
+          while (isspace((unsigned char)*p))
+            p++;
+          while (*p)
+            {
+              q = p;
+              while (*q && !isspace((unsigned char)*q))
+                q++;
+              hostent->h_aliases[naliases] = malloc(q - p + 1);
+              if (hostent->h_aliases[naliases] == NULL)
+                break;
+              memcpy(hostent->h_aliases[naliases], p, q - p);
+              hostent->h_aliases[naliases][q - p] = 0;
+              p = q;
+              while (isspace((unsigned char)*p))
+                p++;
+              naliases++;
+            }
+          if (*p)
+            break;
+        }
      hostent->h_aliases[naliases] = NULL;

-      hostent->h_addrtype = AF_INET;
-      hostent->h_length = sizeof(struct in_addr);
-      memcpy(hostent->h_addr_list[0], &addr, sizeof(struct in_addr));
+      hostent->h_addrtype = family;
+      hostent->h_length = addrlen;
+      if (family == AF_INET)
+        memcpy(hostent->h_addr_list[0], &addr, addrlen);
+      else if (family == AF_INET6)
+        memcpy(hostent->h_addr_list[0], &addr6, addrlen);
      hostent->h_addr_list[1] = NULL;
      *host = hostent;
      free(line);
@@ -150,22 +166,22 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
    {
      /* Memory allocation failure; clean up. */
      if (hostent)
-	{
+        {
          if(hostent->h_name)
            free((char *) hostent->h_name);
-	  if (hostent->h_aliases)
-	    {
-	      for (alias = hostent->h_aliases; *alias; alias++)
-		free(*alias);
-	    }
+          if (hostent->h_aliases)
+            {
+              for (alias = hostent->h_aliases; *alias; alias++)
+                free(*alias);
+            }
          if(hostent->h_aliases)
            free(hostent->h_aliases);
-	  if (hostent->h_addr_list && hostent->h_addr_list[0])
-	    free(hostent->h_addr_list[0]);
+          if (hostent->h_addr_list && hostent->h_addr_list[0])
+            free(hostent->h_addr_list[0]);
          if(hostent->h_addr_list)
            free(hostent->h_addr_list);
          free(hostent);
-	}
+        }
      return ARES_ENOMEM;
    }

--- a/ares/ares__read_line.c
+++ b/ares/ares__read_line.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,27 +38,28 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize)
    {
      *buf = malloc(128);
      if (!*buf)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
      *bufsize = 128;
    }

  while (1)
    {
      if (!fgets(*buf + offset, *bufsize - (int)offset, fp))
-	return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
+        return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
      len = offset + strlen(*buf + offset);
      if ((*buf)[len - 1] == '\n')
-	{
-	  (*buf)[len - 1] = 0;
-	  return ARES_SUCCESS;
-	}
+        {
+          (*buf)[len - 1] = 0;
+          break;
+        }
      offset = len;

      /* Allocate more space. */
      newbuf = realloc(*buf, *bufsize * 2);
      if (!newbuf)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
      *buf = newbuf;
      *bufsize *= 2;
    }
+  return ARES_SUCCESS;
 }
--- a/ares/ares_cancel.3
+++ b/ares/ares_cancel.3
@@ -33,5 +33,7 @@ might have been stored in their arguments.
 .SH SEE ALSO
 .BR ares_init (3)
 .BR ares_destroy (3)
+.SH NOTES
+This function was added in c-ares 1.2.0
 .SH AUTHOR
 Dirk Manske
--- a/ares/ares_cancel.c
+++ b/ares/ares_cancel.c
@@ -1,18 +1,17 @@
-/* Copyright 1998 by the Massachusetts Institute of Technology.
+/* Copyright (C) 2004 by Daniel Stenberg et al
 *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"
@@ -39,6 +38,6 @@ void ares_cancel(ares_channel channel)
  if (!(channel->flags & ARES_FLAG_STAYOPEN))
  {
    for (i = 0; i < channel->nservers; i++)
-      ares__close_sockets(&channel->servers[i]);
+      ares__close_sockets(channel, &channel->servers[i]);
  }
 }
--- a/ares/ares_destroy.3
+++ b/ares/ares_destroy.3
@@ -14,14 +14,14 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_DESTROY 3 "23 July 1998"
+.TH ARES_DESTROY 3 "7 December 2004"
 .SH NAME
 ares_destroy \- Destroy a resolver channel
 .SH SYNOPSIS
 .nf
 .B #include <ares.h>
 .PP
-.B int ares_destroy(ares_channel \fIchannel\fP)
+.B void ares_destroy(ares_channel \fIchannel\fP)
 .fi
 .SH DESCRIPTION
 The
--- a/ares/ares_destroy.c
+++ b/ares/ares_destroy.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"
@@ -23,7 +24,7 @@ void ares_destroy(ares_channel channel)
  struct query *query;

  for (i = 0; i < channel->nservers; i++)
-    ares__close_sockets(&channel->servers[i]);
+    ares__close_sockets(channel, &channel->servers[i]);
  free(channel->servers);
  for (i = 0; i < channel->ndomains; i++)
    free(channel->domains[i]);
--- a/ares/ares_dns.h
+++ b/ares/ares_dns.h
@@ -18,64 +18,86 @@
 #ifndef ARES__DNS_H
 #define ARES__DNS_H

-#define DNS__16BIT(p)			(((p)[0] << 8) | (p)[1])
-#define DNS__32BIT(p)			(((p)[0] << 24) | ((p)[1] << 16) | \
-					 ((p)[2] << 8) | (p)[3])
-#define DNS__SET16BIT(p, v)		(((p)[0] = ((v) >> 8) & 0xff), \
-					 ((p)[1] = (v) & 0xff))
-#define DNS__SET32BIT(p, v)		(((p)[0] = ((v) >> 24) & 0xff), \
-					 ((p)[1] = ((v) >> 16) & 0xff), \
-					 ((p)[2] = ((v) >> 8) & 0xff), \
-					 ((p)[3] = (v) & 0xff))
+#ifdef ARES_BIG_ENDIAN
+/* big-endian aware versions */
+#define DNS__16BIT(p)                   (((p)[1] << 8) | (p)[0])
+#define DNS__32BIT(p)                   (((p)[3] << 24) | ((p)[2] << 16) | \
+                                         ((p)[1] << 8) | (p)[0])
+#define DNS__SET16BIT(p, v)             (((p)[1] = ((v) >> 8) & 0xff), \
+                                         ((p)[0] = (v) & 0xff))
+#define DNS__SET32BIT(p, v)             (((p)[3] = ((v) >> 24) & 0xff), \
+                                         ((p)[2] = ((v) >> 16) & 0xff), \
+                                         ((p)[1] = ((v) >> 8) & 0xff), \
+                                         ((p)[0] = (v) & 0xff))
+#else
+#define DNS__16BIT(p)                   (((p)[0] << 8) | (p)[1])
+#define DNS__32BIT(p)                   (((p)[0] << 24) | ((p)[1] << 16) | \
+                                         ((p)[2] << 8) | (p)[3])
+#define DNS__SET16BIT(p, v)             (((p)[0] = ((v) >> 8) & 0xff), \
+                                         ((p)[1] = (v) & 0xff))
+#define DNS__SET32BIT(p, v)             (((p)[0] = ((v) >> 24) & 0xff), \
+                                         ((p)[1] = ((v) >> 16) & 0xff), \
+                                         ((p)[2] = ((v) >> 8) & 0xff), \
+                                         ((p)[3] = (v) & 0xff))
+#endif
+
+#if 0
+/* we cannot use this approach on systems where we can't access 16/32 bit
+   data on un-aligned addresses */
+#define DNS__16BIT(p)                   ntohs(*(unsigned short*)(p))
+#define DNS__32BIT(p)                   ntohl(*(unsigned long*)(p))
+#define DNS__SET16BIT(p, v)             *(unsigned short*)(p) = htons(v)
+#define DNS__SET32BIT(p, v)             *(unsigned long*)(p) = htonl(v)
+#endif

 /* Macros for parsing a DNS header */
-#define DNS_HEADER_QID(h)		DNS__16BIT(h)
-#define DNS_HEADER_QR(h)		(((h)[2] >> 7) & 0x1)
-#define DNS_HEADER_OPCODE(h)		(((h)[2] >> 3) & 0xf)
-#define DNS_HEADER_AA(h)		(((h)[2] >> 2) & 0x1)
-#define DNS_HEADER_TC(h)		(((h)[2] >> 1) & 0x1)
-#define DNS_HEADER_RD(h)		((h)[2] & 0x1)
-#define DNS_HEADER_RA(h)		(((h)[3] >> 7) & 0x1)
-#define DNS_HEADER_Z(h)			(((h)[3] >> 4) & 0x7)
-#define DNS_HEADER_RCODE(h)		((h)[3] & 0xf)
-#define DNS_HEADER_QDCOUNT(h)		DNS__16BIT((h) + 4)
-#define DNS_HEADER_ANCOUNT(h)		DNS__16BIT((h) + 6)
-#define DNS_HEADER_NSCOUNT(h)		DNS__16BIT((h) + 8)
-#define DNS_HEADER_ARCOUNT(h)		DNS__16BIT((h) + 10)
+#define DNS_HEADER_QID(h)               DNS__16BIT(h)
+#define DNS_HEADER_QR(h)                (((h)[2] >> 7) & 0x1)
+#define DNS_HEADER_OPCODE(h)            (((h)[2] >> 3) & 0xf)
+#define DNS_HEADER_AA(h)                (((h)[2] >> 2) & 0x1)
+#define DNS_HEADER_TC(h)                (((h)[2] >> 1) & 0x1)
+#define DNS_HEADER_RD(h)                ((h)[2] & 0x1)
+#define DNS_HEADER_RA(h)                (((h)[3] >> 7) & 0x1)
+#define DNS_HEADER_Z(h)                 (((h)[3] >> 4) & 0x7)
+#define DNS_HEADER_RCODE(h)             ((h)[3] & 0xf)
+#define DNS_HEADER_QDCOUNT(h)           DNS__16BIT((h) + 4)
+#define DNS_HEADER_ANCOUNT(h)           DNS__16BIT((h) + 6)
+#define DNS_HEADER_NSCOUNT(h)           DNS__16BIT((h) + 8)
+#define DNS_HEADER_ARCOUNT(h)           DNS__16BIT((h) + 10)

 /* Macros for constructing a DNS header */
-#define DNS_HEADER_SET_QID(h, v)	DNS__SET16BIT(h, v)
-#define DNS_HEADER_SET_QR(h, v)		((h)[2] |= (((v) & 0x1) << 7))
-#define DNS_HEADER_SET_OPCODE(h, v)	((h)[2] |= (((v) & 0xf) << 3))
-#define DNS_HEADER_SET_AA(h, v)		((h)[2] |= (((v) & 0x1) << 2))
-#define DNS_HEADER_SET_TC(h, v)		((h)[2] |= (((v) & 0x1) << 1))
-#define DNS_HEADER_SET_RD(h, v)		((h)[2] |= (((v) & 0x1)))
-#define DNS_HEADER_SET_RA(h, v)		((h)[3] |= (((v) & 0x1) << 7))
-#define DNS_HEADER_SET_Z(h, v)		((h)[3] |= (((v) & 0x7) << 4))
-#define DNS_HEADER_SET_RCODE(h, v)	((h)[3] |= (((v) & 0xf)))
-#define DNS_HEADER_SET_QDCOUNT(h, v)	DNS__SET16BIT((h) + 4, v)
-#define DNS_HEADER_SET_ANCOUNT(h, v)	DNS__SET16BIT((h) + 6, v)
-#define DNS_HEADER_SET_NSCOUNT(h, v)	DNS__SET16BIT((h) + 8, v)
-#define DNS_HEADER_SET_ARCOUNT(h, v)	DNS__SET16BIT((h) + 10, v)
+#define DNS_HEADER_SET_QID(h, v)        DNS__SET16BIT(h, v)
+#define DNS_HEADER_SET_QR(h, v)         ((h)[2] |= (((v) & 0x1) << 7))
+#define DNS_HEADER_SET_OPCODE(h, v)     ((h)[2] |= (((v) & 0xf) << 3))
+#define DNS_HEADER_SET_AA(h, v)         ((h)[2] |= (((v) & 0x1) << 2))
+#define DNS_HEADER_SET_TC(h, v)         ((h)[2] |= (((v) & 0x1) << 1))
+#define DNS_HEADER_SET_RD(h, v)         ((h)[2] |= (((v) & 0x1)))
+#define DNS_HEADER_SET_RA(h, v)         ((h)[3] |= (((v) & 0x1) << 7))
+#define DNS_HEADER_SET_Z(h, v)          ((h)[3] |= (((v) & 0x7) << 4))
+#define DNS_HEADER_SET_RCODE(h, v)      ((h)[3] |= (((v) & 0xf)))
+#define DNS_HEADER_SET_QDCOUNT(h, v)    DNS__SET16BIT((h) + 4, v)
+#define DNS_HEADER_SET_ANCOUNT(h, v)    DNS__SET16BIT((h) + 6, v)
+#define DNS_HEADER_SET_NSCOUNT(h, v)    DNS__SET16BIT((h) + 8, v)
+#define DNS_HEADER_SET_ARCOUNT(h, v)    DNS__SET16BIT((h) + 10, v)

 /* Macros for parsing the fixed part of a DNS question */
-#define DNS_QUESTION_TYPE(q)		DNS__16BIT(q)
-#define DNS_QUESTION_CLASS(q)		DNS__16BIT((q) + 2)
+#define DNS_QUESTION_TYPE(q)            DNS__16BIT(q)
+#define DNS_QUESTION_CLASS(q)           DNS__16BIT((q) + 2)

 /* Macros for constructing the fixed part of a DNS question */
-#define DNS_QUESTION_SET_TYPE(q, v)	DNS__SET16BIT(q, v)
-#define DNS_QUESTION_SET_CLASS(q, v)	DNS__SET16BIT((q) + 2, v)
+#define DNS_QUESTION_SET_TYPE(q, v)     DNS__SET16BIT(q, v)
+#define DNS_QUESTION_SET_CLASS(q, v)    DNS__SET16BIT((q) + 2, v)

 /* Macros for parsing the fixed part of a DNS resource record */
-#define DNS_RR_TYPE(r)			DNS__16BIT(r)
-#define DNS_RR_CLASS(r)			DNS__16BIT((r) + 2)
-#define DNS_RR_TTL(r)			DNS__32BIT((r) + 4)
-#define DNS_RR_LEN(r)			DNS__16BIT((r) + 8)
+#define DNS_RR_TYPE(r)                  DNS__16BIT(r)
+#define DNS_RR_CLASS(r)                 DNS__16BIT((r) + 2)
+#define DNS_RR_TTL(r)                   DNS__32BIT((r) + 4)
+#define DNS_RR_LEN(r)                   DNS__16BIT((r) + 8)

 /* Macros for constructing the fixed part of a DNS resource record */
-#define DNS_RR_SET_TYPE(r)		DNS__SET16BIT(r, v)
-#define DNS_RR_SET_CLASS(r)		DNS__SET16BIT((r) + 2, v)
-#define DNS_RR_SET_TTL(r)		DNS__SET32BIT((r) + 4, v)
-#define DNS_RR_SET_LEN(r)		DNS__SET16BIT((r) + 8, v)
+#define DNS_RR_SET_TYPE(r)              DNS__SET16BIT(r, v)
+#define DNS_RR_SET_CLASS(r)             DNS__SET16BIT((r) + 2, v)
+#define DNS_RR_SET_TTL(r)               DNS__SET32BIT((r) + 4, v)
+#define DNS_RR_SET_LEN(r)               DNS__SET16BIT((r) + 8, v)

 #endif /* ARES__DNS_H */
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -13,13 +13,17 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdlib.h>
@@ -27,7 +31,7 @@
 #include "ares_private.h" /* for the memdebug */

 static int name_length(const unsigned char *encoded, const unsigned char *abuf,
-		       int alen);
+                       int alen);

 /* Expand an RFC1035-encoded domain name given by encoded.  The
 * containing message is given by abuf and alen.  The result given by
@@ -54,7 +58,7 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf,
 */

 int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, char **s, long *enclen)
+                     int alen, char **s, long *enclen)
 {
  int len, indir = 0;
  char *q;
@@ -74,27 +78,27 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
  while (*p)
    {
      if ((*p & INDIR_MASK) == INDIR_MASK)
-	{
-	  if (!indir)
-	    {
-	      *enclen = p + 2 - encoded;
-	      indir = 1;
-	    }
-	  p = abuf + ((*p & ~INDIR_MASK) << 8 | *(p + 1));
-	}
+        {
+          if (!indir)
+            {
+              *enclen = p + 2 - encoded;
+              indir = 1;
+            }
+          p = abuf + ((*p & ~INDIR_MASK) << 8 | *(p + 1));
+        }
      else
-	{
-	  len = *p;
-	  p++;
-	  while (len--)
-	    {
-	      if (*p == '.' || *p == '\\')
-		*q++ = '\\';
-	      *q++ = *p;
-	      p++;
-	    }
-	  *q++ = '.';
-	}
+        {
+          len = *p;
+          p++;
+          while (len--)
+            {
+              if (*p == '.' || *p == '\\')
+                *q++ = '\\';
+              *q++ = *p;
+              p++;
+            }
+          *q++ = '.';
+        }
    }
  if (!indir)
    *enclen = p + 1 - encoded;
@@ -102,6 +106,8 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
  /* Nuke the trailing period if we wrote one. */
  if (q > *s)
    *(q - 1) = 0;
+  else
+    *q = 0; /* zero terminate */

  return ARES_SUCCESS;
 }
@@ -110,7 +116,7 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
 * -1 if the encoding is invalid.
 */
 static int name_length(const unsigned char *encoded, const unsigned char *abuf,
-		       int alen)
+                       int alen)
 {
  int n = 0, offset, indir = 0;

@@ -121,34 +127,34 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf,
  while (*encoded)
    {
      if ((*encoded & INDIR_MASK) == INDIR_MASK)
-	{
-	  /* Check the offset and go there. */
-	  if (encoded + 1 >= abuf + alen)
-	    return -1;
-	  offset = (*encoded & ~INDIR_MASK) << 8 | *(encoded + 1);
-	  if (offset >= alen)
-	    return -1;
-	  encoded = abuf + offset;
+        {
+          /* Check the offset and go there. */
+          if (encoded + 1 >= abuf + alen)
+            return -1;
+          offset = (*encoded & ~INDIR_MASK) << 8 | *(encoded + 1);
+          if (offset >= alen)
+            return -1;
+          encoded = abuf + offset;

-	  /* If we've seen more indirects than the message length,
-	   * then there's a loop.
-	   */
-	  if (++indir > alen)
-	    return -1;
-	}
+          /* If we've seen more indirects than the message length,
+           * then there's a loop.
+           */
+          if (++indir > alen)
+            return -1;
+        }
      else
-	{
-	  offset = *encoded;
-	  if (encoded + offset + 1 >= abuf + alen)
-	    return -1;
-	  encoded++;
-	  while (offset--)
-	    {
-	      n += (*encoded == '.' || *encoded == '\\') ? 2 : 1;
-	      encoded++;
-	    }
-	  n++;
-	}
+        {
+          offset = *encoded;
+          if (encoded + offset + 1 >= abuf + alen)
+            return -1;
+          encoded++;
+          while (offset--)
+            {
+              n += (*encoded == '.' || *encoded == '\\') ? 2 : 1;
+              encoded++;
+            }
+          n++;
+        }
    }

  /* If there were any labels at all, then the number of dots is one
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
--- a/ares/ares_fds.c
+++ b/ares/ares_fds.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -13,11 +15,10 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
-
-#else
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

@@ -27,7 +28,8 @@
 int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
 {
  struct server_state *server;
-  int i, nfds;
+  ares_socket_t nfds;
+  int i;

  /* No queries, no file descriptors. */
  if (!channel->queries)
@@ -37,20 +39,20 @@ int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
  for (i = 0; i < channel->nservers; i++)
    {
      server = &channel->servers[i];
-      if (server->udp_socket != -1)
-	{
-	  FD_SET(server->udp_socket, read_fds);
-	  if (server->udp_socket >= nfds)
-	    nfds = server->udp_socket + 1;
-	}
-      if (server->tcp_socket != -1)
-	{
-	  FD_SET(server->tcp_socket, read_fds);
-	  if (server->qhead)
-	    FD_SET(server->tcp_socket, write_fds);
-	  if (server->tcp_socket >= nfds)
-	    nfds = server->tcp_socket + 1;
+      if (server->udp_socket != ARES_SOCKET_BAD)
+        {
+          FD_SET(server->udp_socket, read_fds);
+          if (server->udp_socket >= nfds)
+            nfds = server->udp_socket + 1;
+        }
+      if (server->tcp_socket != ARES_SOCKET_BAD)
+       {
+         FD_SET(server->tcp_socket, read_fds);
+         if (server->qhead)
+           FD_SET(server->tcp_socket, write_fds);
+         if (server->tcp_socket >= nfds)
+           nfds = server->tcp_socket + 1;
 	}
    }
-  return nfds;
+  return (int)nfds;
 }
--- a/ares/ares_free_hostent.3
+++ b/ares/ares_free_hostent.3
@@ -28,8 +28,8 @@ The
 .I ares_free_hostent
 function frees a
 .B struct hostent
-allocated by one of the functions \fIares_parse_a_reply(3)\fP or
-\fIares_parse_ptr_reply(3)\fP.
+allocated by one of the functions \fIares_parse_a_reply(3)\fP,
+\fIares_parse_aaaa_reply(3)\fP, or \fIares_parse_ptr_reply(3)\fP.
 .SH NOTES
 It is not necessary (and is not correct) to free the host structure passed to
 the callback functions for \fIares_gethostbyname(3)\fP or
@@ -37,6 +37,7 @@ the callback functions for \fIares_gethostbyname(3)\fP or
 host structures when the callback returns.
 .SH SEE ALSO
 .BR ares_parse_a_reply (3),
+.BR ares_parse_aaaa_reply (3),
 .BR ares_parse_ptr_reply (3)
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
--- a/ares/ares_free_hostent.c
+++ b/ares/ares_free_hostent.c
@@ -13,11 +13,10 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdlib.h>

-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <netdb.h>
 #endif

--- a/ares/ares_free_string.c
+++ b/ares/ares_free_string.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"

--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -12,28 +14,38 @@
 * this software for any purpose.  It is provided "as is"
 * without express or implied warranty.
 */
-
+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"
+
+#ifdef WATT32
+#undef WIN32
+#endif

 struct addr_query {
  /* Arguments passed to ares_gethostbyaddr() */
  ares_channel channel;
-  struct in_addr addr;
+  union ares_addr addr;
+  int family;
  ares_host_callback callback;
  void *arg;

@@ -42,17 +54,24 @@ struct addr_query {

 static void next_lookup(struct addr_query *aquery);
 static void addr_callback(void *arg, int status, unsigned char *abuf,
-			  int alen);
+                          int alen);
 static void end_aquery(struct addr_query *aquery, int status,
-		       struct hostent *host);
-static int file_lookup(struct in_addr *addr, struct hostent **host);
+                       struct hostent *host);
+static int file_lookup(union ares_addr *addr, int family, struct hostent **host);

 void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
-			int family, ares_host_callback callback, void *arg)
+                        int family, ares_host_callback callback, void *arg)
 {
  struct addr_query *aquery;

-  if (family != AF_INET || addrlen != sizeof(struct in_addr))
+  if (family != AF_INET && family != AF_INET6)
+    {
+      callback(arg, ARES_ENOTIMP, NULL);
+      return;
+    }
+
+  if ((family == AF_INET && addrlen != sizeof(struct in_addr)) ||
+      (family == AF_INET6 && addrlen != sizeof(struct in6_addr)))
    {
      callback(arg, ARES_ENOTIMP, NULL);
      return;
@@ -65,7 +84,11 @@ void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
      return;
    }
  aquery->channel = channel;
-  memcpy(&aquery->addr, addr, sizeof(aquery->addr));
+  if (family == AF_INET)
+    memcpy(&aquery->addr.addr4, addr, sizeof(struct in_addr));
+  else
+    memcpy(&aquery->addr.addr6, addr, sizeof(struct in6_addr));
+  aquery->family = family;
  aquery->callback = callback;
  aquery->arg = arg;
  aquery->remaining_lookups = channel->lookups;
@@ -76,7 +99,7 @@ void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
 static void next_lookup(struct addr_query *aquery)
 {
  const char *p;
-  char name[64];
+  char name[128];
  int a1, a2, a3, a4, status;
  struct hostent *host;
  unsigned long addr;
@@ -84,27 +107,47 @@ static void next_lookup(struct addr_query *aquery)
  for (p = aquery->remaining_lookups; *p; p++)
    {
      switch (*p)
-	{
-	case 'b':
-	  addr = ntohl(aquery->addr.s_addr);
-	  a1 = (int)((addr >> 24) & 0xff);
-	  a2 = (int)((addr >> 16) & 0xff);
-	  a3 = (int)((addr >> 8) & 0xff);
-	  a4 = (int)(addr & 0xff);
-	  sprintf(name, "%d.%d.%d.%d.in-addr.arpa", a4, a3, a2, a1);
-	  aquery->remaining_lookups = p + 1;
-	  ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,
-		     aquery);
-	  return;
-	case 'f':
-	  status = file_lookup(&aquery->addr, &host);
-	  if (status != ARES_ENOTFOUND)
-	    {
-	      end_aquery(aquery, status, host);
-	      return;
-	    }
-	  break;
-	}
+        {
+        case 'b':
+          if (aquery->family == AF_INET)
+            {
+              addr = ntohl(aquery->addr.addr4.s_addr);
+              a1 = (int)((addr >> 24) & 0xff);
+              a2 = (int)((addr >> 16) & 0xff);
+              a3 = (int)((addr >> 8) & 0xff);
+              a4 = (int)(addr & 0xff);
+              sprintf(name, "%d.%d.%d.%d.in-addr.arpa", a4, a3, a2, a1);
+              aquery->remaining_lookups = p + 1;
+              ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,
+                         aquery);
+            }
+          else
+            {
+              unsigned char *bytes;
+              bytes = (unsigned char *)&aquery->addr.addr6.s6_addr;
+              sprintf(name, "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.arpa",
+                      bytes[15]&0xf, bytes[15] >> 4, bytes[14]&0xf, bytes[14] >> 4,
+                      bytes[13]&0xf, bytes[13] >> 4, bytes[12]&0xf, bytes[12] >> 4,
+                      bytes[11]&0xf, bytes[11] >> 4, bytes[10]&0xf, bytes[10] >> 4,
+                      bytes[9]&0xf, bytes[9] >> 4, bytes[8]&0xf, bytes[8] >> 4,
+                      bytes[7]&0xf, bytes[7] >> 4, bytes[6]&0xf, bytes[6] >> 4,
+                      bytes[5]&0xf, bytes[5] >> 4, bytes[4]&0xf, bytes[4] >> 4,
+                      bytes[3]&0xf, bytes[3] >> 4, bytes[2]&0xf, bytes[2] >> 4,
+                      bytes[1]&0xf, bytes[1] >> 4, bytes[0]&0xf, bytes[0] >> 4);
+              aquery->remaining_lookups = p + 1;
+              ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,
+                         aquery);
+            }
+          return;
+        case 'f':
+          status = file_lookup(&aquery->addr, aquery->family, &host);
+          if (status != ARES_ENOTFOUND)
+            {
+              end_aquery(aquery, status, host);
+              return;
+            }
+          break;
+        }
    }
  end_aquery(aquery, ARES_ENOTFOUND, NULL);
 }
@@ -116,8 +159,12 @@ static void addr_callback(void *arg, int status, unsigned char *abuf, int alen)

  if (status == ARES_SUCCESS)
    {
-      status = ares_parse_ptr_reply(abuf, alen, &aquery->addr,
-				    sizeof(struct in_addr), AF_INET, &host);
+      if (aquery->family == AF_INET)
+        status = ares_parse_ptr_reply(abuf, alen, &aquery->addr.addr4,
+                                      sizeof(struct in_addr), AF_INET, &host);
+      else
+        status = ares_parse_ptr_reply(abuf, alen, &aquery->addr.addr6,
+                                      sizeof(struct in6_addr), AF_INET6, &host);
      end_aquery(aquery, status, host);
    }
  else if (status == ARES_EDESTRUCTION)
@@ -127,7 +174,7 @@ static void addr_callback(void *arg, int status, unsigned char *abuf, int alen)
 }

 static void end_aquery(struct addr_query *aquery, int status,
-		       struct hostent *host)
+                       struct hostent *host)
 {
  aquery->callback(aquery->arg, status, host);
  if (host)
@@ -135,32 +182,60 @@ static void end_aquery(struct addr_query *aquery, int status,
  free(aquery);
 }

-static int file_lookup(struct in_addr *addr, struct hostent **host)
+static int file_lookup(union ares_addr *addr, int family, struct hostent **host)
 {
  FILE *fp;
  int status;

 #ifdef WIN32
-
  char PATH_HOSTS[MAX_PATH];
-  if (IsNT) {
-    GetSystemDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_NT);
-  } else {
-    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_9X);
-  }
+  if (IS_NT()) {
+    char tmp[MAX_PATH];
+    HKEY hkeyHosts;

+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
+        == ERROR_SUCCESS)
+    {
+      DWORD dwLength = MAX_PATH;
+      RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
+                      &dwLength);
+      ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH);
+      RegCloseKey(hkeyHosts);
+    }
+  }
+  else
+    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
+
+  strcat(PATH_HOSTS, WIN_PATH_HOSTS);
+
+#elif defined(WATT32)
+  extern const char *_w32_GetHostsFile (void);
+  const char *PATH_HOSTS = _w32_GetHostsFile();
+
+  if (!PATH_HOSTS)
+    return ARES_ENOTFOUND;
 #endif

  fp = fopen(PATH_HOSTS, "r");
  if (!fp)
    return ARES_ENOTFOUND;
-
-  while ((status = ares__get_hostent(fp, host)) == ARES_SUCCESS)
+  while ((status = ares__get_hostent(fp, family, host)) == ARES_SUCCESS)
    {
-      if (memcmp((*host)->h_addr, addr, sizeof(struct in_addr)) == 0)
-	break;
+      if (family != (*host)->h_addrtype)
+        {
+          ares_free_hostent(*host);
+          continue;
+        }
+      if (family == AF_INET)
+        {
+          if (memcmp((*host)->h_addr, &addr->addr4, sizeof(struct in_addr)) == 0)
+            break;
+        }
+      else if (family == AF_INET6)
+        {
+          if (memcmp((*host)->h_addr, &addr->addr6, sizeof(struct in6_addr)) == 0)
+            break;
+        }
      ares_free_hostent(*host);
    }
  fclose(fp);
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -13,24 +13,37 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
 #endif
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"
+#include "bitncmp.h"
+
+#ifdef WATT32
+#undef WIN32
+#endif

 struct host_query {
  /* Arguments passed to ares_gethostbyname() */
@@ -38,36 +51,40 @@ struct host_query {
  char *name;
  ares_host_callback callback;
  void *arg;
-
+  int family;
  const char *remaining_lookups;
 };

 static void next_lookup(struct host_query *hquery);
 static void host_callback(void *arg, int status, unsigned char *abuf,
-			  int alen);
+                          int alen);
 static void end_hquery(struct host_query *hquery, int status,
-		       struct hostent *host);
-static int fake_hostent(const char *name, ares_host_callback callback,
-			void *arg);
-static int file_lookup(const char *name, struct hostent **host);
+                       struct hostent *host);
+static int fake_hostent(const char *name, int family, ares_host_callback callback,
+                        void *arg);
+static int file_lookup(const char *name, int family, struct hostent **host);
 static void sort_addresses(struct hostent *host, struct apattern *sortlist,
-			   int nsort);
+                           int nsort);
+static void sort6_addresses(struct hostent *host, struct apattern *sortlist,
+                           int nsort);
 static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
-			     int nsort);
+                             int nsort);
+static int get6_address_index(struct in6_addr *addr, struct apattern *sortlist,
+                             int nsort);

 void ares_gethostbyname(ares_channel channel, const char *name, int family,
-			ares_host_callback callback, void *arg)
+                        ares_host_callback callback, void *arg)
 {
  struct host_query *hquery;

  /* Right now we only know how to look up Internet addresses. */
-  if (family != AF_INET)
+  if (family != AF_INET && family != AF_INET6)
    {
      callback(arg, ARES_ENOTIMP, NULL);
      return;
    }

-  if (fake_hostent(name, callback, arg))
+  if (fake_hostent(name, family, callback, arg))
    return;

  /* Allocate and fill in the host query structure. */
@@ -79,6 +96,7 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family,
    }
  hquery->channel = channel;
  hquery->name = strdup(name);
+  hquery->family = family;
  if (!hquery->name)
    {
      free(hquery);
@@ -100,26 +118,30 @@ static void next_lookup(struct host_query *hquery)
  struct hostent *host;

  for (p = hquery->remaining_lookups; *p; p++)
-    { 
+    {
      switch (*p)
-	{
-	case 'b':
-	  /* DNS lookup */
-	  hquery->remaining_lookups = p + 1;
-	  ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
-		      hquery);
-	  return;
+        {
+        case 'b':
+          /* DNS lookup */
+          hquery->remaining_lookups = p + 1;
+          if (hquery->family == AF_INET6)
+            ares_search(hquery->channel, hquery->name, C_IN, T_AAAA, host_callback,
+                        hquery);
+          else
+            ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
+                        hquery);
+          return;

-	case 'f':
-	  /* Host file lookup */
-	  status = file_lookup(hquery->name, &host);
-	  if (status != ARES_ENOTFOUND)
-	    {
-	      end_hquery(hquery, status, host);
-	      return;
-	    }
-	  break;
-	}
+        case 'f':
+          /* Host file lookup */
+          status = file_lookup(hquery->name, hquery->family, &host);
+          if (status != ARES_ENOTFOUND)
+            {
+              end_hquery(hquery, status, host);
+              return;
+            }
+          break;
+        }
    }
  end_hquery(hquery, ARES_ENOTFOUND, NULL);
 }
@@ -132,11 +154,27 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)

  if (status == ARES_SUCCESS)
    {
-      status = ares_parse_a_reply(abuf, alen, &host);
-      if (host && channel->nsort)
-	sort_addresses(host, channel->sortlist, channel->nsort);
+      if (hquery->family == AF_INET)
+        {
+          status = ares_parse_a_reply(abuf, alen, &host);
+          if (host && channel->nsort)
+            sort_addresses(host, channel->sortlist, channel->nsort);
+        }
+      else if (hquery->family == AF_INET6)
+        {
+          status = ares_parse_aaaa_reply(abuf, alen, &host);
+          if (host && channel->nsort)
+            sort6_addresses(host, channel->sortlist, channel->nsort);
+        }
      end_hquery(hquery, status, host);
    }
+  else if (status == ARES_ENODATA && hquery->family == AF_INET6)
+    {
+      /* There was no AAAA now lookup an A */
+      hquery->family = AF_INET;
+      ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
+                  hquery);
+    }
  else if (status == ARES_EDESTRUCTION)
    end_hquery(hquery, status, NULL);
  else
@@ -144,7 +182,7 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)
 }

 static void end_hquery(struct host_query *hquery, int status,
-		       struct hostent *host)
+                       struct hostent *host)
 {
  hquery->callback(hquery->arg, status, host);
  if (host)
@@ -156,36 +194,34 @@ static void end_hquery(struct host_query *hquery, int status,
 /* If the name looks like an IP address, fake up a host entry, end the
 * query immediately, and return true.  Otherwise return false.
 */
-static int fake_hostent(const char *name, ares_host_callback callback,
-			void *arg)
+static int fake_hostent(const char *name, int family, ares_host_callback callback,
+                        void *arg)
 {
-  struct in_addr addr;
  struct hostent hostent;
-  const char *p;
  char *aliases[1] = { NULL };
  char *addrs[2];
+  int result = 0;
+  struct in_addr in;
+  struct in6_addr in6;

-  /* It only looks like an IP address if it's all numbers and dots. */
-  for (p = name; *p; p++)
-    {
-      if (!isdigit((unsigned char)*p) && *p != '.')
-	return 0;
-    }
+  if (family == AF_INET)
+    result = ((in.s_addr = inet_addr(name)) == INADDR_NONE ? 0 : 1);
+  else if (family == AF_INET6)
+    result = (ares_inet_pton(AF_INET6, name, &in6) < 1 ? 0 : 1);

-  /* It also only looks like an IP address if it's non-zero-length and
-   * doesn't end with a dot.
-   */
-  if (p == name || *(p - 1) == '.')
+  if (!result)
    return 0;

-  /* It looks like an IP address.  Figure out what IP address it is. */
-  addr.s_addr = inet_addr(name);
-  if (addr.s_addr == INADDR_NONE)
+  if (family == AF_INET)
    {
-      callback(arg, ARES_EBADNAME, NULL);
-      return 1;
+      hostent.h_length = sizeof(struct in_addr);
+      addrs[0] = (char *)&in;
+    }
+  else if (family == AF_INET6)
+    {
+      hostent.h_length = sizeof(struct in6_addr);
+      addrs[0] = (char *)&in6;
    }
-
  /* Duplicate the name, to avoid a constness violation. */
  hostent.h_name = strdup(name);
  if (!hostent.h_name)
@@ -195,11 +231,9 @@ static int fake_hostent(const char *name, ares_host_callback callback,
    }

  /* Fill in the rest of the host structure and terminate the query. */
-  addrs[0] = (char *) &addr;
  addrs[1] = NULL;
  hostent.h_aliases = aliases;
-  hostent.h_addrtype = AF_INET;
-  hostent.h_length = sizeof(struct in_addr);
+  hostent.h_addrtype = family;
  hostent.h_addr_list = addrs;
  callback(arg, ARES_SUCCESS, &hostent);

@@ -207,40 +241,56 @@ static int fake_hostent(const char *name, ares_host_callback callback,
  return 1;
 }

-static int file_lookup(const char *name, struct hostent **host)
+static int file_lookup(const char *name, int family, struct hostent **host)
 {
  FILE *fp;
  char **alias;
  int status;

 #ifdef WIN32
-
  char PATH_HOSTS[MAX_PATH];
-  if (IsNT) {
-    GetSystemDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_NT);
-  } else {
-    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_9X);
-  }
+  if (IS_NT()) {
+    char tmp[MAX_PATH];
+    HKEY hkeyHosts;

+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
+        == ERROR_SUCCESS)
+    {
+      DWORD dwLength = MAX_PATH;
+      RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
+                      &dwLength);
+      ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH);
+      RegCloseKey(hkeyHosts);
+    }
+  }
+  else
+    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
+
+  strcat(PATH_HOSTS, WIN_PATH_HOSTS);
+
+#elif defined(WATT32)
+  extern const char *_w32_GetHostsFile (void);
+  const char *PATH_HOSTS = _w32_GetHostsFile();
+
+  if (!PATH_HOSTS)
+    return ARES_ENOTFOUND;
 #endif

  fp = fopen(PATH_HOSTS, "r");
  if (!fp)
    return ARES_ENOTFOUND;

-  while ((status = ares__get_hostent(fp, host)) == ARES_SUCCESS)
+  while ((status = ares__get_hostent(fp, family, host)) == ARES_SUCCESS)
    {
      if (strcasecmp((*host)->h_name, name) == 0)
-	break;
+        break;
      for (alias = (*host)->h_aliases; *alias; alias++)
-	{
-	  if (strcasecmp(*alias, name) == 0)
-	    break;
-	}
+        {
+          if (strcasecmp(*alias, name) == 0)
+            break;
+        }
      if (*alias)
-	break;
+        break;
      ares_free_hostent(*host);
    }
  fclose(fp);
@@ -252,7 +302,7 @@ static int file_lookup(const char *name, struct hostent **host)
 }

 static void sort_addresses(struct hostent *host, struct apattern *sortlist,
-			   int nsort)
+                           int nsort)
 {
  struct in_addr a1, a2;
  int i1, i2, ind1, ind2;
@@ -267,13 +317,13 @@ static void sort_addresses(struct hostent *host, struct apattern *sortlist,
      memcpy(&a1, host->h_addr_list[i1], sizeof(struct in_addr));
      ind1 = get_address_index(&a1, sortlist, nsort);
      for (i2 = i1 - 1; i2 >= 0; i2--)
-	{
-	  memcpy(&a2, host->h_addr_list[i2], sizeof(struct in_addr));
-	  ind2 = get_address_index(&a2, sortlist, nsort);
-	  if (ind2 <= ind1)
-	    break;
-	  memcpy(host->h_addr_list[i2 + 1], &a2, sizeof(struct in_addr));
-	}
+        {
+          memcpy(&a2, host->h_addr_list[i2], sizeof(struct in_addr));
+          ind2 = get_address_index(&a2, sortlist, nsort);
+          if (ind2 <= ind1)
+            break;
+          memcpy(host->h_addr_list[i2 + 1], &a2, sizeof(struct in_addr));
+        }
      memcpy(host->h_addr_list[i2 + 1], &a1, sizeof(struct in_addr));
    }
 }
@@ -282,14 +332,72 @@ static void sort_addresses(struct hostent *host, struct apattern *sortlist,
 * if none of them match.
 */
 static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
-			     int nsort)
+                             int nsort)
 {
  int i;

  for (i = 0; i < nsort; i++)
    {
-      if ((addr->s_addr & sortlist[i].mask.s_addr) == sortlist[i].addr.s_addr)
-	break;
+      if (sortlist[i].family != AF_INET)
+        continue;
+      if (sortlist[i].type == PATTERN_MASK)
+        {
+          if ((addr->s_addr & sortlist[i].mask.addr.addr4.s_addr)
+              == sortlist[i].addr.addr4.s_addr)
+            break;
+        }
+      else
+        {
+          if (!ares_bitncmp(&addr->s_addr, &sortlist[i].addr.addr4.s_addr,
+                            sortlist[i].mask.bits))
+            break;
+        }
    }
  return i;
 }
+
+static void sort6_addresses(struct hostent *host, struct apattern *sortlist,
+                           int nsort)
+{
+  struct in6_addr a1, a2;
+  int i1, i2, ind1, ind2;
+
+  /* This is a simple insertion sort, not optimized at all.  i1 walks
+   * through the address list, with the loop invariant that everything
+   * to the left of i1 is sorted.  In the loop body, the value at i1 is moved
+   * back through the list (via i2) until it is in sorted order.
+   */
+  for (i1 = 0; host->h_addr_list[i1]; i1++)
+    {
+      memcpy(&a1, host->h_addr_list[i1], sizeof(struct in6_addr));
+      ind1 = get6_address_index(&a1, sortlist, nsort);
+      for (i2 = i1 - 1; i2 >= 0; i2--)
+        {
+          memcpy(&a2, host->h_addr_list[i2], sizeof(struct in6_addr));
+          ind2 = get6_address_index(&a2, sortlist, nsort);
+          if (ind2 <= ind1)
+            break;
+          memcpy(host->h_addr_list[i2 + 1], &a2, sizeof(struct in6_addr));
+        }
+      memcpy(host->h_addr_list[i2 + 1], &a1, sizeof(struct in6_addr));
+    }
+}
+
+/* Find the first entry in sortlist which matches addr.  Return nsort
+ * if none of them match.
+ */
+static int get6_address_index(struct in6_addr *addr, struct apattern *sortlist,
+                             int nsort)
+{
+  int i;
+
+  for (i = 0; i < nsort; i++)
+    {
+      if (sortlist[i].family != AF_INET6)
+        continue;
+        if (!ares_bitncmp(&addr->s6_addr, &sortlist[i].addr.addr6.s6_addr, sortlist[i].mask.bits))
+          break;
+    }
+  return i;
+}
+
--- a/ares/ares_getnameinfo.3
+++ b/ares/ares_getnameinfo.3
@@ -0,0 +1,145 @@
+.\" $Id$
+.\"
+.\" Copyright 2005 by Dominick Meglio.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_GETNAMEINFO 3 "16 May 2005"
+.SH NAME
+ares_getnameinfo \- Address-to-nodename translation in protocol-independent manner
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B typedef void (*ares_nameinfo_callback)(void *\fIarg\fP, int \fIstatus\fP,
+.B	char *\fInode\fP, char *\fIservice\fP)
+.PP
+.B void ares_getnameinfo(ares_channel \fIchannel\fP, const struct sockaddr *\fIsa\fP,
+.B 	socklen_t \fIsalen\fP, int \fIflags\fP, ares_nameinfo_callback \fIcallback\fP,
+.B 	void *\fIarg\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_getnameinfo
+function is defined for protocol-independent address translation. The function
+is a combination of \fIares_gethostbyaddr(3)\fP and \fIgetservbyport(3)\fP. The function will
+translate the address either by executing a host query on the name service channel
+identified by
+.IR channel 
+or it will attempt to resolve it locally if possible.
+The parameters
+.I sa
+and
+.I len
+give the address as a sockaddr structure, and
+.I flags
+gives the options that the function will use.  Valid flags are listed below:
+.TP 19
+.B ARES_NI_NOFQDN
+Only the nodename portion of the FQDN is returned for local hosts.
+.TP 19
+.B ARES_NI_NUMERICHOST
+The numeric form of the hostname is returned rather than the name.
+.TP 19
+.B ARES_NI_NAMEREQD
+An error is returned if the hostname cannot be found in the DNS.
+.TP 19
+.B ARES_NI_NUMERICSERV
+The numeric form of the service is returned rather than the name.
+.TP 19
+.B ARES_NI_TCP
+The service name is to be looked up for the TCP protocol.
+.TP 19
+.B ARES_NI_UDP
+The service name is to be looked up for the UDP protocol.
+.TP 19
+.B ARES_NI_SCTP
+The service name is to be looked up for the SCTP protocol.
+.TP 19
+.B ARES_NI_DCCP
+The service name is to be looked up for the DCCP protocol.
+.TP 19
+.B ARES_NI_NUMERICSCOPE
+The numeric form of the scope ID is returned rather than the name.
+.TP 19
+.B ARES_NI_LOOKUPHOST
+A hostname lookup is being requested.
+.TP 19
+.B ARES_NI_LOOKUPSERVICE
+A service name lookup is being requested.
+.PP
+When the query
+is complete or has 
+failed, the ares library will invoke \fIcallback\fP.  Completion or failure of 
+the query may happen immediately, or may happen during a later call to
+\fIares_process(3)\fP, \fIares_destroy(3)\fP or \fIares_cancel(3)\fP.
+.PP
+The callback argument
+.I arg
+is copied from the
+.B ares_getnameinfo
+argument
+.IR arg .
+The callback argument
+.I status
+indicates whether the query succeeded and, if not, how it failed.  It
+may have any of the following values:
+.TP 19
+.B ARES_SUCCESS
+The host lookup completed successfully.
+.TP 19
+.B ARES_ENOTIMP
+The ares library does not know how to look up addresses of type
+.IR family .
+.TP 19
+.B ARES_ENOTFOUND
+The address
+.I addr
+was not found.
+.TP 19
+.B ARES_ENOMEM
+Memory was exhausted.
+.TP 19
+.B ARES_EDESTRUCTION
+The name service channel
+.I channel
+is being destroyed; the query will not be completed.
+.TP 19
+.B ARES_EBADFLAGS
+The
+.I flags
+parameter contains an illegal value.
+.PP
+On successful completion of the query, the callback argument
+.I node
+contains a string representing the hostname (assuming 
+.B ARES_NI_LOOKUPHOST
+was specified). Additionally, 
+.I service
+contains a string representing the service name (assuming
+.B ARES_NI_LOOKUPSERVICE
+was specified).
+If the query did not complete successfully, or one of the values
+was not requested, 
+.I node
+or
+.I service
+will be 
+.BR NULL .
+.SH SEE ALSO
+.BR ares_process (3),
+.BR ares_getaddrinfo (3)
+.SH AUTHOR
+Dominick Meglio
+.br
+Copyright 2005 by Dominick Meglio.
--- a/ares/ares_getnameinfo.c
+++ b/ares/ares_getnameinfo.c
@@ -0,0 +1,382 @@
+/* $Id$ */
+
+/* Copyright 2005 by Dominick Meglio
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+#include "setup.h"
+#include <sys/types.h>
+#include <ctype.h>
+
+#if defined(WIN32) && !defined(WATT32)
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
+#endif
+
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ares.h"
+#include "ares_private.h"
+#include "ares_ipv6.h"
+#include "inet_ntop.h"
+
+#ifdef WATT32
+#undef WIN32
+#endif
+
+struct nameinfo_query {
+  ares_nameinfo_callback callback;
+  void *arg;
+  union {
+    struct sockaddr_in addr4;
+    struct sockaddr_in6 addr6;
+  } addr;
+  int family;
+  int flags;
+};
+
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
+#define IPBUFSIZ 40+IF_NAMESIZE
+#else
+#define IPBUFSIZ 40
+#endif
+
+static void nameinfo_callback(void *arg, int status, struct hostent *host);
+static char *lookup_service(unsigned short port, int flags,
+                            char *buf, size_t buflen);
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
+static void append_scopeid(struct sockaddr_in6 *addr6, unsigned int scopeid,
+                           char *buf, size_t buflen);
+#endif
+static char *ares_striendstr(const char *s1, const char *s2);
+
+void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, socklen_t salen,
+                      int flags, ares_nameinfo_callback callback, void *arg)
+{
+  struct sockaddr_in *addr = NULL;
+  struct sockaddr_in6 *addr6 = NULL;
+  struct nameinfo_query *niquery;
+
+  /* Verify the buffer size */
+  if (salen == sizeof(struct sockaddr_in))
+    addr = (struct sockaddr_in *)sa;
+  else if (salen == sizeof(struct sockaddr_in6))
+    addr6 = (struct sockaddr_in6 *)sa;
+  else
+    {
+      callback(arg, ARES_ENOTIMP, NULL, NULL);
+      return;
+    }
+
+  /* If neither, assume they want a host */
+  if (!(flags & ARES_NI_LOOKUPSERVICE) && !(flags & ARES_NI_LOOKUPHOST))
+    flags |= ARES_NI_LOOKUPHOST;
+
+  /* All they want is a service, no need for DNS */
+  if ((flags & ARES_NI_LOOKUPSERVICE) && !(flags & ARES_NI_LOOKUPHOST))
+    {
+      char buf[33], *service;
+      unsigned int port = 0;
+
+      if (salen == sizeof(struct sockaddr_in))
+        port = addr->sin_port;
+      else
+        port = addr6->sin6_port;
+      service = lookup_service(port, flags, buf, sizeof(buf));
+      callback(arg, ARES_SUCCESS, NULL, service);
+      return;
+    }
+
+  /* They want a host lookup */
+  if ((flags & ARES_NI_LOOKUPHOST))
+    {
+     /* A numeric host can be handled without DNS */
+     if ((flags & ARES_NI_NUMERICHOST))
+      {
+        unsigned int port = 0;
+        char ipbuf[IPBUFSIZ];
+        char srvbuf[33];
+        char *service = NULL;
+        ipbuf[0] = 0;
+
+        /* Specifying not to lookup a host, but then saying a host
+         * is required has to be illegal.
+         */
+        if (flags & ARES_NI_NAMEREQD)
+          {
+            callback(arg, ARES_EBADFLAGS, NULL, NULL);
+            return;
+          }
+        if (salen == sizeof(struct sockaddr_in6))
+          {
+            ares_inet_ntop(AF_INET6, &addr6->sin6_addr, ipbuf, IPBUFSIZ);
+            port = addr6->sin6_port;
+            /* If the system supports scope IDs, use it */
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
+            append_scopeid(addr6, flags, ipbuf, sizeof(ipbuf));
+#endif
+          }
+        else
+          {
+            ares_inet_ntop(AF_INET, &addr->sin_addr, ipbuf, IPBUFSIZ);
+            port = addr->sin_port;
+          }
+        /* They also want a service */
+        if (flags & ARES_NI_LOOKUPSERVICE)
+          service = lookup_service(port, flags, srvbuf, sizeof(srvbuf));
+        callback(arg, ARES_SUCCESS, ipbuf, service);
+        return;
+      }
+    /* This is where a DNS lookup becomes necessary */
+    else
+      {
+        niquery = malloc(sizeof(struct nameinfo_query));
+        if (!niquery)
+          {
+            callback(arg, ARES_ENOMEM, NULL, NULL);
+            return;
+          }
+        niquery->callback = callback;
+        niquery->arg = arg;
+        niquery->flags = flags;
+        if (sa->sa_family == AF_INET)
+          {
+            niquery->family = AF_INET;
+            memcpy(&niquery->addr.addr4, addr, sizeof(addr));
+            ares_gethostbyaddr(channel, &addr->sin_addr, sizeof(struct in_addr), AF_INET,
+                               nameinfo_callback, niquery);
+          }
+        else
+          {
+            niquery->family = AF_INET6;
+            memcpy(&niquery->addr.addr6, addr6, sizeof(addr6));
+            ares_gethostbyaddr(channel, &addr6->sin6_addr, sizeof(struct in6_addr), AF_INET6,
+                               nameinfo_callback, niquery);
+          }
+      }
+    }
+}
+
+static void nameinfo_callback(void *arg, int status, struct hostent *host)
+{
+  struct nameinfo_query *niquery = (struct nameinfo_query *) arg;
+  char srvbuf[33];
+  char *service = NULL;
+
+
+  if (status == ARES_SUCCESS)
+    {
+      /* They want a service too */
+      if (niquery->flags & ARES_NI_LOOKUPSERVICE)
+        {
+          if (niquery->family == AF_INET)
+            service = lookup_service(niquery->addr.addr4.sin_port,
+                                     niquery->flags, srvbuf, sizeof(srvbuf));
+          else
+            service = lookup_service(niquery->addr.addr6.sin6_port,
+                                     niquery->flags, srvbuf, sizeof(srvbuf));
+        }
+      /* NOFQDN means we have to strip off the domain name portion.
+         We do this by determining our own domain name, then searching the string
+         for this domain name and removing it.
+       */
+      if (niquery->flags & ARES_NI_NOFQDN)
+        {
+           char buf[255];
+           char *domain;
+           gethostname(buf, 255);
+           if ((domain = strchr(buf, '.')))
+             {
+               char *end = ares_striendstr(host->h_name, domain);
+               if (end)
+                 *end = 0;
+             }
+        }
+      niquery->callback(niquery->arg, ARES_SUCCESS, host->h_name, service);
+      return;
+    }
+  /* We couldn't find the host, but it's OK, we can use the IP */
+  else if (status == ARES_ENOTFOUND && !(niquery->flags & ARES_NI_NAMEREQD))
+    {
+      char ipbuf[IPBUFSIZ];
+      if (niquery->family == AF_INET)
+        ares_inet_ntop(AF_INET, &niquery->addr.addr4.sin_addr, ipbuf, IPBUFSIZ);
+      else
+        {
+          ares_inet_ntop(AF_INET6, &niquery->addr.addr6.sin6_addr, ipbuf, IPBUFSIZ);
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
+          append_scopeid(&niquery->addr.addr6, niquery->flags, ipbuf, sizeof(ipbuf));
+#endif
+        }
+      /* They want a service too */
+      if (niquery->flags & ARES_NI_LOOKUPSERVICE)
+        {
+          if (niquery->family == AF_INET)
+            service = lookup_service(niquery->addr.addr4.sin_port,
+                                     niquery->flags, srvbuf, sizeof(srvbuf));
+          else
+            service = lookup_service(niquery->addr.addr6.sin6_port,
+                                     niquery->flags, srvbuf, sizeof(srvbuf));
+        }
+      niquery->callback(niquery->arg, ARES_SUCCESS, ipbuf, service);
+      return;
+    }
+  niquery->callback(niquery->arg, status, NULL, NULL);
+  free(niquery);
+}
+
+static char *lookup_service(unsigned short port, int flags,
+                            char *buf, size_t buflen)
+{
+  const char *proto;
+  struct servent *sep;
+#ifdef HAVE_GETSERVBYPORT_R
+  struct servent se;
+#endif
+  char tmpbuf[4096];
+
+  if (port)
+    { 
+      if (flags & ARES_NI_NUMERICSERV)
+        sep = NULL;
+      else
+        { 
+          if (flags & ARES_NI_UDP)
+            proto = "udp";
+          else if (flags & ARES_NI_SCTP)
+            proto = "sctp";
+          else if (flags & ARES_NI_DCCP)
+            proto = "dccp";
+          else
+            proto = "tcp";
+#ifdef HAVE_GETSERVBYPORT_R
+          sep = &se;
+          memset(tmpbuf, 0, sizeof(tmpbuf));
+#if GETSERVBYPORT_R_ARGS == 6
+          if (getservbyport_r(port, proto, &se, (void *)tmpbuf, sizeof(tmpbuf), &sep) != 0)
+            sep = NULL;
+#elif GETSERVBYPORT_R_ARGS == 5
+          sep = getservbyport_r(port, proto, &se, (void *)tmpbuf, sizeof(tmpbuf));
+#elif GETSERVBYPORT_R_ARGS == 4
+          if (getservbyport_r(port, proto, &se, (void *)tmpbuf) != 0)
+            sep = NULL;
+#else     
+          /* Lets just hope the OS uses TLS! */
+          sep = getservbyport(port, proto);
+#endif    
+#else     
+          /* Lets just hope the OS uses TLS! */
+          sep = getservbyport(port, proto);
+#endif    
+        } 
+      if (sep && sep->s_name)
+        /* get service name */
+        strcpy(tmpbuf, sep->s_name);
+      else
+        /* get port as a string */
+        sprintf(tmpbuf, "%u", ntohs(port));
+      if (strlen(tmpbuf) < buflen)
+        /* return it if buffer big enough */
+        strcpy(buf, tmpbuf);
+      else
+        /* avoid reusing previous one */
+        buf[0] = '\0';
+      return buf;
+    }
+  buf[0] = '\0';
+  return NULL;
+}
+
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
+static void append_scopeid(struct sockaddr_in6 *addr6, unsigned int flags,
+                           char *buf, size_t buflen)
+{
+  char fmt_u[] = "%u";
+  char fmt_lu[] = "%lu";
+  char tmpbuf[IF_NAMESIZE + 2];
+  size_t bufl;
+  char *fmt = (sizeof(addr6->sin6_scope_id) > sizeof(unsigned int))?fmt_lu:fmt_u;
+
+  tmpbuf[0] = '%';
+
+#ifdef HAVE_IF_INDEXTONAME
+  if ((flags & ARES_NI_NUMERICSCOPE) ||
+      (!IN6_IS_ADDR_LINKLOCAL(&addr6->sin6_addr)
+       && !IN6_IS_ADDR_MC_LINKLOCAL(&addr6->sin6_addr)))
+    {
+       sprintf(&tmpbuf[1], fmt, addr6->sin6_scope_id);
+    }
+  else
+    {
+      if (if_indextoname(addr6->sin6_scope_id, &tmpbuf[1]) == NULL)
+        sprintf(&tmpbuf[1], fmt, addr6->sin6_scope_id);
+    }
+#else
+  sprintf(&tmpbuf[1], fmt, addr6->sin6_scope_id);
+  (void) flags;
+#endif
+  tmpbuf[IF_NAMESIZE + 1] = '\0';
+  bufl = strlen(buf);
+
+  if(bufl + strlen(tmpbuf) < buflen)
+    /* only append the scopeid string if it fits in the target buffer */
+    strcpy(&buf[bufl], tmpbuf);
+}
+#endif
+
+/* Determines if s1 ends with the string in s2 (case-insensitive) */
+static char *ares_striendstr(const char *s1, const char *s2)
+{
+  const char *c1, *c2, *c1_begin;
+  size_t s1_len = strlen(s1), s2_len = strlen(s2);
+
+  /* If the substr is longer than the full str, it can't match */
+  if (s2_len > s1_len)
+    return NULL;
+
+  /* Jump to the end of s1 minus the length of s2 */
+  c1_begin = s1+s1_len-s2_len;
+  c1 = (const char *)c1_begin;
+  c2 = s2;
+  while (c2 < s2+s2_len)
+    {
+      if (tolower(*c1) != tolower(*c2))
+        return NULL;
+      else
+        {
+          c1++;
+          c2++;
+        }
+    }
+  if (c2 == c1 && c2 == NULL)
+    return (char *)c1_begin;
+  return NULL;
+}
--- a/ares/ares_getsock.3
+++ b/ares/ares_getsock.3
@@ -0,0 +1,58 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by Daniel Stenberg
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_GETSOCK 3 "22 December 2005"
+.SH NAME
+ares_getsock \- get file descriptors to wait on
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_getsock(ares_channel \fIchannel\fP, int *\fIsocks\fP, 
+.B int \fInumsocks\fP);
+.fi
+.SH DESCRIPTION
+The
+.B ares_getsock
+function retrieves the set of file descriptors which the calling
+application should wait on for reading and/or writing for the
+processing of name service queries pending on the name service channel
+identified by
+.IR channel .
+File descriptors will be set in the integer array pointed to by
+\fIsocks\fP.
+\fInumsocks\fP is the size of the given array in number of ints.
+
+This function can only return information about up to 16 sockets. If more are
+in use (however unlikely that is), they are simply not reported back.
+.SH RETURN VALUES
+\fBares_getsock\fP returns a bitmask for what actions to wait for on the
+different sockets. The ares.h header file provides these convenience macros to
+extract the information appropriately:
+
+.nf
+#define ARES_GETSOCK_MAXNUM 16 /* ares_getsock() can return info about
+                                  this many sockets */
+#define ARES_GETSOCK_READABLE(bits,num) (bits & (1<< (num)))
+#define ARES_GETSOCK_WRITABLE(bits,num) (bits & (1 << ((num) + \
+                                         ARES_GETSOCK_MAXNUM)))
+.fi
+.SH NOTES
+This function was added in c-ares 1.3.1
+.SH SEE ALSO
+.BR ares_timeout (3),
+.BR ares_fds (3),
+.BR ares_process (3)
--- a/ares/ares_getsock.c
+++ b/ares/ares_getsock.c
@@ -0,0 +1,71 @@
+/* $Id$ */
+
+/* Copyright 2005 by Daniel Stenberg.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#include "setup.h"
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include "ares.h"
+#include "ares_private.h"
+
+int ares_getsock(ares_channel channel,
+                 int *s,
+                 int numsocks) /* size of the 'socks' array */
+{
+  struct server_state *server;
+  ares_socket_t nfds;
+  int i;
+  int sockindex=0;
+  int bitmap = 0;
+  unsigned int setbits = 0xffffffff;
+
+  ares_socket_t *socks = (ares_socket_t *)s;
+
+  /* No queries, no file descriptors. */
+  if (!channel->queries)
+    return 0;
+
+  nfds = 0;
+  for (i = 0; i < channel->nservers; i++)
+    {
+      server = &channel->servers[i];
+      if (server->udp_socket != ARES_SOCKET_BAD)
+        {
+          if(sockindex >= numsocks)
+            break;
+          socks[sockindex] = server->udp_socket;
+          bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
+          sockindex++;
+        }
+      if (server->tcp_socket != ARES_SOCKET_BAD)
+       {
+         if(sockindex >= numsocks)
+           break;
+         socks[sockindex] = server->tcp_socket;
+         bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
+         sockindex++;
+
+         if (server->qhead) {
+           /* then the tcp socket is also writable! */
+           bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex-1);
+         }
+
+       }
+    }
+  return (int)nfds;
+}
--- a/ares/ares_init.3
+++ b/ares/ares_init.3
@@ -14,7 +14,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_INIT 3 "21 July 1998"
+.TH ARES_INIT 3 "7 December 2004"
 .SH NAME
 ares_init, ares_init_options \- Initialize a resolver channel
 .SH SYNOPSIS
@@ -25,31 +25,20 @@ ares_init, ares_init_options \- Initialize a resolver channel
 .B int ares_init_options(ares_channel *\fIchannel\fP,
 .B 	struct ares_options *\fIoptions\fP, int \fIoptmask\fP)
 .PP
-.B cc file.c -lares
+.B cc file.c -lcares
 .fi
 .SH DESCRIPTION
-The
-.B ares_init
-function initializes a communications channel for name service
-lookups.  If it returns successfully,
-.B ares_init
-will set the variable pointed to by
-.I channel
-to a handle used to identify the name service channel.  The caller
-should invoke
+The \fBares_init\fP function initializes a communications channel for name
+service lookups.  If it returns successfully, \fBares_init\fP will set the
+variable pointed to by \fIchannel\fP to a handle used to identify the name
+service channel.  The caller should invoke
 .BR ares_destroy (3)
 on the handle when the channel is no longer needed.
 .PP
-The
-.B ares_init_options
-function also initializes a name service channel, with additional
-options useful for applications requiring more control over name
-service configuration.  The
-.I optmask
-parameter specifies which fields in the structure pointed to by
-.I options
-are set, as follows:
-.PP
+The \fBares_init_options\fP function also initializes a name service channel,
+with additional options useful for applications requiring more control over
+name service configuration. The \fIoptmask\fP parameter specifies which fields
+in the structure pointed to by \fIoptions\fP are set, as follows:
 .TP 18
 .B ARES_OPT_FLAGS
 .B int \fIflags\fP;
@@ -109,6 +98,24 @@ The lookups to perform for host queries.
 .I lookups
 should be set to a string of the characters "b" or "f", where "b"
 indicates a DNS lookup and "f" indicates a lookup in the hosts file.
+.TP 18
+.B ARES_OPT_SOCK_STATE_CB
+.B void (*\fIsock_state_cb\fP)(void *data, int s, int read, int write);
+.br
+.B void *\fIsock_state_cb_data\fP;
+.br
+A callback function to be invoked when a socket changes state.
+.I s
+will be passed the socket whose state has changed;
+.I read
+will be set to true if the socket should listen for read events, and
+.I write
+will be set to true if the socket should listen for write events.
+The value of
+.I sock_state_cb_data
+will be passed as the
+.I data
+argument.
 .PP
 The
 .I flags
@@ -127,9 +134,11 @@ If a truncated response to a UDP query is received, do not fall back
 to TCP; simply continue on with the truncated response.
 .TP 23
 .B ARES_FLAG_NORECURSE
-Do not set the "recursion desired" bit on outgoing queries, so that
-the name server being contacted will not try to fetch the answer from
-other servers if it doesn't know the answer locally.
+Do not set the "recursion desired" bit on outgoing queries, so that the name
+server being contacted will not try to fetch the answer from other servers if
+it doesn't know the answer locally. Be aware that ares will not do the
+recursion for you.  Recursion must be handled by the application calling ares
+if \fIARES_FLAG_NORECURSE\fP is set.
 .TP 23
 .B ARES_FLAG_STAYOPEN
 Do not close communciations sockets when the number of active queries
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -13,19 +13,35 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
+#include <iphlpapi.h>
+#include <malloc.h>
+
 #else
 #include <sys/param.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#endif

 #include <stdio.h>
 #include <stdlib.h>
@@ -35,24 +51,34 @@
 #include <errno.h>
 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"
+
+#ifdef WATT32
+#undef WIN32  /* Redefined in MingW/MSVC headers */
+#endif

 static int init_by_options(ares_channel channel, struct ares_options *options,
-			   int optmask);
+                           int optmask);
 static int init_by_environment(ares_channel channel);
 static int init_by_resolv_conf(ares_channel channel);
 static int init_by_defaults(ares_channel channel);
-static int config_domain(ares_channel channel, char *str);
-static int config_lookup(ares_channel channel, const char *str);
+
 static int config_nameserver(struct server_state **servers, int *nservers,
-			     char *str);
-static int config_sortlist(struct apattern **sortlist, int *nsort,
-			   const char *str);
+                             char *str);
 static int set_search(ares_channel channel, const char *str);
 static int set_options(ares_channel channel, const char *str);
-static char *try_config(char *s, const char *opt);
 static const char *try_option(const char *p, const char *q, const char *opt);
+#ifndef WIN32
+static int sortlist_alloc(struct apattern **sortlist, int *nsort, struct apattern *pat);
 static int ip_addr(const char *s, int len, struct in_addr *addr);
 static void natural_mask(struct apattern *pat);
+static int config_domain(ares_channel channel, char *str);
+static int config_lookup(ares_channel channel, const char *str,
+                         const char *bindch, const char *filech);
+static int config_sortlist(struct apattern **sortlist, int *nsort,
+                           const char *str);
+static char *try_config(char *s, const char *opt);
+#endif

 int ares_init(ares_channel *channelptr)
 {
@@ -60,7 +86,7 @@ int ares_init(ares_channel *channelptr)
 }

 int ares_init_options(ares_channel *channelptr, struct ares_options *options,
-		      int optmask)
+                      int optmask)
 {
  ares_channel channel;
  int i, status;
@@ -87,6 +113,7 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  channel->queries = NULL;
  channel->domains = NULL;
  channel->sortlist = NULL;
+  channel->sock_state_cb = NULL;

  /* Initialize configuration by each of the four sources, from highest
   * precedence to lowest.
@@ -102,15 +129,15 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
    {
      /* Something failed; clean up memory we may have allocated. */
      if (channel->nservers != -1)
-	free(channel->servers);
+        free(channel->servers);
      if (channel->domains)
-	{
-	  for (i = 0; i < channel->ndomains; i++)
-	    free(channel->domains[i]);
-	  free(channel->domains);
-	}
+        {
+          for (i = 0; i < channel->ndomains; i++)
+            free(channel->domains[i]);
+          free(channel->domains);
+        }
      if (channel->sortlist)
-	free(channel->sortlist);
+        free(channel->sortlist);
      if(channel->lookups)
        free(channel->lookups);
      free(channel);
@@ -125,8 +152,8 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  for (i = 0; i < channel->nservers; i++)
    {
      server = &channel->servers[i];
-      server->udp_socket = -1;
-      server->tcp_socket = -1;
+      server->udp_socket = ARES_SOCKET_BAD;
+      server->tcp_socket = ARES_SOCKET_BAD;
      server->tcp_lenbuf_pos = 0;
      server->tcp_buffer = NULL;
      server->qhead = NULL;
@@ -149,7 +176,7 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
 }

 static int init_by_options(ares_channel channel, struct ares_options *options,
-			   int optmask)
+                           int optmask)
 {
  int i;

@@ -166,16 +193,21 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
    channel->udp_port = options->udp_port;
  if ((optmask & ARES_OPT_TCP_PORT) && channel->tcp_port == -1)
    channel->tcp_port = options->tcp_port;
+  if ((optmask & ARES_OPT_SOCK_STATE_CB) && channel->sock_state_cb == NULL)
+    {
+      channel->sock_state_cb = options->sock_state_cb;
+      channel->sock_state_cb_data = options->sock_state_cb_data;
+    }

  /* Copy the servers, if given. */
  if ((optmask & ARES_OPT_SERVERS) && channel->nservers == -1)
    {
      channel->servers =
-	malloc(options->nservers * sizeof(struct server_state));
+        malloc(options->nservers * sizeof(struct server_state));
      if (!channel->servers && options->nservers != 0)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
      for (i = 0; i < options->nservers; i++)
-	channel->servers[i].addr = options->servers[i];
+        channel->servers[i].addr = options->servers[i];
      channel->nservers = options->nservers;
    }

@@ -186,14 +218,14 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
    {
      channel->domains = malloc(options->ndomains * sizeof(char *));
      if (!channel->domains && options->ndomains != 0)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
      for (i = 0; i < options->ndomains; i++)
-	{
-	  channel->ndomains = i;
-	  channel->domains[i] = strdup(options->domains[i]);
-	  if (!channel->domains[i])
-	    return ARES_ENOMEM;
-	}
+        {
+          channel->ndomains = i;
+          channel->domains[i] = strdup(options->domains[i]);
+          if (!channel->domains[i])
+            return ARES_ENOMEM;
+        }
      channel->ndomains = options->ndomains;
    }

@@ -202,7 +234,7 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
    {
      channel->lookups = strdup(options->lookups);
      if (!channel->lookups)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
    }

  return ARES_SUCCESS;
@@ -218,7 +250,7 @@ static int init_by_environment(ares_channel channel)
    {
      status = set_search(channel, localdomain);
      if (status != ARES_SUCCESS)
-	return status;
+        return status;
    }

  res_options = getenv("RES_OPTIONS");
@@ -226,31 +258,32 @@ static int init_by_environment(ares_channel channel)
    {
      status = set_options(channel, res_options);
      if (status != ARES_SUCCESS)
-	return status;
+        return status;
    }

  return ARES_SUCCESS;
 }
-#ifdef WIN32
-static int get_res_size_nt(HKEY hKey, char *subkey, int *size)
-{
-  return RegQueryValueEx(hKey, subkey, 0, NULL, NULL, size);
-}

-/* Warning: returns a dynamically allocated buffer, the user MUST
+#ifdef WIN32
+/*
+ * Warning: returns a dynamically allocated buffer, the user MUST
 * use free() if the function returns 1
 */
-static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
+static int get_res_nt(HKEY hKey, const char *subkey, char **obuf)
 {
  /* Test for the size we need */
-  int size = 0;
+  DWORD size = 0;
  int result;
+
  result = RegQueryValueEx(hKey, subkey, 0, NULL, NULL, &size);
  if ((result != ERROR_SUCCESS && result != ERROR_MORE_DATA) || !size)
    return 0;
  *obuf = malloc(size+1);
+  if (!*obuf)
+    return 0;

-  if (RegQueryValueEx(hKey, subkey, 0, NULL, *obuf, &size) != ERROR_SUCCESS)
+  if (RegQueryValueEx(hKey, subkey, 0, NULL,
+                      (LPBYTE)*obuf, &size) != ERROR_SUCCESS)
  {
    free(*obuf);
    return 0;
@@ -263,54 +296,132 @@ static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
  return 1;
 }

-static int get_res_interfaces_nt(HKEY hKey, char *subkey, char **obuf)
+static int get_res_interfaces_nt(HKEY hKey, const char *subkey, char **obuf)
 {
  char enumbuf[39]; /* GUIDs are 38 chars + 1 for NULL */
-  int enum_size = 39;
+  DWORD enum_size = 39;
  int idx = 0;
  HKEY hVal;
+
  while (RegEnumKeyEx(hKey, idx++, enumbuf, &enum_size, 0,
                      NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS)
  {
+    int rc;
+
    enum_size = 39;
    if (RegOpenKeyEx(hKey, enumbuf, 0, KEY_QUERY_VALUE, &hVal) !=
        ERROR_SUCCESS)
      continue;
-    if (!get_res_nt(hVal, subkey, obuf))
-      RegCloseKey(hVal);
-    else
-    {
+    rc = get_res_nt(hVal, subkey, obuf);
      RegCloseKey(hVal);
+    if (rc)
      return 1;
    }
-  }
  return 0;
 }
+
+static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
+{
+  FIXED_INFO    *fi   = alloca (sizeof(*fi));
+  DWORD          size = sizeof (*fi);
+  typedef DWORD (WINAPI* get_net_param_func) (FIXED_INFO*, DWORD*);
+  get_net_param_func GetNetworkParams;  /* available only on Win-98/2000+ */
+  HMODULE        handle;
+  IP_ADDR_STRING *ipAddr;
+  int            i, count = 0;
+  int            debug  = 0;
+  size_t         ip_size = sizeof("255.255.255.255,")-1;
+  size_t         left = ret_size;
+  char          *ret = ret_buf;
+  HRESULT        res;
+
+  if (!fi)
+     return (0);
+
+  handle = LoadLibrary ("iphlpapi.dll");
+  if (!handle)
+     return (0);
+
+  GetNetworkParams = (get_net_param_func) GetProcAddress (handle, "GetNetworkParams");
+  if (!GetNetworkParams)
+     goto quit;
+
+  res = (*GetNetworkParams) (fi, &size);
+  if ((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS))
+     goto quit;
+
+  fi = alloca (size);
+  if (!fi || (*GetNetworkParams) (fi, &size) != ERROR_SUCCESS)
+     goto quit;
+
+  if (debug)
+  {
+    printf ("Host Name: %s\n", fi->HostName);
+    printf ("Domain Name: %s\n", fi->DomainName);
+    printf ("DNS Servers:\n"
+            "    %s (primary)\n", fi->DnsServerList.IpAddress.String);
+  }
+  if (inet_addr(fi->DnsServerList.IpAddress.String) != INADDR_NONE &&
+      left > ip_size)
+  {
+    ret += sprintf (ret, "%s,", fi->DnsServerList.IpAddress.String);
+    left -= ret - ret_buf;
+    count++;
+  }
+
+  for (i = 0, ipAddr = fi->DnsServerList.Next; ipAddr && left > ip_size;
+       ipAddr = ipAddr->Next, i++)
+  {
+    if (inet_addr(ipAddr->IpAddress.String) != INADDR_NONE)
+    {
+       ret += sprintf (ret, "%s,", ipAddr->IpAddress.String);
+       left -= ret - ret_buf;
+       count++;
+    }
+    if (debug)
+       printf ("    %s (secondary %d)\n", ipAddr->IpAddress.String, i+1);
+  }
+
+quit:
+  if (handle)
+     FreeLibrary (handle);
+
+  if (debug && left <= ip_size)
+     printf ("Too many nameservers. Truncating to %d addressess", count);
+  if (ret > ret_buf)
+     ret[-1] = '\0';
+  return (count);
+}
 #endif

 static int init_by_resolv_conf(ares_channel channel)
 {
  char *line = NULL;
-  int status, nservers = 0, nsort = 0;
+  int status = -1, nservers = 0, nsort = 0;
  struct server_state *servers = NULL;
  struct apattern *sortlist = NULL;

 #ifdef WIN32

    /*
+  NameServer info via IPHLPAPI (IP helper API):
+    GetNetworkParams() should be the trusted source for this.
+    Available in Win-98/2000 and later. If that fail, fall-back to
+    registry information.
+
  NameServer Registry:

   On Windows 9X, the DNS server can be found in:
 HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\VxD\MSTCP\NameServer

-	On Windows NT/2000/XP/2003:
+        On Windows NT/2000/XP/2003:
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\NameServer
-	or
+        or
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\DhcpNameServer
-	or
+        or
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\
 NameServer
-	or
+        or
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\
 DhcpNameServer
   */
@@ -320,11 +431,19 @@ DhcpNameServer
  DWORD data_type;
  DWORD bytes;
  DWORD result;
-  DWORD keysize = MAX_PATH;
+  char  buf[256];

-  status = ARES_EFILE;
+  if (channel->nservers > -1)  /* don't override ARES_OPT_SERVER */
+     return ARES_SUCCESS;

-  if (IsNT) 
+  if (get_iphlpapi_dns_info(buf,sizeof(buf)) > 0)
+  {
+    status = config_nameserver(&servers, &nservers, buf);
+    if (status == ARES_SUCCESS)
+      goto okay;
+  }
+
+  if (IS_NT())
  {
    if (RegOpenKeyEx(
          HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
@@ -368,7 +487,7 @@ DhcpNameServer
      if ((result = RegQueryValueEx(
             mykey, NAMESERVER, NULL, &data_type,
             NULL, &bytes
-             ) 
+             )
            ) == ERROR_SUCCESS ||
          result == ERROR_MORE_DATA)
      {
@@ -384,27 +503,20 @@ DhcpNameServer
          free(line);
        }
      }
-    } 
+    }
    RegCloseKey(mykey);
  }
-  
-  if (status != ARES_EFILE)
-  {
-    /*
-      if (!channel->lookups) {
-      status = config_lookup(channel, "file bind");
-      }
-    */
-    status = ARES_EOF;
-  }

-#elif defined(riscos)
+  if (status == ARES_SUCCESS)
+    status = ARES_EOF;
+
+#elif defined(__riscos__)

  /* Under RISC OS, name servers are listed in the
     system variable Inet$Resolvers, space separated. */

  line = getenv("Inet$Resolvers");
-  status = ARES_EFILE;
+  status = ARES_EOF;
  if (line) {
    char *resolvers = strdup(line), *pos, *space;

@@ -424,16 +536,34 @@ DhcpNameServer

    if (status == ARES_SUCCESS)
      status = ARES_EOF;
-    
+
    free(resolvers);
  }

+#elif defined(WATT32)
+  int i;
+
+  sock_init();
+  for (i = 0; def_nameservers[i]; i++)
+      ;
+  if (i == 0)
+    return ARES_SUCCESS; /* use localhost DNS server */
+
+  nservers = i;
+  servers = calloc(sizeof(*servers), i);
+  if (!servers)
+     return ARES_ENOMEM;
+
+  for (i = 0; def_nameservers[i]; i++)
+      servers[i].addr.s_addr = htonl(def_nameservers[i]);
+  status = ARES_EOF;
+
 #else
  {
    char *p;
    FILE *fp;
    int linesize;
-   
+
    fp = fopen(PATH_RESOLV_CONF, "r");
    if (!fp)
      return (errno == ENOENT) ? ARES_SUCCESS : ARES_EFILE;
@@ -442,7 +572,7 @@ DhcpNameServer
      if ((p = try_config(line, "domain")))
        status = config_domain(channel, p);
      else if ((p = try_config(line, "lookup")) && !channel->lookups)
-        status = config_lookup(channel, p);
+        status = config_lookup(channel, p, "bind", "file");
      else if ((p = try_config(line, "search")))
        status = set_search(channel, p);
      else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
@@ -456,9 +586,49 @@ DhcpNameServer
      if (status != ARES_SUCCESS)
        break;
    }
+    fclose(fp);
+
+    if (!channel->lookups) {
+      /* Many systems (Solaris, Linux, BSD's) use nsswitch.conf */
+      fp = fopen("/etc/nsswitch.conf", "r");
+      if (fp) {
+        while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+        {
+          if ((p = try_config(line, "hosts:")) && !channel->lookups)
+            status = config_lookup(channel, p, "dns", "files");
+        }
+        fclose(fp);
+      }
+    }
+
+    if (!channel->lookups) {
+      /* Linux / GNU libc 2.x and possibly others have host.conf */
+      fp = fopen("/etc/host.conf", "r");
+      if (fp) {
+        while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+        {
+          if ((p = try_config(line, "order")) && !channel->lookups)
+            status = config_lookup(channel, p, "bind", "hosts");
+        }
+        fclose(fp);
+      }
+    }
+
+    if (!channel->lookups) {
+      /* Tru64 uses /etc/svc.conf */
+      fp = fopen("/etc/svc.conf", "r");
+      if (fp) {
+        while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+        {
+          if ((p = try_config(line, "hosts=")) && !channel->lookups)
+            status = config_lookup(channel, p, "bind", "local");
+        }
+        fclose(fp);
+      }
+    }
+
    if(line)
      free(line);
-    fclose(fp);
  }

 #endif
@@ -474,6 +644,9 @@ DhcpNameServer
    }

  /* If we got any name server entries, fill them in. */
+#ifdef WIN32
+okay:
+#endif
  if (servers)
    {
      channel->servers = servers;
@@ -512,7 +685,7 @@ static int init_by_defaults(ares_channel channel)
      /* If nobody specified servers, try a local named. */
      channel->servers = malloc(sizeof(struct server_state));
      if (!channel->servers)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
      channel->servers[0].addr.s_addr = htonl(INADDR_LOOPBACK);
      channel->nservers = 1;
    }
@@ -523,22 +696,22 @@ static int init_by_defaults(ares_channel channel)
       * or set it to empty if the hostname isn't helpful.
       */
      if (gethostname(hostname, sizeof(hostname)) == -1
-	  || !strchr(hostname, '.'))
-	{
-	  channel->domains = malloc(0);
-	  channel->ndomains = 0;
-	}
+          || !strchr(hostname, '.'))
+        {
+          channel->domains = malloc(0);
+          channel->ndomains = 0;
+        }
      else
-	{
-	  channel->domains = malloc(sizeof(char *));
-	  if (!channel->domains)
-	    return ARES_ENOMEM;
-	  channel->ndomains = 0;
-	  channel->domains[0] = strdup(strchr(hostname, '.') + 1);
-	  if (!channel->domains[0])
-	    return ARES_ENOMEM;
-	  channel->ndomains = 1;
-	}
+        {
+          channel->domains = malloc(sizeof(char *));
+          if (!channel->domains)
+            return ARES_ENOMEM;
+          channel->ndomains = 0;
+          channel->domains[0] = strdup(strchr(hostname, '.') + 1);
+          if (!channel->domains[0])
+            return ARES_ENOMEM;
+          channel->ndomains = 1;
+        }
    }

  if (channel->nsort == -1)
@@ -549,14 +722,15 @@ static int init_by_defaults(ares_channel channel)

  if (!channel->lookups)
    {
-      channel->lookups = strdup("bf");
+      channel->lookups = strdup("fb");
      if (!channel->lookups)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
    }

  return ARES_SUCCESS;
 }

+#ifndef WIN32
 static int config_domain(ares_channel channel, char *str)
 {
  char *q;
@@ -569,7 +743,8 @@ static int config_domain(ares_channel channel, char *str)
  return set_search(channel, str);
 }

-static int config_lookup(ares_channel channel, const char *str)
+static int config_lookup(ares_channel channel, const char *str,
+                         const char *bindch, const char *filech)
 {
  char lookups[3], *l;
  const char *p;
@@ -582,20 +757,24 @@ static int config_lookup(ares_channel channel, const char *str)
  p = str;
  while (*p)
    {
-      if ((*p == 'b' || *p == 'f') && l < lookups + 2)
-	*l++ = *p;
-      while (*p && !isspace((unsigned char)*p))
-	p++;
-      while (isspace((unsigned char)*p))
-	p++;
+      if ((*p == *bindch || *p == *filech) && l < lookups + 2) {
+        if (*p == *bindch) *l++ = 'b';
+        else *l++ = 'f';
+      }
+      while (*p && !isspace((unsigned char)*p) && (*p != ','))
+        p++;
+      while (*p && (isspace((unsigned char)*p) || (*p == ',')))
+        p++;
    }
  *l = 0;
  channel->lookups = strdup(lookups);
  return (channel->lookups) ? ARES_SUCCESS : ARES_ENOMEM;
 }

+#endif
+
 static int config_nameserver(struct server_state **servers, int *nservers,
-			     char *str)
+                             char *str)
 {
  struct in_addr addr;
  struct server_state *newserv;
@@ -655,52 +834,88 @@ static int config_nameserver(struct server_state **servers, int *nservers,
  return ARES_SUCCESS;
 }

+#ifndef WIN32
 static int config_sortlist(struct apattern **sortlist, int *nsort,
-			   const char *str)
+                           const char *str)
 {
-  struct apattern pat, *newsort;
+  struct apattern pat;
  const char *q;

  /* Add sortlist entries. */
  while (*str && *str != ';')
    {
+      int bits;
+      char ipbuf[16], ipbufpfx[32];
+      /* Find just the IP */
      q = str;
      while (*q && *q != '/' && *q != ';' && !isspace((unsigned char)*q))
-	q++;
-      if (ip_addr(str, (int)(q - str), &pat.addr) == 0)
-	{
-	  /* We have a pattern address; now determine the mask. */
-	  if (*q == '/')
-	    {
-	      str = q + 1;
-	      while (*q && *q != ';' && !isspace((unsigned char)*q))
-		q++;
-	      if (ip_addr(str, (int)(q - str), &pat.mask) != 0)
-		natural_mask(&pat);
-	    }
-	  else
-	    natural_mask(&pat);
-
-	  /* Add this pattern to our list. */
-	  newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern));
-	  if (!newsort)
-	    return ARES_ENOMEM;
-	  newsort[*nsort] = pat;
-	  *sortlist = newsort;
-	  (*nsort)++;
-	}
+        q++;
+      memcpy(ipbuf, str, (int)(q-str));
+      ipbuf[(int)(q-str)] = 0;
+      /* Find the prefix */
+      if (*q == '/')
+        {
+          const char *str2 = q+1;
+          while (*q && *q != ';' && !isspace((unsigned char)*q))
+            q++;
+          memcpy(ipbufpfx, str, (int)(q-str));
+          ipbufpfx[(int)(q-str)] = 0;
+          str = str2;
+        }
      else
-	{
-	  while (*q && *q != ';' && !isspace((unsigned char)*q))
-	    q++;
-	}
+        ipbufpfx[0] = 0;
+      /* Lets see if it is CIDR */
+      /* First we'll try IPv6 */
+      if ((bits = ares_inet_net_pton(AF_INET6, ipbufpfx ? ipbufpfx : ipbuf,
+                                     &pat.addr.addr6,
+                                     sizeof(pat.addr.addr6))) > 0)
+        {
+          pat.type = PATTERN_CIDR;
+          pat.mask.bits = bits;
+          pat.family = AF_INET6;
+          if (!sortlist_alloc(sortlist, nsort, &pat))
+            return ARES_ENOMEM;
+        }
+      if (ipbufpfx &&
+          (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addr.addr4,
+                                     sizeof(pat.addr.addr4))) > 0)
+        {
+          pat.type = PATTERN_CIDR;
+          pat.mask.bits = bits;
+          pat.family = AF_INET;
+          if (!sortlist_alloc(sortlist, nsort, &pat))
+            return ARES_ENOMEM;
+        }
+      /* See if it is just a regular IP */
+      else if (ip_addr(ipbuf, (int)(q-str), &pat.addr.addr4) == 0)
+        {
+          if (ipbufpfx)
+            {
+              memcpy(ipbuf, str, (int)(q-str));
+              ipbuf[(int)(q-str)] = 0;
+              if (ip_addr(ipbuf, (int)(q - str), &pat.mask.addr.addr4) != 0)
+                natural_mask(&pat);
+            }
+          else
+            natural_mask(&pat);
+          pat.family = AF_INET;
+          pat.type = PATTERN_MASK;
+          if (!sortlist_alloc(sortlist, nsort, &pat))
+            return ARES_ENOMEM;
+        }
+      else
+        {
+          while (*q && *q != ';' && !isspace((unsigned char)*q))
+            q++;
+        }
      str = q;
      while (isspace((unsigned char)*str))
-	str++;
+        str++;
    }

  return ARES_SUCCESS;
 }
+#endif

 static int set_search(ares_channel channel, const char *str)
 {
@@ -721,9 +936,9 @@ static int set_search(ares_channel channel, const char *str)
  while (*p)
    {
      while (*p && !isspace((unsigned char)*p))
-	p++;
+        p++;
      while (isspace((unsigned char)*p))
-	p++;
+        p++;
      n++;
    }

@@ -739,15 +954,15 @@ static int set_search(ares_channel channel, const char *str)
      channel->ndomains = n;
      q = p;
      while (*q && !isspace((unsigned char)*q))
-	q++;
+        q++;
      channel->domains[n] = malloc(q - p + 1);
      if (!channel->domains[n])
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
      memcpy(channel->domains[n], p, q - p);
      channel->domains[n][q - p] = 0;
      p = q;
      while (isspace((unsigned char)*p))
-	p++;
+        p++;
      n++;
    }
  channel->ndomains = n;
@@ -764,24 +979,25 @@ static int set_options(ares_channel channel, const char *str)
    {
      q = p;
      while (*q && !isspace((unsigned char)*q))
-	q++;
+        q++;
      val = try_option(p, q, "ndots:");
      if (val && channel->ndots == -1)
-	channel->ndots = atoi(val);
+        channel->ndots = atoi(val);
      val = try_option(p, q, "retrans:");
      if (val && channel->timeout == -1)
-	channel->timeout = atoi(val);
+        channel->timeout = atoi(val);
      val = try_option(p, q, "retry:");
      if (val && channel->tries == -1)
-	channel->tries = atoi(val);
+        channel->tries = atoi(val);
      p = q;
      while (isspace((unsigned char)*p))
-	p++;
+        p++;
    }

  return ARES_SUCCESS;
 }

+#ifndef WIN32
 static char *try_config(char *s, const char *opt)
 {
  size_t len;
@@ -795,21 +1011,34 @@ static char *try_config(char *s, const char *opt)
  return s;
 }

+#endif
+
 static const char *try_option(const char *p, const char *q, const char *opt)
 {
  size_t len = strlen(opt);
  return ((size_t)(q - p) > len && !strncmp(p, opt, len)) ? &p[len] : NULL;
 }

-static int ip_addr(const char *s, int len, struct in_addr *addr)
+#ifndef WIN32
+static int sortlist_alloc(struct apattern **sortlist, int *nsort,
+                          struct apattern *pat)
+{
+  struct apattern *newsort;
+  newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern));
+  if (!newsort)
+    return 0;
+  newsort[*nsort] = *pat;
+  *sortlist = newsort;
+  (*nsort)++;
+  return 1;
+}
+
+static int ip_addr(const char *ipbuf, int len, struct in_addr *addr)
 {
-  char ipbuf[16];

  /* Four octets and three periods yields at most 15 characters. */
  if (len > 15)
    return -1;
-  memcpy(ipbuf, s, len);
-  ipbuf[len] = 0;

  addr->s_addr = inet_addr(ipbuf);
  if (addr->s_addr == INADDR_NONE && strcmp(ipbuf, "255.255.255.255") != 0)
@@ -824,15 +1053,16 @@ static void natural_mask(struct apattern *pat)
  /* Store a host-byte-order copy of pat in a struct in_addr.  Icky,
   * but portable.
   */
-  addr.s_addr = ntohl(pat->addr.s_addr);
+  addr.s_addr = ntohl(pat->addr.addr4.s_addr);

  /* This is out of date in the CIDR world, but some people might
   * still rely on it.
   */
  if (IN_CLASSA(addr.s_addr))
-    pat->mask.s_addr = htonl(IN_CLASSA_NET);
+    pat->mask.addr.addr4.s_addr = htonl(IN_CLASSA_NET);
  else if (IN_CLASSB(addr.s_addr))
-    pat->mask.s_addr = htonl(IN_CLASSB_NET);
+    pat->mask.addr.addr4.s_addr = htonl(IN_CLASSB_NET);
  else
-    pat->mask.s_addr = htonl(IN_CLASSC_NET);
+    pat->mask.addr.addr4.s_addr = htonl(IN_CLASSC_NET);
 }
+#endif
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -0,0 +1,81 @@
+/* $Id$ */
+
+/*
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef ARES_IPV6_H
+#define ARES_IPV6_H
+
+#ifndef HAVE_PF_INET6
+#define PF_INET6 AF_INET6
+#endif
+
+#ifndef HAVE_STRUCT_IN6_ADDR
+struct in6_addr
+{
+  unsigned char s6_addr[16];
+};
+#endif
+
+#ifndef HAVE_STRUCT_SOCKADDR_IN6
+struct sockaddr_in6
+{
+  unsigned short  sin6_family;
+  unsigned short  sin6_port;
+  unsigned long   sin6_flowinfo;
+  struct in6_addr sin6_addr;
+  unsigned int    sin6_scope_id;
+};
+#endif
+
+#ifndef HAVE_STRUCT_ADDRINFO
+struct addrinfo
+{
+  int ai_flags;
+  int ai_family;
+  int ai_socktype;
+  int ai_protocol;
+  size_t ai_addrlen;
+  char *ai_cannonname;
+  struct sockaddr *ai_addr;
+  struct addrinfo *ai_next;
+};
+#endif
+
+#ifndef NS_IN6ADDRSZ
+#if SIZEOF_STRUCT_IN6_ADDR == 0
+/* We cannot have it set to zero, so we pick a fixed value here */
+#define NS_IN6ADDRSZ 16
+#else
+#define NS_IN6ADDRSZ SIZEOF_STRUCT_IN6_ADDR
+#endif
+#endif
+
+#ifndef NS_INADDRSZ
+#define NS_INADDRSZ SIZEOF_STRUCT_IN_ADDR
+#endif
+
+#ifndef NS_INT16SZ
+#define NS_INT16SZ 2
+#endif
+
+#ifndef IF_NAMESIZE
+#ifdef IFNAMSIZ
+#define IF_NAMESIZE IFNAMSIZ
+#else
+#define IF_NAMESIZE 256
+#endif
+#endif
+
+#endif /* ARES_IPV6_H */
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -13,13 +13,17 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdlib.h>
@@ -46,15 +50,15 @@
 *
 * AA, TC, RA, and RCODE are only set in responses.  Brief description
 * of the remaining fields:
- *	ID	Identifier to match responses with queries
- *	QR	Query (0) or response (1)
- *	Opcode	For our purposes, always QUERY
- * 	RD	Recursion desired
- *	Z	Reserved (zero)
- *	QDCOUNT	Number of queries
- *	ANCOUNT	Number of answers
- *	NSCOUNT	Number of name server records
- *	ARCOUNT	Number of additional records
+ *      ID      Identifier to match responses with queries
+ *      QR      Query (0) or response (1)
+ *      Opcode  For our purposes, always QUERY
+ *      RD      Recursion desired
+ *      Z       Reserved (zero)
+ *      QDCOUNT Number of queries
+ *      ANCOUNT Number of answers
+ *      NSCOUNT Number of name server records
+ *      ARCOUNT Number of additional records
 *
 * Question format, from RFC 1035:
 *                                  1  1  1  1  1  1
@@ -76,7 +80,7 @@
 */

 int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
-		 int rd, unsigned char **buf, int *buflen)
+                 int rd, unsigned char **buf, int *buflen)
 {
  int len;
  unsigned char *q;
@@ -88,7 +92,7 @@ int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
  for (p = name; *p; p++)
    {
      if (*p == '\\' && *(p + 1) != 0)
-	p++;
+        p++;
      len++;
    }
  /* If there are n periods in the name, there are n + 1 labels, and
@@ -120,31 +124,31 @@ int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
  while (*name)
    {
      if (*name == '.')
-	return ARES_EBADNAME;
+        return ARES_EBADNAME;

      /* Count the number of bytes in this label. */
      len = 0;
      for (p = name; *p && *p != '.'; p++)
-	{
-	  if (*p == '\\' && *(p + 1) != 0)
-	    p++;
-	  len++;
-	}
+        {
+          if (*p == '\\' && *(p + 1) != 0)
+            p++;
+          len++;
+        }
      if (len > MAXLABEL)
-	return ARES_EBADNAME;
+        return ARES_EBADNAME;

      /* Encode the length and copy the data. */
      *q++ = len;
      for (p = name; *p && *p != '.'; p++)
-	{
-	  if (*p == '\\' && *(p + 1) != 0)
-	    p++;
-	  *q++ = *p;
-	}
+        {
+          if (*p == '\\' && *(p + 1) != 0)
+            p++;
+          *q++ = *p;
+        }

      /* Go to the next label and repeat, unless we hit the end. */
      if (!*p)
-	break;
+        break;
      name = p + 1;
    }

--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -23,6 +24,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdlib.h>
@@ -32,7 +36,7 @@
 #include "ares_private.h"

 int ares_parse_a_reply(const unsigned char *abuf, int alen,
-		       struct hostent **host)
+                       struct hostent **host)
 {
  unsigned int qdcount, ancount;
  int status, i, rr_type, rr_class, rr_len, naddrs;
@@ -91,49 +95,49 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
      /* Decode the RR up to the data field. */
      status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
      if (status != ARES_SUCCESS)
-	break;
+        break;
      aptr += len;
      if (aptr + RRFIXEDSZ > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
      rr_type = DNS_RR_TYPE(aptr);
      rr_class = DNS_RR_CLASS(aptr);
      rr_len = DNS_RR_LEN(aptr);
      aptr += RRFIXEDSZ;

      if (rr_class == C_IN && rr_type == T_A
-	  && rr_len == sizeof(struct in_addr)
-	  && strcasecmp(rr_name, hostname) == 0)
-	{
-	  memcpy(&addrs[naddrs], aptr, sizeof(struct in_addr));
-	  naddrs++;
-	  status = ARES_SUCCESS;
-	}
+          && rr_len == sizeof(struct in_addr)
+          && strcasecmp(rr_name, hostname) == 0)
+        {
+          memcpy(&addrs[naddrs], aptr, sizeof(struct in_addr));
+          naddrs++;
+          status = ARES_SUCCESS;
+        }

      if (rr_class == C_IN && rr_type == T_CNAME)
-	{
-	  /* Record the RR name as an alias. */
-	  aliases[naliases] = rr_name;
-	  naliases++;
+        {
+          /* Record the RR name as an alias. */
+          aliases[naliases] = rr_name;
+          naliases++;

-	  /* Decode the RR data and replace the hostname with it. */
-	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
-	  if (status != ARES_SUCCESS)
-	    break;
-	  free(hostname);
-	  hostname = rr_data;
-	}
+          /* Decode the RR data and replace the hostname with it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          free(hostname);
+          hostname = rr_data;
+        }
      else
-	free(rr_name);
+        free(rr_name);

      aptr += rr_len;
      if (aptr > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
    }

  if (status == ARES_SUCCESS && naddrs == 0)
@@ -144,23 +148,23 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
      aliases[naliases] = NULL;
      hostent = malloc(sizeof(struct hostent));
      if (hostent)
-	{
-	  hostent->h_addr_list = malloc((naddrs + 1) * sizeof(char *));
-	  if (hostent->h_addr_list)
-	    {
-	      /* Fill in the hostent and return successfully. */
-	      hostent->h_name = hostname;
-	      hostent->h_aliases = aliases;
-	      hostent->h_addrtype = AF_INET;
-	      hostent->h_length = sizeof(struct in_addr);
-	      for (i = 0; i < naddrs; i++)
-		hostent->h_addr_list[i] = (char *) &addrs[i];
-	      hostent->h_addr_list[naddrs] = NULL;
-	      *host = hostent;
-	      return ARES_SUCCESS;
-	    }
-	  free(hostent);
-	}
+        {
+          hostent->h_addr_list = malloc((naddrs + 1) * sizeof(char *));
+          if (hostent->h_addr_list)
+            {
+              /* Fill in the hostent and return successfully. */
+              hostent->h_name = hostname;
+              hostent->h_aliases = aliases;
+              hostent->h_addrtype = AF_INET;
+              hostent->h_length = sizeof(struct in_addr);
+              for (i = 0; i < naddrs; i++)
+                hostent->h_addr_list[i] = (char *) &addrs[i];
+              hostent->h_addr_list[naddrs] = NULL;
+              *host = hostent;
+              return ARES_SUCCESS;
+            }
+          free(hostent);
+        }
      status = ARES_ENOMEM;
    }
  for (i = 0; i < naliases; i++)
--- a/ares/ares_parse_aaaa_reply.3
+++ b/ares/ares_parse_aaaa_reply.3
@@ -0,0 +1,64 @@
+.\" $Id$
+.\"
+.\" Copyright 2005 by Dominick Meglio.
+.\"
+.\" Permission to use, copy, modify, and distribute this
+.\" software and its documentation for any purpose and without
+.\" fee is hereby granted, provided that the above copyright
+.\" notice appear in all copies and that both that copyright
+.\" notice and this permission notice appear in supporting
+.\" documentation, and that the name of M.I.T. not be used in
+.\" advertising or publicity pertaining to distribution of the
+.\" software without specific, written prior permission.
+.\" M.I.T. makes no representations about the suitability of
+.\" this software for any purpose.  It is provided "as is"
+.\" without express or implied warranty.
+.\"
+.TH ARES_PARSE_AAAA_REPLY 3 "10 March 2005"
+.SH NAME
+ares_parse_aaaa_reply \- Parse a reply to a DNS query of type AAAA into a hostent
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_parse_aaaa_reply(const unsigned char *\fIabuf\fP, int \fIalen\fP,
+.B 	struct hostent **\fIhost\fP);
+.fi
+.SH DESCRIPTION
+The
+.B ares_parse_aaaa_reply
+function parses the response to a query of type AAAA into a
+.BR "struct hostent" .
+The parameters
+.I abuf
+and
+.I alen
+give the contents of the response.  The result is stored in allocated
+memory and a pointer to it stored into the variable pointed to by
+.IR host .
+It is the caller's responsibility to free the resulting host structure
+using
+.BR ares_free_hostent (3)
+when it is no longer needed.
+.SH RETURN VALUES
+.B ares_parse_aaaa_reply
+can return any of the following values:
+.TP 15
+.B ARES_SUCCESS
+The response was successfully parsed.
+.TP 15
+.B ARES_EBADRESP
+The response was malformatted.
+.TP 15
+.B ARES_ENODATA
+The response did not contain an answer to the query.
+.TP 15
+.B ARES_ENOMEM
+Memory was exhausted.
+.SH SEE ALSO
+.BR ares_gethostbyname (3),
+.BR ares_free_hostent (3)
+.SH AUTHOR
+Dominick Meglio
+.br
+Copyright 2005 by Dominick Meglio.
--- a/ares/ares_parse_aaaa_reply.c
+++ b/ares/ares_parse_aaaa_reply.c
@@ -0,0 +1,179 @@
+/* Copyright 2005 Dominick Meglio
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#include "setup.h"
+#include <sys/types.h>
+
+#if defined(WIN32) && !defined(WATT32)
+#include "nameser.h"
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "inet_net_pton.h"
+#include "ares_private.h"
+
+int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
+                       struct hostent **host)
+{
+  unsigned int qdcount, ancount;
+  int status, i, rr_type, rr_class, rr_len, naddrs;
+  int naliases;
+  long len;
+  const unsigned char *aptr;
+  char *hostname, *rr_name, *rr_data, **aliases;
+  struct in6_addr *addrs;
+  struct hostent *hostent;
+
+  /* Set *host to NULL for all failure cases. */
+  *host = NULL;
+
+  /* Give up if abuf doesn't have room for a header. */
+  if (alen < HFIXEDSZ)
+    return ARES_EBADRESP;
+
+  /* Fetch the question and answer count from the header. */
+  qdcount = DNS_HEADER_QDCOUNT(abuf);
+  ancount = DNS_HEADER_ANCOUNT(abuf);
+  if (qdcount != 1)
+    return ARES_EBADRESP;
+
+  /* Expand the name from the question, and skip past the question. */
+  aptr = abuf + HFIXEDSZ;
+  status = ares_expand_name(aptr, abuf, alen, &hostname, &len);
+  if (status != ARES_SUCCESS)
+    return status;
+  if (aptr + len + QFIXEDSZ > abuf + alen)
+    {
+      free(hostname);
+      return ARES_EBADRESP;
+    }
+  aptr += len + QFIXEDSZ;
+
+  /* Allocate addresses and aliases; ancount gives an upper bound for both. */
+  addrs = malloc(ancount * sizeof(struct in6_addr));
+  if (!addrs)
+    {
+      free(hostname);
+      return ARES_ENOMEM;
+    }
+  aliases = malloc((ancount + 1) * sizeof(char *));
+  if (!aliases)
+    {
+      free(hostname);
+      free(addrs);
+      return ARES_ENOMEM;
+    }
+  naddrs = 0;
+  naliases = 0;
+
+  /* Examine each answer resource record (RR) in turn. */
+  for (i = 0; i < (int)ancount; i++)
+    {
+      /* Decode the RR up to the data field. */
+      status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
+      if (status != ARES_SUCCESS)
+        break;
+      aptr += len;
+      if (aptr + RRFIXEDSZ > abuf + alen)
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
+      rr_type = DNS_RR_TYPE(aptr);
+      rr_class = DNS_RR_CLASS(aptr);
+      rr_len = DNS_RR_LEN(aptr);
+      aptr += RRFIXEDSZ;
+
+      if (rr_class == C_IN && rr_type == T_AAAA
+          && rr_len == sizeof(struct in6_addr)
+          && strcasecmp(rr_name, hostname) == 0)
+        {
+          memcpy(&addrs[naddrs], aptr, sizeof(struct in6_addr));
+          naddrs++;
+          status = ARES_SUCCESS;
+        }
+
+      if (rr_class == C_IN && rr_type == T_CNAME)
+        {
+          /* Record the RR name as an alias. */
+          aliases[naliases] = rr_name;
+          naliases++;
+
+          /* Decode the RR data and replace the hostname with it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          free(hostname);
+          hostname = rr_data;
+        }
+      else
+        free(rr_name);
+
+      aptr += rr_len;
+      if (aptr > abuf + alen)
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
+    }
+
+  if (status == ARES_SUCCESS && naddrs == 0)
+    status = ARES_ENODATA;
+  if (status == ARES_SUCCESS)
+    {
+      /* We got our answer.  Allocate memory to build the host entry. */
+      aliases[naliases] = NULL;
+      hostent = malloc(sizeof(struct hostent));
+      if (hostent)
+        {
+          hostent->h_addr_list = malloc((naddrs + 1) * sizeof(char *));
+          if (hostent->h_addr_list)
+            {
+              /* Fill in the hostent and return successfully. */
+              hostent->h_name = hostname;
+              hostent->h_aliases = aliases;
+              hostent->h_addrtype = AF_INET6;
+              hostent->h_length = sizeof(struct in6_addr);
+              for (i = 0; i < naddrs; i++)
+                hostent->h_addr_list[i] = (char *) &addrs[i];
+              hostent->h_addr_list[naddrs] = NULL;
+              *host = hostent;
+              return ARES_SUCCESS;
+            }
+          free(hostent);
+        }
+      status = ARES_ENOMEM;
+    }
+  for (i = 0; i < naliases; i++)
+    free(aliases[i]);
+  free(aliases);
+  free(addrs);
+  free(hostname);
+  return status;
+}
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -13,15 +13,19 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdlib.h>
@@ -31,7 +35,7 @@
 #include "ares_private.h"

 int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
-			 int addrlen, int family, struct hostent **host)
+                         int addrlen, int family, struct hostent **host)
 {
  unsigned int qdcount, ancount;
  int status, i, rr_type, rr_class, rr_len;
@@ -72,47 +76,47 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
      /* Decode the RR up to the data field. */
      status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
      if (status != ARES_SUCCESS)
-	break;
+        break;
      aptr += len;
      if (aptr + RRFIXEDSZ > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
      rr_type = DNS_RR_TYPE(aptr);
      rr_class = DNS_RR_CLASS(aptr);
      rr_len = DNS_RR_LEN(aptr);
      aptr += RRFIXEDSZ;

      if (rr_class == C_IN && rr_type == T_PTR
-	  && strcasecmp(rr_name, ptrname) == 0)
-	{
-	  /* Decode the RR data and set hostname to it. */
-	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
-	  if (status != ARES_SUCCESS)
-	    break;
-	  if (hostname)
-	    free(hostname);
-	  hostname = rr_data;
-	}
+          && strcasecmp(rr_name, ptrname) == 0)
+        {
+          /* Decode the RR data and set hostname to it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          if (hostname)
+            free(hostname);
+          hostname = rr_data;
+        }

      if (rr_class == C_IN && rr_type == T_CNAME)
-	{
-	  /* Decode the RR data and replace ptrname with it. */
-	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
-	  if (status != ARES_SUCCESS)
-	    break;
-	  free(ptrname);
-	  ptrname = rr_data;
-	}
+        {
+          /* Decode the RR data and replace ptrname with it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          free(ptrname);
+          ptrname = rr_data;
+        }

      free(rr_name);
      aptr += rr_len;
      if (aptr > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
    }

  if (status == ARES_SUCCESS && !hostname)
@@ -122,33 +126,33 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
      /* We got our answer.  Allocate memory to build the host entry. */
      hostent = malloc(sizeof(struct hostent));
      if (hostent)
-	{
-	  hostent->h_addr_list = malloc(2 * sizeof(char *));
-	  if (hostent->h_addr_list)
-	    {
-	      hostent->h_addr_list[0] = malloc(addrlen);
-	      if (hostent->h_addr_list[0])
-		{
-		  hostent->h_aliases = malloc(sizeof (char *));
-		  if (hostent->h_aliases)
-		    {
-		      /* Fill in the hostent and return successfully. */
-		      hostent->h_name = hostname;
-		      hostent->h_aliases[0] = NULL;
-		      hostent->h_addrtype = family;
-		      hostent->h_length = addrlen;
-		      memcpy(hostent->h_addr_list[0], addr, addrlen);
-		      hostent->h_addr_list[1] = NULL;
-		      *host = hostent;
-		      free(ptrname);
-		      return ARES_SUCCESS;
-		    }
-		  free(hostent->h_addr_list[0]);
-		}
-	      free(hostent->h_addr_list);
-	    }
-	  free(hostent);
-	}
+        {
+          hostent->h_addr_list = malloc(2 * sizeof(char *));
+          if (hostent->h_addr_list)
+            {
+              hostent->h_addr_list[0] = malloc(addrlen);
+              if (hostent->h_addr_list[0])
+                {
+                  hostent->h_aliases = malloc(sizeof (char *));
+                  if (hostent->h_aliases)
+                    {
+                      /* Fill in the hostent and return successfully. */
+                      hostent->h_name = hostname;
+                      hostent->h_aliases[0] = NULL;
+                      hostent->h_addrtype = family;
+                      hostent->h_length = addrlen;
+                      memcpy(hostent->h_addr_list[0], addr, addrlen);
+                      hostent->h_addr_list[1] = NULL;
+                      *host = hostent;
+                      free(ptrname);
+                      return ARES_SUCCESS;
+                    }
+                  free(hostent->h_addr_list[0]);
+                }
+              free(hostent->h_addr_list);
+            }
+          free(hostent);
+        }
      status = ARES_ENOMEM;
    }
  if (hostname)
--- a/ares/ares_private.h
+++ b/ares/ares_private.h
@@ -18,42 +18,67 @@
 #include <stdio.h>
 #include <sys/types.h>

-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <netinet/in.h>
 /* We define closesocket() here so that we can use this function all over
   the source code for closing sockets. */
 #define closesocket(x) close(x)
 #endif

-#define	DEFAULT_TIMEOUT		5
-#define DEFAULT_TRIES		4
-#ifndef INADDR_NONE
-#define	INADDR_NONE 0xffffffff
+#ifdef WATT32
+#include <tcp.h>
+#include <sys/ioctl.h>
+#undef  closesocket
+#define closesocket(s)    close_s(s)
+#define writev(s,v,c)     writev_s(s,v,c)
 #endif

-#ifdef WIN32
+#ifdef NETWARE
+#include <time.h>
+#endif

-#define IsNT ((int)GetVersion()>0)
+#define DEFAULT_TIMEOUT         5
+#define DEFAULT_TRIES           4
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
+#if defined(WIN32) && !defined(WATT32)
+
+#define IS_NT()        ((int)GetVersion() > 0)
 #define WIN_NS_9X      "System\\CurrentControlSet\\Services\\VxD\\MSTCP"
 #define WIN_NS_NT_KEY  "System\\CurrentControlSet\\Services\\Tcpip\\Parameters"
 #define NAMESERVER     "NameServer"
 #define DHCPNAMESERVER "DhcpNameServer"
-#define PATH_HOSTS_NT  "\\drivers\\etc\\hosts"
-#define PATH_HOSTS_9X  "\\hosts"
-          
+#define DATABASEPATH   "DatabasePath"
+#define WIN_PATH_HOSTS  "\\hosts"
+
+#elif defined(WATT32)
+
+#define PATH_RESOLV_CONF "/dev/ENV/etc/resolv.conf"
+
+#elif defined(NETWARE)
+
+#define PATH_RESOLV_CONF "sys:/etc/resolv.cfg"
+#define PATH_HOSTS              "sys:/etc/hosts"
+
+#elif defined(__riscos__)
+
+#define PATH_HOSTS             "InetDBase:Hosts"
+
 #else

-#define PATH_RESOLV_CONF	"/etc/resolv.conf"
+#define PATH_RESOLV_CONF        "/etc/resolv.conf"
 #ifdef ETC_INET
-#define PATH_HOSTS		"/etc/inet/hosts"
+#define PATH_HOSTS              "/etc/inet/hosts"
 #else
-#define PATH_HOSTS		"/etc/hosts"
+#define PATH_HOSTS              "/etc/hosts"
 #endif

 #endif

+#include "ares_ipv6.h"
+
 struct send_request {
  /* Remaining data to send */
  const unsigned char *data;
@@ -65,8 +90,8 @@ struct send_request {

 struct server_state {
  struct in_addr addr;
-  int udp_socket;
-  int tcp_socket;
+  ares_socket_t udp_socket;
+  ares_socket_t tcp_socket;

  /* Mini-buffer for reading the length word */
  unsigned char tcp_lenbuf[2];
@@ -109,9 +134,23 @@ struct query {
 };

 /* An IP address pattern; matches an IP address X if X & mask == addr */
+#define PATTERN_MASK 0x1
+#define PATTERN_CIDR 0x2
+
+union ares_addr {
+  struct in_addr addr4;
+  struct in6_addr addr6;
+};
+
 struct apattern {
-  struct in_addr addr;
-  struct in_addr mask;
+  union ares_addr addr;
+  union
+  {
+    union ares_addr addr;
+    unsigned short bits;
+  } mask;
+  int family;
+  unsigned short type;
 };

 struct ares_channeldata {
@@ -137,13 +176,22 @@ struct ares_channeldata {

  /* Active queries */
  struct query *queries;
+
+  ares_sock_state_cb sock_state_cb;
+  void *sock_state_cb_data;
 };

 void ares__send_query(ares_channel channel, struct query *query, time_t now);
-void ares__close_sockets(struct server_state *server);
-int ares__get_hostent(FILE *fp, struct hostent **host);
+void ares__close_sockets(ares_channel channel, struct server_state *server);
+int ares__get_hostent(FILE *fp, int family, struct hostent **host);
 int ares__read_line(FILE *fp, char **buf, int *bufsize);

+#define SOCK_STATE_CALLBACK(c, s, r, w)                                 \
+  do {                                                                  \
+    if ((c)->sock_state_cb)                                             \
+      (c)->sock_state_cb((c)->sock_state_cb_data, (s), (r), (w));       \
+  } while (0)
+
 #ifdef CURLDEBUG
 /* This is low-level hard-hacking memory leak tracking and similar. Using the
   libcurl lowlevel code from within library is ugly and only works when
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -13,44 +13,72 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
+
 #else
 #include <sys/socket.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
+#endif /* WIN32 && !WATT32 */
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef NETWARE
+#include <sys/filio.h>
+#endif

 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
+
 #include "ares.h"
 #include "ares_dns.h"
 #include "ares_private.h"

+#ifndef TRUE
+/* at least Solaris 7 does not have TRUE at this point */
+#define TRUE 1
+#endif
+
+#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
+#define GET_ERRNO()  WSAGetLastError()
+#else
+#define GET_ERRNO()  errno
+#endif
+
 static void write_tcp_data(ares_channel channel, fd_set *write_fds,
-			   time_t now);
+                           time_t now);
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now);
 static void read_udp_packets(ares_channel channel, fd_set *read_fds,
-			     time_t now);
+                             time_t now);
 static void process_timeouts(ares_channel channel, time_t now);
 static void process_answer(ares_channel channel, unsigned char *abuf,
-			   int alen, int whichserver, int tcp, int now);
+                           int alen, int whichserver, int tcp, int now);
 static void handle_error(ares_channel channel, int whichserver, time_t now);
-static void next_server(ares_channel channel, struct query *query, time_t now);
+static struct query *next_server(ares_channel channel, struct query *query, time_t now);
 static int open_tcp_socket(ares_channel channel, struct server_state *server);
 static int open_udp_socket(ares_channel channel, struct server_state *server);
 static int same_questions(const unsigned char *qbuf, int qlen,
-			  const unsigned char *abuf, int alen);
-static void end_query(ares_channel channel, struct query *query, int status,
-		      unsigned char *abuf, int alen);
+                          const unsigned char *abuf, int alen);
+static struct query *end_query(ares_channel channel, struct query *query, int status,
+                      unsigned char *abuf, int alen);

 /* Something interesting happened on the wire, or there was a timeout.
 * See what's up and respond accordingly.
@@ -74,95 +102,98 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
  struct server_state *server;
  struct send_request *sendreq;
  struct iovec *vec;
-  int i, n, count;
+  int i;
+  ssize_t scount;
+  ssize_t wcount;
+  size_t n;

  for (i = 0; i < channel->nservers; i++)
    {
      /* Make sure server has data to send and is selected in write_fds. */
      server = &channel->servers[i];
-      if (!server->qhead || server->tcp_socket == -1
-	  || !FD_ISSET(server->tcp_socket, write_fds))
-	continue;
+      if (!server->qhead || server->tcp_socket == ARES_SOCKET_BAD
+          || !FD_ISSET(server->tcp_socket, write_fds))
+        continue;

      /* Count the number of send queue items. */
      n = 0;
      for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
-	n++;
+        n++;

-#ifdef WIN32
-      vec = NULL;
-#else
      /* Allocate iovecs so we can send all our data at once. */
      vec = malloc(n * sizeof(struct iovec));
-#endif
      if (vec)
-	{
-#ifdef WIN32
-#else
-	  /* Fill in the iovecs and send. */
-	  n = 0;
-	  for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
-	    {
-	      vec[n].iov_base = (char *) sendreq->data;
-	      vec[n].iov_len = sendreq->len;
-	      n++;
-	    }
-	  count = writev(server->tcp_socket, vec, n);
-	  free(vec);
-	  if (count < 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+        {
+          /* Fill in the iovecs and send. */
+          n = 0;
+          for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
+            {
+              vec[n].iov_base = (char *) sendreq->data;
+              vec[n].iov_len = sendreq->len;
+              n++;
+            }
+          wcount = writev(server->tcp_socket, vec, n);
+          free(vec);
+          if (wcount < 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }

-	  /* Advance the send queue by as many bytes as we sent. */
-	  while (count)
-	    {
-	      sendreq = server->qhead;
-	      if ((size_t)count >= sendreq->len)
-		{
-		  count -= sendreq->len;
-		  server->qhead = sendreq->next;
-		  if (server->qhead == NULL)
-		    server->qtail = NULL;
-		  free(sendreq);
-		}
-	      else
-		{
-		  sendreq->data += count;
-		  sendreq->len -= count;
-		  break;
-		}
-	    }
-#endif
-	}
+          /* Advance the send queue by as many bytes as we sent. */
+          while (wcount)
+            {
+              sendreq = server->qhead;
+              if ((size_t)wcount >= sendreq->len)
+                {
+                  wcount -= sendreq->len;
+                  server->qhead = sendreq->next;
+                  if (server->qhead == NULL)
+                    {
+                      SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+                      server->qtail = NULL;
+                    }
+                  free(sendreq);
+                }
+              else
+                {
+                  sendreq->data += wcount;
+                  sendreq->len -= wcount;
+                  break;
+                }
+            }
+        }
      else
-	{
-	  /* Can't allocate iovecs; just send the first request. */
-	  sendreq = server->qhead;
+        {
+          /* Can't allocate iovecs; just send the first request. */
+          sendreq = server->qhead;

-          count = send(server->tcp_socket, sendreq->data, sendreq->len, 0);
+          scount = send(server->tcp_socket, (void *)sendreq->data,
+                        sendreq->len, 0);

-	  if (count < 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+          if (scount < 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }

-	  /* Advance the send queue by as many bytes as we sent. */
-	  if ((size_t)count == sendreq->len)
-	    {
-	      server->qhead = sendreq->next;
-	      if (server->qhead == NULL)
-		server->qtail = NULL;
-	      free(sendreq);
-	    }
-	  else
-	    {
-	      sendreq->data += count;
-	      sendreq->len -= count;
-	    }
-	}
+          /* Advance the send queue by as many bytes as we sent. */
+          if ((size_t)scount == sendreq->len)
+            {
+              server->qhead = sendreq->next;
+              if (server->qhead == NULL)
+                {
+                  SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+                  server->qtail = NULL;
+                }
+              free(sendreq);
+            }
+          else
+            {
+              sendreq->data += scount;
+              sendreq->len -= scount;
+            }
+        }
    }
 }

@@ -179,68 +210,70 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
    {
      /* Make sure the server has a socket and is selected in read_fds. */
      server = &channel->servers[i];
-      if (server->tcp_socket == -1 || !FD_ISSET(server->tcp_socket, read_fds))
-	continue;
+      if (server->tcp_socket == ARES_SOCKET_BAD ||
+          !FD_ISSET(server->tcp_socket, read_fds))
+        continue;

      if (server->tcp_lenbuf_pos != 2)
-	{
-	  /* We haven't yet read a length word, so read that (or
-	   * what's left to read of it).
-	   */
+        {
+          /* We haven't yet read a length word, so read that (or
+           * what's left to read of it).
+           */
          count = recv(server->tcp_socket,
-                       server->tcp_lenbuf + server->tcp_buffer_pos,
-                       2 - server->tcp_buffer_pos, 0);
-	  if (count <= 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+                       (void *)(server->tcp_lenbuf + server->tcp_lenbuf_pos),
+                       2 - server->tcp_lenbuf_pos, 0);
+          if (count <= 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }

-	  server->tcp_lenbuf_pos += count;
-	  if (server->tcp_lenbuf_pos == 2)
-	    {
-	      /* We finished reading the length word.  Decode the
+          server->tcp_lenbuf_pos += count;
+          if (server->tcp_lenbuf_pos == 2)
+            {
+              /* We finished reading the length word.  Decode the
               * length and allocate a buffer for the data.
-	       */
-	      server->tcp_length = server->tcp_lenbuf[0] << 8
-		| server->tcp_lenbuf[1];
-	      server->tcp_buffer = malloc(server->tcp_length);
-	      if (!server->tcp_buffer)
-		handle_error(channel, i, now);
-	      server->tcp_buffer_pos = 0;
-	    }
-	}
+               */
+              server->tcp_length = server->tcp_lenbuf[0] << 8
+                | server->tcp_lenbuf[1];
+              server->tcp_buffer = malloc(server->tcp_length);
+              if (!server->tcp_buffer)
+                handle_error(channel, i, now);
+              server->tcp_buffer_pos = 0;
+            }
+        }
      else
-	{
-	  /* Read data into the allocated buffer. */
-       	  count = recv(server->tcp_socket,
-		       server->tcp_buffer + server->tcp_buffer_pos,
-		       server->tcp_length - server->tcp_buffer_pos, 0);
-	  if (count <= 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+        {
+          /* Read data into the allocated buffer. */
+          count = recv(server->tcp_socket,
+                       (void *)(server->tcp_buffer + server->tcp_buffer_pos),
+                       server->tcp_length - server->tcp_buffer_pos, 0);
+          if (count <= 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }

-	  server->tcp_buffer_pos += count;
-	  if (server->tcp_buffer_pos == server->tcp_length)
-	    {
-	      /* We finished reading this answer; process it and
+          server->tcp_buffer_pos += count;
+          if (server->tcp_buffer_pos == server->tcp_length)
+            {
+              /* We finished reading this answer; process it and
               * prepare to read another length word.
-	       */
-	      process_answer(channel, server->tcp_buffer, server->tcp_length,
-			     i, 1, now);
-	      free(server->tcp_buffer);
-	      server->tcp_buffer = NULL;
-	      server->tcp_lenbuf_pos = 0;
-	    }
-	}
+               */
+              process_answer(channel, server->tcp_buffer, server->tcp_length,
+                             i, 1, now);
+          if (server->tcp_buffer)
+                        free(server->tcp_buffer);
+              server->tcp_buffer = NULL;
+              server->tcp_lenbuf_pos = 0;
+            }
+        }
    }
 }

 /* If any UDP sockets select true for reading, process them. */
 static void read_udp_packets(ares_channel channel, fd_set *read_fds,
-			     time_t now)
+                             time_t now)
 {
  struct server_state *server;
  int i, count;
@@ -251,12 +284,13 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
      /* Make sure the server has a socket and is selected in read_fds. */
      server = &channel->servers[i];

-      if (server->udp_socket == -1 || !FD_ISSET(server->udp_socket, read_fds))
-	continue;
+      if (server->udp_socket == ARES_SOCKET_BAD ||
+          !FD_ISSET(server->udp_socket, read_fds))
+        continue;

-      count = recv(server->udp_socket, buf, sizeof(buf), 0);
+      count = recv(server->udp_socket, (void *)buf, sizeof(buf), 0);
      if (count <= 0)
-	handle_error(channel, i, now);
+        handle_error(channel, i, now);

      process_answer(channel, buf, count, i, 0, now);
    }
@@ -271,16 +305,16 @@ static void process_timeouts(ares_channel channel, time_t now)
    {
      next = query->next;
      if (query->timeout != 0 && now >= query->timeout)
-	{
-	  query->error_status = ARES_ETIMEOUT;
-	  next_server(channel, query, now);
-	}
+        {
+          query->error_status = ARES_ETIMEOUT;
+          next = next_server(channel, query, now);
+        }
    }
 }

 /* Handle an answer from a server. */
 static void process_answer(ares_channel channel, unsigned char *abuf,
-			   int alen, int whichserver, int tcp, int now)
+                           int alen, int whichserver, int tcp, int now)
 {
  int id, tc, rcode;
  struct query *query;
@@ -299,7 +333,7 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
  for (query = channel->queries; query; query = query->next)
    {
      if (query->qid == id)
-	break;
+        break;
    }
  if (!query)
    return;
@@ -311,10 +345,10 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
  if ((tc || alen > PACKETSZ) && !tcp && !(channel->flags & ARES_FLAG_IGNTC))
    {
      if (!query->using_tcp)
-	{
-	  query->using_tcp = 1;
-	  ares__send_query(channel, query, now);
-	}
+        {
+          query->using_tcp = 1;
+          ares__send_query(channel, query, now);
+        }
      return;
    }

@@ -330,18 +364,18 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
  if (!(channel->flags & ARES_FLAG_NOCHECKRESP))
    {
      if (rcode == SERVFAIL || rcode == NOTIMP || rcode == REFUSED)
-	{
-	  query->skip_server[whichserver] = 1;
-	  if (query->server == whichserver)
-	    next_server(channel, query, now);
-	  return;
-	}
+        {
+          query->skip_server[whichserver] = 1;
+          if (query->server == whichserver)
+            next_server(channel, query, now);
+          return;
+        }
      if (!same_questions(query->qbuf, query->qlen, abuf, alen))
-	{
-	  if (query->server == whichserver)
-	    next_server(channel, query, now);
-	  return;
-	}
+        {
+          if (query->server == whichserver)
+            next_server(channel, query, now);
+          return;
+        }
    }

  end_query(channel, query, ARES_SUCCESS, abuf, alen);
@@ -349,45 +383,47 @@ static void process_answer(ares_channel channel, unsigned char *abuf,

 static void handle_error(ares_channel channel, int whichserver, time_t now)
 {
-  struct query *query;
+  struct query *query, *next;

  /* Reset communications with this server. */
-  ares__close_sockets(&channel->servers[whichserver]);
+  ares__close_sockets(channel, &channel->servers[whichserver]);

  /* Tell all queries talking to this server to move on and not try
   * this server again.
   */
-  for (query = channel->queries; query; query = query->next)
+
+  for (query = channel->queries; query; query = next)
    {
+      next = query->next;
      if (query->server == whichserver)
-	{
-	  query->skip_server[whichserver] = 1;
-	  next_server(channel, query, now);
-	}
+        {
+          query->skip_server[whichserver] = 1;
+          next = next_server(channel, query, now);
+        }
    }
 }

-static void next_server(ares_channel channel, struct query *query, time_t now)
+static struct query *next_server(ares_channel channel, struct query *query, time_t now)
 {
  /* Advance to the next server or try. */
  query->server++;
  for (; query->try < channel->tries; query->try++)
    {
      for (; query->server < channel->nservers; query->server++)
-	{
-	  if (!query->skip_server[query->server])
-	    {
-	      ares__send_query(channel, query, now);
-	      return;
-	    }
-	}
+        {
+          if (!query->skip_server[query->server])
+            {
+              ares__send_query(channel, query, now);
+              return (query->next);
+            }
+        }
      query->server = 0;

      /* Only one try if we're using TCP. */
      if (query->using_tcp)
-	break;
+        break;
    }
-  end_query(channel, query, query->error_status, NULL, 0);
+  return end_query(channel, query, query->error_status, NULL, 0);
 }

 void ares__send_query(ares_channel channel, struct query *query, time_t now)
@@ -401,108 +437,172 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
      /* Make sure the TCP socket for this server is set up and queue
       * a send request.
       */
-      if (server->tcp_socket == -1)
-	{
-	  if (open_tcp_socket(channel, server) == -1)
-	    {
-	      query->skip_server[query->server] = 1;
-	      next_server(channel, query, now);
-	      return;
-	    }
-	}
-      sendreq = malloc(sizeof(struct send_request));
+      if (server->tcp_socket == ARES_SOCKET_BAD)
+        {
+          if (open_tcp_socket(channel, server) == -1)
+            {
+              query->skip_server[query->server] = 1;
+              next_server(channel, query, now);
+              return;
+            }
+        }
+      sendreq = calloc(sizeof(struct send_request), 1);
      if (!sendreq)
-	end_query(channel, query, ARES_ENOMEM, NULL, 0);
+        {
+        end_query(channel, query, ARES_ENOMEM, NULL, 0);
+          return;
+        }
      sendreq->data = query->tcpbuf;
      sendreq->len = query->tcplen;
      sendreq->next = NULL;
      if (server->qtail)
-	server->qtail->next = sendreq;
+        server->qtail->next = sendreq;
      else
-	server->qhead = sendreq;
+        {
+          SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 1);
+          server->qhead = sendreq;
+        }
      server->qtail = sendreq;
      query->timeout = 0;
    }
  else
    {
-      if (server->udp_socket == -1)
-	{
-	  if (open_udp_socket(channel, server) == -1)
-	    {
-	      query->skip_server[query->server] = 1;
-	      next_server(channel, query, now);
-	      return;
-	    }
-	}
-      if (send(server->udp_socket, query->qbuf, query->qlen, 0) == -1)
-	{
-	  query->skip_server[query->server] = 1;
-	  next_server(channel, query, now);
-	  return;
-	}
+      if (server->udp_socket == ARES_SOCKET_BAD)
+        {
+          if (open_udp_socket(channel, server) == -1)
+            {
+              query->skip_server[query->server] = 1;
+              next_server(channel, query, now);
+              return;
+            }
+        }
+      if (send(server->udp_socket, (void *)query->qbuf,
+               query->qlen, 0) == -1)
+        {
+          query->skip_server[query->server] = 1;
+          next_server(channel, query, now);
+          return;
+        }
      query->timeout = now
-	  + ((query->try == 0) ? channel->timeout
-	     : channel->timeout << query->try / channel->nservers);
+          + ((query->try == 0) ? channel->timeout
+             : channel->timeout << query->try / channel->nservers);
    }
 }

+/*
+ * nonblock() set the given socket to either blocking or non-blocking mode
+ * based on the 'nonblock' boolean argument. This function is highly portable.
+ */
+static int nonblock(ares_socket_t sockfd,    /* operate on this */
+                    int nonblock   /* TRUE or FALSE */)
+{
+#undef SETBLOCK
+#define SETBLOCK 0
+#ifdef HAVE_O_NONBLOCK
+  /* most recent unix versions */
+  int flags;
+
+  flags = fcntl(sockfd, F_GETFL, 0);
+  if (TRUE == nonblock)
+    return fcntl(sockfd, F_SETFL, flags | O_NONBLOCK);
+  else
+    return fcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK));
+#undef SETBLOCK
+#define SETBLOCK 1
+#endif
+
+#if defined(HAVE_FIONBIO) && (SETBLOCK == 0)
+  /* older unix versions */
+  int flags;
+
+  flags = nonblock;
+  return ioctl(sockfd, FIONBIO, &flags);
+#undef SETBLOCK
+#define SETBLOCK 2
+#endif
+
+#if defined(HAVE_IOCTLSOCKET) && (SETBLOCK == 0)
+  /* Windows? */
+  unsigned long flags;
+  flags = nonblock;
+
+  return ioctlsocket(sockfd, FIONBIO, &flags);
+#undef SETBLOCK
+#define SETBLOCK 3
+#endif
+
+#if defined(HAVE_IOCTLSOCKET_CASE) && (SETBLOCK == 0)
+  /* presumably for Amiga */
+  return IoctlSocket(sockfd, FIONBIO, (long)nonblock);
+#undef SETBLOCK
+#define SETBLOCK 4
+#endif
+
+#if defined(HAVE_SO_NONBLOCK) && (SETBLOCK == 0)
+  /* BeOS */
+  long b = nonblock ? 1 : 0;
+  return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
+#undef SETBLOCK
+#define SETBLOCK 5
+#endif
+
+#ifdef HAVE_DISABLED_NONBLOCKING
+  return 0; /* returns success */
+#undef SETBLOCK
+#define SETBLOCK 6
+#endif
+
+#if (SETBLOCK == 0)
+#error "no non-blocking method was found/used/set"
+#endif
+}
+
 static int open_tcp_socket(ares_channel channel, struct server_state *server)
 {
-  int s, flags;
+  ares_socket_t s;
  struct sockaddr_in sockin;

  /* Acquire a socket. */
  s = socket(AF_INET, SOCK_STREAM, 0);
-  if (s == -1)
+  if (s == ARES_SOCKET_BAD)
    return -1;

  /* Set the socket non-blocking. */
+  nonblock(s, TRUE);

-#ifdef WIN32
-  flags = 1;
-  ioctlsocket(s, FIONBIO, &flags);
-#else
-  flags = fcntl(s, F_GETFL, 0);
-
-  if (flags == -1)
-    {
-      close(s);
-      return -1;
-    }
-  flags |= O_NONBLOCK;
-  if (fcntl(s, F_SETFL, flags) == -1)
-    {
-      close(s);
-      return -1;
-    }
-#endif
-  
  /* Connect to the server. */
  memset(&sockin, 0, sizeof(sockin));
  sockin.sin_family = AF_INET;
  sockin.sin_addr = server->addr;
  sockin.sin_port = channel->tcp_port;
-  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1
-      && errno != EINPROGRESS)
-    {
+  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1) {
+    int err = GET_ERRNO();
+
+    if (err != EINPROGRESS && err != EWOULDBLOCK) {
      closesocket(s);
      return -1;
    }
+  }

+  SOCK_STATE_CALLBACK(channel, s, 1, 0);
+  server->tcp_buffer_pos = 0;
  server->tcp_socket = s;
  return 0;
 }

 static int open_udp_socket(ares_channel channel, struct server_state *server)
 {
-  int s;
+  ares_socket_t s;
  struct sockaddr_in sockin;

  /* Acquire a socket. */
  s = socket(AF_INET, SOCK_DGRAM, 0);
-  if (s == -1)
+  if (s == ARES_SOCKET_BAD)
    return -1;

+  /* Set the socket non-blocking. */
+  nonblock(s, TRUE);
+
  /* Connect to the server. */
  memset(&sockin, 0, sizeof(sockin));
  sockin.sin_family = AF_INET;
@@ -514,12 +614,14 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
      return -1;
    }

+  SOCK_STATE_CALLBACK(channel, s, 1, 0);
+
  server->udp_socket = s;
  return 0;
 }

 static int same_questions(const unsigned char *qbuf, int qlen,
-			  const unsigned char *abuf, int alen)
+                          const unsigned char *abuf, int alen)
 {
  struct {
    const unsigned char *p;
@@ -546,14 +648,14 @@ static int same_questions(const unsigned char *qbuf, int qlen,
    {
      /* Decode the question in the query. */
      if (ares_expand_name(q.p, qbuf, qlen, &q.name, &q.namelen)
-	  != ARES_SUCCESS)
-	return 0;
+          != ARES_SUCCESS)
+        return 0;
      q.p += q.namelen;
      if (q.p + QFIXEDSZ > qbuf + qlen)
-	{
-	  free(q.name);
-	  return 0;
-	}
+        {
+          free(q.name);
+          return 0;
+        }
      q.type = DNS_QUESTION_TYPE(q.p);
      q.dnsclass = DNS_QUESTION_CLASS(q.p);
      q.p += QFIXEDSZ;
@@ -561,55 +663,59 @@ static int same_questions(const unsigned char *qbuf, int qlen,
      /* Search for this question in the answer. */
      a.p = abuf + HFIXEDSZ;
      for (j = 0; j < a.qdcount; j++)
-	{
-	  /* Decode the question in the answer. */
-	  if (ares_expand_name(a.p, abuf, alen, &a.name, &a.namelen)
-	      != ARES_SUCCESS)
-	    {
-	      free(q.name);
-	      return 0;
-	    }
-	  a.p += a.namelen;
-	  if (a.p + QFIXEDSZ > abuf + alen)
-	    {
-	      free(q.name);
-	      free(a.name);
-	      return 0;
-	    }
-	  a.type = DNS_QUESTION_TYPE(a.p);
-	  a.dnsclass = DNS_QUESTION_CLASS(a.p);
-	  a.p += QFIXEDSZ;
+        {
+          /* Decode the question in the answer. */
+          if (ares_expand_name(a.p, abuf, alen, &a.name, &a.namelen)
+              != ARES_SUCCESS)
+            {
+              free(q.name);
+              return 0;
+            }
+          a.p += a.namelen;
+          if (a.p + QFIXEDSZ > abuf + alen)
+            {
+              free(q.name);
+              free(a.name);
+              return 0;
+            }
+          a.type = DNS_QUESTION_TYPE(a.p);
+          a.dnsclass = DNS_QUESTION_CLASS(a.p);
+          a.p += QFIXEDSZ;

-	  /* Compare the decoded questions. */
-	  if (strcasecmp(q.name, a.name) == 0 && q.type == a.type
-	      && q.dnsclass == a.dnsclass)
-	    {
-	      free(a.name);
-	      break;
-	    }
-	  free(a.name);
-	}
+          /* Compare the decoded questions. */
+          if (strcasecmp(q.name, a.name) == 0 && q.type == a.type
+              && q.dnsclass == a.dnsclass)
+            {
+              free(a.name);
+              break;
+            }
+          free(a.name);
+        }

      free(q.name);
      if (j == a.qdcount)
-	return 0;
+        return 0;
    }
  return 1;
 }

-static void end_query(ares_channel channel, struct query *query, int status,
-		      unsigned char *abuf, int alen)
+static struct query *end_query (ares_channel channel, struct query *query, int status,
+                      unsigned char *abuf, int alen)
 {
-  struct query **q;
+  struct query **q, *next;
  int i;

  query->callback(query->arg, status, abuf, alen);
  for (q = &channel->queries; *q; q = &(*q)->next)
    {
      if (*q == query)
-	break;
+        break;
    }
  *q = query->next;
+  if (*q)
+    next = (*q)->next;
+  else
+    next = NULL;
  free(query->tcpbuf);
  free(query->skip_server);
  free(query);
@@ -620,6 +726,7 @@ static void end_query(ares_channel channel, struct query *query, int status,
  if (!channel->queries && !(channel->flags & ARES_FLAG_STAYOPEN))
    {
      for (i = 0; i < channel->nservers; i++)
-	ares__close_sockets(&channel->servers[i]);
+        ares__close_sockets(channel, &channel->servers[i]);
    }
+  return (next);
 }
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -13,13 +13,17 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdlib.h>
@@ -35,7 +39,7 @@ struct qquery {
 static void qcallback(void *arg, int status, unsigned char *abuf, int alen);

 void ares_query(ares_channel channel, const char *name, int dnsclass,
-		int type, ares_callback callback, void *arg)
+                int type, ares_callback callback, void *arg)
 {
  struct qquery *qquery;
  unsigned char *qbuf;
@@ -44,7 +48,7 @@ void ares_query(ares_channel channel, const char *name, int dnsclass,
  /* Compose the query. */
  rd = !(channel->flags & ARES_FLAG_NORECURSE);
  status = ares_mkquery(name, dnsclass, type, channel->next_id, rd, &qbuf,
-			&qlen);
+                        &qlen);
  channel->next_id++;
  if (status != ARES_SUCCESS)
    {
@@ -84,26 +88,26 @@ static void qcallback(void *arg, int status, unsigned char *abuf, int alen)

      /* Convert errors. */
      switch (rcode)
-	{
-	case NOERROR:
-	  status = (ancount > 0) ? ARES_SUCCESS : ARES_ENODATA;
-	  break;
-	case FORMERR:
-	  status = ARES_EFORMERR;
-	  break;
-	case SERVFAIL:
-	  status = ARES_ESERVFAIL;
-	  break;
-	case NXDOMAIN:
-	  status = ARES_ENOTFOUND;
-	  break;
-	case NOTIMP:
-	  status = ARES_ENOTIMP;
-	  break;
-	case REFUSED:
-	  status = ARES_EREFUSED;
-	  break;
-	}
+        {
+        case NOERROR:
+          status = (ancount > 0) ? ARES_SUCCESS : ARES_ENODATA;
+          break;
+        case FORMERR:
+          status = ARES_EFORMERR;
+          break;
+        case SERVFAIL:
+          status = ARES_ESERVFAIL;
+          break;
+        case NXDOMAIN:
+          status = ARES_ENOTFOUND;
+          break;
+        case NOTIMP:
+          status = ARES_ENOTIMP;
+          break;
+        case REFUSED:
+          status = ARES_EREFUSED;
+          break;
+        }
      qquery->callback(qquery->arg, status, abuf, alen);
    }
  free(qquery);
--- a/ares/ares_search.c
+++ b/ares/ares_search.c
@@ -13,12 +13,13 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #endif

@@ -28,26 +29,26 @@
 struct search_query {
  /* Arguments passed to ares_search */
  ares_channel channel;
-  char *name;			/* copied into an allocated buffer */
+  char *name;                   /* copied into an allocated buffer */
  int dnsclass;
  int type;
  ares_callback callback;
  void *arg;

-  int status_as_is;		/* error status from trying as-is */
-  int next_domain;		/* next search domain to try */
-  int trying_as_is;		/* current query is for name as-is */
+  int status_as_is;             /* error status from trying as-is */
+  int next_domain;              /* next search domain to try */
+  int trying_as_is;             /* current query is for name as-is */
 };

 static void search_callback(void *arg, int status, unsigned char *abuf,
-			    int alen);
+                            int alen);
 static void end_squery(struct search_query *squery, int status,
-		       unsigned char *abuf, int alen);
+                       unsigned char *abuf, int alen);
 static int cat_domain(const char *name, const char *domain, char **s);
 static int single_domain(ares_channel channel, const char *name, char **s);

 void ares_search(ares_channel channel, const char *name, int dnsclass,
-		 int type, ares_callback callback, void *arg)
+                 int type, ares_callback callback, void *arg)
 {
  struct search_query *squery;
  char *s;
@@ -98,7 +99,7 @@ void ares_search(ares_channel channel, const char *name, int dnsclass,
  for (p = name; *p; p++)
    {
      if (*p == '.')
-	ndots++;
+        ndots++;
    }

  /* If ndots is at least the channel ndots threshold (usually 1),
@@ -119,22 +120,22 @@ void ares_search(ares_channel channel, const char *name, int dnsclass,
      squery->trying_as_is = 0;
      status = cat_domain(name, channel->domains[0], &s);
      if (status == ARES_SUCCESS)
-	{
-	  ares_query(channel, s, dnsclass, type, search_callback, squery);
-	  free(s);
-	}
+        {
+          ares_query(channel, s, dnsclass, type, search_callback, squery);
+          free(s);
+        }
      else
      {
        /* failed, free the malloc()ed memory */
        free(squery->name);
        free(squery);
-	callback(arg, status, NULL, 0);
+        callback(arg, status, NULL, 0);
      }
    }
 }

 static void search_callback(void *arg, int status, unsigned char *abuf,
-			    int alen)
+                            int alen)
 {
  struct search_query *squery = (struct search_query *) arg;
  ares_channel channel = squery->channel;
@@ -148,37 +149,37 @@ static void search_callback(void *arg, int status, unsigned char *abuf,
    {
      /* Save the status if we were trying as-is. */
      if (squery->trying_as_is)
-	squery->status_as_is = status;
+        squery->status_as_is = status;
      if (squery->next_domain < channel->ndomains)
-	{
-	  /* Try the next domain. */
-	  status = cat_domain(squery->name,
-			      channel->domains[squery->next_domain], &s);
-	  if (status != ARES_SUCCESS)
-	    end_squery(squery, status, NULL, 0);
-	  else
-	    {
-	      squery->trying_as_is = 0;
-	      squery->next_domain++;
-	      ares_query(channel, s, squery->dnsclass, squery->type,
-			 search_callback, squery);
-	      free(s);
-	    }
-	}
+        {
+          /* Try the next domain. */
+          status = cat_domain(squery->name,
+                              channel->domains[squery->next_domain], &s);
+          if (status != ARES_SUCCESS)
+            end_squery(squery, status, NULL, 0);
+          else
+            {
+              squery->trying_as_is = 0;
+              squery->next_domain++;
+              ares_query(channel, s, squery->dnsclass, squery->type,
+                         search_callback, squery);
+              free(s);
+            }
+        }
      else if (squery->status_as_is == -1)
-	{
-	  /* Try the name as-is at the end. */
-	  squery->trying_as_is = 1;
-	  ares_query(channel, squery->name, squery->dnsclass, squery->type,
-		     search_callback, squery);
-	}
+        {
+          /* Try the name as-is at the end. */
+          squery->trying_as_is = 1;
+          ares_query(channel, squery->name, squery->dnsclass, squery->type,
+                     search_callback, squery);
+        }
      else
-	end_squery(squery, squery->status_as_is, NULL, 0);
+        end_squery(squery, squery->status_as_is, NULL, 0);
    }
 }

 static void end_squery(struct search_query *squery, int status,
-		       unsigned char *abuf, int alen)
+                       unsigned char *abuf, int alen)
 {
  squery->callback(squery->arg, status, abuf, alen);
  free(squery->name);
@@ -228,41 +229,41 @@ static int single_domain(ares_channel channel, const char *name, char **s)
      /* The name might be a host alias. */
      hostaliases = getenv("HOSTALIASES");
      if (hostaliases)
-	{
-	  fp = fopen(hostaliases, "r");
-	  if (fp)
-	    {
-	      while ((status = ares__read_line(fp, &line, &linesize))
-		     == ARES_SUCCESS)
-		{
-		  if (strncasecmp(line, name, len) != 0 ||
-		      !isspace((unsigned char)line[len]))
-		    continue;
-		  p = line + len;
-		  while (isspace((unsigned char)*p))
-		    p++;
-		  if (*p)
-		    {
-		      q = p + 1;
-		      while (*q && !isspace((unsigned char)*q))
-			q++;
-		      *s = malloc(q - p + 1);
-		      if (*s)
-			{
-			  memcpy(*s, p, q - p);
-			  (*s)[q - p] = 0;
-			}
-		      free(line);
-		      fclose(fp);
-		      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
-		    }
-		}
-	      free(line);
-	      fclose(fp);
-	      if (status != ARES_SUCCESS)
-		return status;
-	    }
-	}
+        {
+          fp = fopen(hostaliases, "r");
+          if (fp)
+            {
+              while ((status = ares__read_line(fp, &line, &linesize))
+                     == ARES_SUCCESS)
+                {
+                  if (strncasecmp(line, name, len) != 0 ||
+                      !isspace((unsigned char)line[len]))
+                    continue;
+                  p = line + len;
+                  while (isspace((unsigned char)*p))
+                    p++;
+                  if (*p)
+                    {
+                      q = p + 1;
+                      while (*q && !isspace((unsigned char)*q))
+                        q++;
+                      *s = malloc(q - p + 1);
+                      if (*s)
+                        {
+                          memcpy(*s, p, q - p);
+                          (*s)[q - p] = 0;
+                        }
+                      free(line);
+                      fclose(fp);
+                      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
+                    }
+                }
+              free(line);
+              fclose(fp);
+              if (status != ARES_SUCCESS)
+                return status;
+            }
+        }
    }

  if (channel->flags & ARES_FLAG_NOSEARCH || channel->ndomains == 0)
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -13,13 +13,17 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

 #include <stdlib.h>
@@ -30,7 +34,7 @@
 #include "ares_private.h"

 void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
-	       ares_callback callback, void *arg)
+               ares_callback callback, void *arg)
 {
  struct query *query;
  int i;
--- a/ares/ares_strerror.3
+++ b/ares/ares_strerror.3
@@ -30,7 +30,8 @@ function gets the description of the ares library error code
 .IR code ,
 returning the result as a NUL-terminated C string.
 .SH NOTES
-This function is not compatible with ares.
+This function is not compatible with ares, it takes a different set of
+arguments.
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_strerror.c
+++ b/ares/ares_strerror.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <assert.h>
 #include "ares.h"

@@ -37,7 +38,8 @@ const char *ares_strerror(int code)
    "Error reading file",
    "Out of memory",
    "Channel is being destroyed",
-    "Misformatted string"
+    "Misformatted string",
+    "Illegal flags specified"
  };

  assert(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext)));
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -13,20 +13,20 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
-
-#else
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

 #include <time.h>
+
 #include "ares.h"
 #include "ares_private.h"

 struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
-			     struct timeval *tvbuf)
+                             struct timeval *tvbuf)
 {
  struct query *query;
  time_t now;
@@ -42,12 +42,12 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
  for (query = channel->queries; query; query = query->next)
    {
      if (query->timeout == 0)
-	continue;
+        continue;
      offset = query->timeout - now;
      if (offset < 0)
-	offset = 0;
+        offset = 0;
      if (min_offset == -1 || offset < min_offset)
-	min_offset = offset;
+        min_offset = offset;
    }

  /* If we found a minimum timeout and it's sooner than the one
--- a/ares/ares_version.c
+++ b/ares/ares_version.c
@@ -1,5 +1,6 @@
 /* $Id$ */

+#include "setup.h"
 #include "ares_version.h"

 const char *ares_version(int *version)
--- a/ares/ares_version.h
+++ b/ares/ares_version.h
@@ -4,12 +4,12 @@
 #define ARES__VERSION_H

 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 2
-#define ARES_VERSION_PATCH 0
+#define ARES_VERSION_MINOR 3
+#define ARES_VERSION_PATCH 1
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
                       (ARES_VERSION_MINOR<<8)|\
                       (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.2.0"
+#define ARES_VERSION_STR "1.3.1"

 const char *ares_version(int *version);

--- a/ares/bitncmp.c
+++ b/ares/bitncmp.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 1996,1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef HAVE_BITNCMP
+
+#include <sys/types.h>
+#include <string.h>
+#include <stdlib.h>
+#include "bitncmp.h"
+
+/*
+ * int
+ * bitncmp(l, r, n)
+ *	compare bit masks l and r, for n bits.
+ * return:
+ *	-1, 1, or 0 in the libc tradition.
+ * note:
+ *	network byte order assumed.  this means 192.5.5.240/28 has
+ *	0x11110000 in its fourth octet.
+ * author:
+ *	Paul Vixie (ISC), June 1996
+ */
+int
+ares_bitncmp(const void *l, const void *r, int n) {
+	unsigned int lb, rb;
+	int x, b;
+
+	b = n / 8;
+	x = memcmp(l, r, b);
+	if (x)
+		return (x);
+
+	lb = ((const unsigned char *)l)[b];
+	rb = ((const unsigned char *)r)[b];
+	for (b = n % 8; b > 0; b--) {
+		if ((lb & 0x80) != (rb & 0x80)) {
+			if (lb & 0x80)
+				return (1);
+			return (-1);
+		}
+		lb <<= 1;
+		rb <<= 1;
+	}
+	return (0);
+}
+#endif
--- a/ares/bitncmp.h
+++ b/ares/bitncmp.h
@@ -0,0 +1,26 @@
+/* $Id$ */
+
+/*
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef BITNCMP_H
+#define BITNCMP_H
+
+#ifndef HAVE_BITNCMP
+int ares_bitncmp(const void *l, const void *r, int n);
+#else
+#define ares_bitncmp(x,y,z) bitncmp(x,y,z)
+#endif
+
+#endif /* BITNCMP_H */
--- a/ares/buildconf
+++ b/ares/buildconf
@@ -1,4 +1,7 @@
 #!/bin/sh

-aclocal
-autoconf
+${LIBTOOLIZE:-libtoolize} --copy --automake --force
+${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
+${AUTOHEADER:-autoheader}
+${AUTOCONF:-autoconf}
+${AUTOMAKE:-automake} --add-missing
--- a/ares/config-win32.h
+++ b/ares/config-win32.h
@@ -0,0 +1,87 @@
+#ifndef __ARES_CONFIG_WIN32_H
+#define __ARES_CONFIG_WIN32_H
+
+/* $Id$ */
+
+/* Copyright (C) 2004 - 2005 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+/* ================================================================ */
+/*    ares/config-win32.h - Hand crafted config file for windows    */
+/* ================================================================ */
+
+/* ---------------------------------------------------------------- */
+/*                          HEADER FILES                            */
+/* ---------------------------------------------------------------- */
+
+/* Define if you have the <getopt.h> header file.  */
+#if defined(__MINGW32__)
+#define HAVE_GETOPT_H 1
+#endif
+
+/* Define if you have the <unistd.h> header file.  */
+#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \
+    defined(__POCC__)
+#define HAVE_UNISTD_H 1
+#endif
+
+/* Define if you have the <windows.h> header file.  */
+#define HAVE_WINDOWS_H 1
+
+/* Define if you have the <winsock.h> header file.  */
+#define HAVE_WINSOCK_H 1
+
+/* Define if you have the <winsock2.h> header file.  */
+#define HAVE_WINSOCK2_H 1
+
+/* Define if you have the <ws2tcpip.h> header file.  */
+#define HAVE_WS2TCPIP_H 1
+
+/* ---------------------------------------------------------------- */
+/*                             FUNCTIONS                            */
+/* ---------------------------------------------------------------- */
+
+/* Define if you have the ioctlsocket function.  */
+#define HAVE_IOCTLSOCKET 1
+
+/* ---------------------------------------------------------------- */
+/*                          STRUCT RELATED                          */
+/* ---------------------------------------------------------------- */
+
+/* Define this if you have struct addrinfo */
+#define HAVE_STRUCT_ADDRINFO 1
+
+/* Define this if you have struct sockaddr_storage */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* ---------------------------------------------------------------- */
+/*                         IPV6 COMPATIBILITY                       */
+/* ---------------------------------------------------------------- */
+
+/* Define this if you have address family AF_INET6 */
+#define HAVE_AF_INET6 1
+
+/* Define this if you have protocol family PF_INET6 */
+#define HAVE_PF_INET6 1
+
+/* Define this if you have struct in6_addr */
+#define HAVE_STRUCT_IN6_ADDR 1
+
+/* Define this if you have struct sockaddr_in6 */
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+
+/* Define this if you have sockaddr_in6 with scopeid */
+#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+
+
+#endif  /* __ARES_CONFIG_WIN32_H */
--- a/ares/config.guess
+++ b/ares/config.guess
--- a/ares/config.sub
+++ b/ares/config.sub
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -1,20 +1,27 @@
+
 dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.57)
 AC_INIT(ares_init.c)
+AC_CONFIG_SRCDIR([ares_ipv6.h])
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(c-ares, CVS)

 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_RANLIB

-AC_CANONICAL_HOST
 case $host_os in
 solaris*)
-	AC_DEFINE(ETC_INET)
+	AC_DEFINE(ETC_INET, 1, [if a /etc/inet dir is being used])
 	;;
 esac

 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(socket, socket)

+dnl check for cygwin stuff
+AC_LIBTOOL_WIN32_DLL
+
 dnl ************************************************************
 dnl Option to switch on debug options. This makes an assumption that
 dnl this is built as an 'ares' subdir in the curl source tree. Subject for
@@ -30,12 +37,25 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
       ;;
  *)   AC_MSG_RESULT(yes)

-    dnl Checks for standard header files, to make memdebug.h inclusions bettter
-    AC_HEADER_STDC
+    dnl when doing the debug stuff, use static library only
+    AC_DISABLE_SHARED

-    CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I../include"
+    dnl the entire --enable-debug is a hack that lives and runs on top of
+    dnl libcurl stuff so this BUILDING_LIBCURL is not THAT much uglier
+    AC_DEFINE(BUILDING_LIBCURL, 1, [when building as static part of libcurl])
+
+    CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I$srcdir/../include"
    CFLAGS="$CFLAGS -g" 

+    dnl check for how to do large files, needed to get the curl_off_t check
+    dnl done right
+    AC_SYS_LARGEFILE
+
+    AC_CHECK_SIZEOF(curl_off_t, ,[
+#include <stdio.h>
+#include "$srcdir/../include/curl/curl.h"
+    ])
+
    dnl set compiler "debug" options to become more picky, and remove
    dnl optimize options from CFLAGS
    CURL_CC_DEBUG_OPTS
@@ -45,12 +65,465 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
       AC_MSG_RESULT(no)
 )

+dnl libtool setup
+CARES_CLEAR_LIBTOOL_TAGS
+AC_PROG_LIBTOOL
+
+AC_MSG_CHECKING([if we need -no-undefined])
+case $host in
+  *-*-cygwin | *-*-mingw* | *-*-pw32*)
+    need_no_undefined=yes
+    ;;
+  *)
+    need_no_undefined=no
+    ;;
+esac
+AC_MSG_RESULT($need_no_undefined)
+AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
+
+dnl Checks for header files.
+AC_HEADER_STDC
+
+dnl **********************************************************************
+dnl Make sure that our checks for headers windows.h winsock.h winsock2.h 
+dnl and ws2tcpip.h take precedence over any other further checks which 
+dnl could be done later using AC_CHECK_HEADER or AC_CHECK_HEADERS for
+dnl this specific header files. And do them before its results are used.
+dnl **********************************************************************
+
+CURL_CHECK_HEADER_WINDOWS
+CURL_CHECK_HEADER_WINSOCK
+CURL_CHECK_HEADER_WINSOCK2
+CURL_CHECK_HEADER_WS2TCPIP
+
 dnl check for a few basic system headers we need
-dnl AC_CHECK_HEADERS(
-dnl        sys/types.h \
-dnl        sys/time.h \
-dnl        sys/select.h \
-dnl        sys/socket.h \
-dnl        )
+AC_CHECK_HEADERS(
+       sys/types.h \
+       sys/time.h \
+       sys/select.h \
+       sys/socket.h \
+       sys/ioctl.h \
+       netdb.h \
+       netinet/in.h \
+       net/if.h \
+       arpa/nameser.h \
+       arpa/nameser_compat.h \
+       arpa/inet.h,
+dnl to do if not found
+[],
+dnl to do if found
+[],
+dnl default includes
+[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+dnl We do this default-include simply to make sure that the nameser_compat.h
+dnl header *REALLY* can be include after the new nameser.h. It seems AIX 5.1
+dnl (and others?) is not designed to allow this.
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+dnl *Sigh* these are needed in order for net/if.h to get properly detected.
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+]
+)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+
+AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(time_t)
+
+AC_CHECK_TYPE(long long,
+   [AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports long long])]
+   longlong="yes"  
+)
+
+if test "xyes" = "x$longlong"; then
+  AC_MSG_CHECKING([if numberLL works])
+  AC_COMPILE_IFELSE([long long val = 1000LL;],
+   [AC_DEFINE(HAVE_LL, 1, [if your compiler supports LL])]
+   AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no)
+  )
+fi
+
+
+# check for ssize_t
+AC_CHECK_TYPE(ssize_t, ,
+   AC_DEFINE(ssize_t, int, [the signed version of size_t]))
+
+# Check for socklen_t or equivalent
+CURL_CHECK_TYPE_SOCKLEN_T
+
+TYPE_IN_ADDR_T
+
+TYPE_SOCKADDR_STORAGE
+
+
+dnl check for AF_INET6
+CARES_CHECK_CONSTANT(
+  [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+  ], [PF_INET6], 
+     AC_DEFINE_UNQUOTED(HAVE_PF_INET6,1,[Define to 1 if you have PF_INET6.])
+)
+
+dnl check for PF_INET6
+CARES_CHECK_CONSTANT(
+  [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+  ], [AF_INET6], 
+     AC_DEFINE_UNQUOTED(HAVE_AF_INET6,1,[Define to 1 if you have AF_INET6.])
+)
+
+
+dnl check for the in6_addr structure
+CARES_CHECK_STRUCT(
+  [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#endif
+  ], [in6_addr], 
+     AC_DEFINE_UNQUOTED(HAVE_STRUCT_IN6_ADDR,1,[Define to 1 if you have struct in6_addr.])
+)
+
+dnl check for the sockaddr_in6 structure
+CARES_CHECK_STRUCT(
+  [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#endif
+  ], [sockaddr_in6], 
+     AC_DEFINE_UNQUOTED(HAVE_STRUCT_SOCKADDR_IN6,1,
+       [Define to 1 if you have struct sockaddr_in6.]) ac_have_sockaddr_in6=yes
+)
+
+AC_CHECK_MEMBER(struct sockaddr_in6.sin6_scope_id,
+    AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID,1,
+      [Define to 1 if your struct sockaddr_in6 has sin6_scope_id.])
+   , ,
+  [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#endif
+  ])
+
+dnl check for the addrinfo structure
+AC_CHECK_MEMBER(struct addrinfo.ai_flags,
+     AC_DEFINE_UNQUOTED(HAVE_STRUCT_ADDRINFO,1,
+       [Define to 1 if you have struct addrinfo.]),,
+  [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#endif
+  ]
+)
+
+
+AC_CHECK_FUNCS( bitncmp \
+                if_indextoname,
+dnl if found
+[],
+dnl if not found, $ac_func is the name we check for
+func="$ac_func"
+AC_MSG_CHECKING([deeper for $func])
+AC_TRY_LINK( [],
+             [ $func ();],
+             AC_MSG_RESULT(yes!)
+             eval "ac_cv_func_$func=yes"
+             def=`echo "HAVE_$func" | tr 'a-z' 'A-Z'`
+             AC_DEFINE_UNQUOTED($def, 1, [If you have $func]),
+             AC_MSG_RESULT(but still no)
+             )
+)
+
+
+dnl check for inet_pton
+AC_CHECK_FUNCS(inet_pton)
+dnl Some systems have it, but not IPv6
+if test "$ac_cv_func_inet_pton" = "yes" ; then
+AC_MSG_CHECKING(if inet_pton supports IPv6)
+AC_TRY_RUN(
+  [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+int main()
+  {
+    struct in6_addr addr6;
+    if (inet_pton(AF_INET6, "::1", &addr6) < 1)
+      exit(1);
+    else
+      exit(0);
+  }
+  ], [
+       AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(HAVE_INET_PTON_IPV6,1,[Define to 1 if inet_pton supports IPv6.])
+     ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))
+fi
+dnl Check for inet_net_pton
+AC_CHECK_FUNCS(inet_net_pton)
+dnl Again, some systems have it, but not IPv6
+if test "$ac_cv_func_inet_net_pton" = "yes" ; then
+AC_MSG_CHECKING(if inet_net_pton supports IPv6)
+AC_TRY_RUN(
+  [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+int main()
+  {
+    struct in6_addr addr6;
+    if (inet_net_pton(AF_INET6, "::1", &addr6, sizeof(addr6)) < 1)
+      exit(1);
+    else
+      exit(0);
+  }
+  ], [
+       AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(HAVE_INET_NET_PTON_IPV6,1,[Define to 1 if inet_net_pton supports IPv6.])
+     ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))
+fi
+
+
+dnl Check for inet_ntop
+AC_CHECK_FUNCS(inet_ntop)
+dnl Again, some systems have it, but not IPv6
+if test "$ac_cv_func_inet_ntop" = "yes" ; then
+AC_MSG_CHECKING(if inet_ntop supports IPv6)
+AC_TRY_RUN(
+  [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#include <errno.h>
+int main()
+  {
+    struct in6_addr addr6;
+    char buf[128];
+    if (inet_ntop(AF_INET6, &addr6, buf, 128) == 0 && errno == EAFNOSUPPORT)
+      exit(1);
+    else
+      exit(0);
+  }
+  ], [
+       AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6,1,
+          [Define to 1 if inet_ntop supports IPv6.])
+     ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))
+fi
+
+AC_CHECK_SIZEOF(struct in6_addr, ,
+[
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#endif
+]
+)
+
+AC_CHECK_SIZEOF(struct in_addr, ,
+[
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#endif
+]
+)
+
+
+dnl Check if the getnameinfo function is available
+dnl and get the types of five of its arguments.
+CURL_CHECK_FUNC_GETNAMEINFO
+
+
+dnl God bless non-standardized functions! We need to see which getservbyport_r
+dnl variant is available
+CARES_CHECK_GETSERVBYPORT_R
+
+CURL_CHECK_NONBLOCKING_SOCKET
+
+AC_C_BIGENDIAN(
+    [AC_DEFINE(ARES_BIG_ENDIAN, 1,
+      [define this if ares is built for a big endian system])],
+    ,
+    [AC_MSG_WARN([couldn't figure out endianess, assuming little endian!])]
+)

 AC_OUTPUT(Makefile)
--- a/ares/inet_net_pton.c
+++ b/ares/inet_net_pton.c
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 1996,1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "setup.h"
+
+
+#include <sys/types.h>
+
+#if defined(WIN32) && !defined(WATT32)
+#include "nameser.h"
+#else
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ares_ipv6.h"
+#include "inet_net_pton.h"
+
+#if !defined(HAVE_INET_NET_PTON) || !defined(HAVE_INET_NET_PTON_IPV6) || \
+    !defined(HAVE_INET_PTON) || !defined(HAVE_INET_PTON_IPV6)
+
+/*
+ * static int
+ * inet_net_pton_ipv4(src, dst, size)
+ *      convert IPv4 network number from presentation to network format.
+ *      accepts hex octets, hex strings, decimal octets, and /CIDR.
+ *      "size" is in bytes and describes "dst".
+ * return:
+ *      number of bits, either imputed classfully or specified with /CIDR,
+ *      or -1 if some failure occurred (check errno).  ENOENT means it was
+ *      not an IPv4 network specification.
+ * note:
+ *      network byte order assumed.  this means 192.5.5.240/28 has
+ *      0b11110000 in its fourth octet.
+ * author:
+ *      Paul Vixie (ISC), June 1996
+ */
+static int
+inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
+{
+  static const char xdigits[] = "0123456789abcdef";
+  static const char digits[] = "0123456789";
+  int n, ch, tmp = 0, dirty, bits;
+  const unsigned char *odst = dst;
+
+  ch = *src++;
+  if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
+      && isascii((unsigned char)(src[1]))
+      && isxdigit((unsigned char)(src[1]))) {
+    /* Hexadecimal: Eat nybble string. */
+    if (size <= 0U)
+      goto emsgsize;
+    dirty = 0;
+    src++;  /* skip x or X. */
+    while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) {
+      if (isupper(ch))
+        ch = tolower(ch);
+      n = (int)(strchr(xdigits, ch) - xdigits);
+      if (dirty == 0)
+        tmp = n;
+      else
+        tmp = (tmp << 4) | n;
+      if (++dirty == 2) {
+        if (size-- <= 0U)
+          goto emsgsize;
+        *dst++ = (unsigned char) tmp;
+        dirty = 0;
+      }
+    }
+    if (dirty) {  /* Odd trailing nybble? */
+      if (size-- <= 0U)
+        goto emsgsize;
+      *dst++ = (unsigned char) (tmp << 4);
+    }
+  } else if (isascii(ch) && isdigit(ch)) {
+    /* Decimal: eat dotted digit string. */
+    for (;;) {
+      tmp = 0;
+      do {
+        n = (int)(strchr(digits, ch) - digits);
+        tmp *= 10;
+        tmp += n;
+        if (tmp > 255)
+          goto enoent;
+      } while ((ch = *src++) != '\0' &&
+               isascii(ch) && isdigit(ch));
+      if (size-- <= 0U)
+        goto emsgsize;
+      *dst++ = (unsigned char) tmp;
+      if (ch == '\0' || ch == '/')
+        break;
+      if (ch != '.')
+        goto enoent;
+      ch = *src++;
+      if (!isascii(ch) || !isdigit(ch))
+        goto enoent;
+    }
+  } else
+    goto enoent;
+
+  bits = -1;
+  if (ch == '/' && isascii((unsigned char)(src[0])) &&
+      isdigit((unsigned char)(src[0])) && dst > odst) {
+    /* CIDR width specifier.  Nothing can follow it. */
+    ch = *src++;    /* Skip over the /. */
+    bits = 0;
+    do {
+      n = (int)(strchr(digits, ch) - digits);
+      bits *= 10;
+      bits += n;
+    } while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
+    if (ch != '\0')
+      goto enoent;
+    if (bits > 32)
+      goto emsgsize;
+  }
+
+  /* Firey death and destruction unless we prefetched EOS. */
+  if (ch != '\0')
+    goto enoent;
+
+  /* If nothing was written to the destination, we found no address. */
+  if (dst == odst)
+    goto enoent;
+  /* If no CIDR spec was given, infer width from net class. */
+  if (bits == -1) {
+    if (*odst >= 240)       /* Class E */
+      bits = 32;
+    else if (*odst >= 224)  /* Class D */
+      bits = 8;
+    else if (*odst >= 192)  /* Class C */
+      bits = 24;
+    else if (*odst >= 128)  /* Class B */
+      bits = 16;
+    else                    /* Class A */
+      bits = 8;
+    /* If imputed mask is narrower than specified octets, widen. */
+    if (bits < ((dst - odst) * 8))
+      bits = (int)(dst - odst) * 8;
+    /*
+     * If there are no additional bits specified for a class D
+     * address adjust bits to 4.
+     */
+    if (bits == 8 && *odst == 224)
+      bits = 4;
+  }
+  /* Extend network to cover the actual mask. */
+  while (bits > ((dst - odst) * 8)) {
+    if (size-- <= 0U)
+      goto emsgsize;
+    *dst++ = '\0';
+  }
+  return (bits);
+
+  enoent:
+  errno = ENOENT;
+  return (-1);
+
+  emsgsize:
+  errno = EMSGSIZE;
+  return (-1);
+}
+
+static int
+getbits(const char *src, int *bitsp)
+{
+  static const char digits[] = "0123456789";
+  int n;
+  int val;
+  char ch;
+
+  val = 0;
+  n = 0;
+  while ((ch = *src++) != '\0') {
+    const char *pch;
+
+    pch = strchr(digits, ch);
+    if (pch != NULL) {
+      if (n++ != 0 && val == 0)       /* no leading zeros */
+        return (0);
+      val *= 10;
+      val += (pch - digits);
+      if (val > 128)                  /* range */
+        return (0);
+      continue;
+    }
+    return (0);
+  }
+  if (n == 0)
+    return (0);
+  *bitsp = val;
+  return (1);
+}
+
+static int
+getv4(const char *src, unsigned char *dst, int *bitsp)
+{
+  static const char digits[] = "0123456789";
+  unsigned char *odst = dst;
+  int n;
+  unsigned int val;
+  char ch;
+
+  val = 0;
+  n = 0;
+  while ((ch = *src++) != '\0') {
+    const char *pch;
+
+    pch = strchr(digits, ch);
+    if (pch != NULL) {
+      if (n++ != 0 && val == 0)       /* no leading zeros */
+        return (0);
+      val *= 10;
+      val += (pch - digits);
+      if (val > 255)                  /* range */
+        return (0);
+      continue;
+    }
+    if (ch == '.' || ch == '/') {
+      if (dst - odst > 3)             /* too many octets? */
+        return (0);
+      *dst++ = val;
+      if (ch == '/')
+        return (getbits(src, bitsp));
+      val = 0;
+      n = 0;
+      continue;
+    }
+    return (0);
+  }
+  if (n == 0)
+    return (0);
+  if (dst - odst > 3)             /* too many octets? */
+    return (0);
+  *dst++ = val;
+  return (1);
+}
+
+static int
+inet_net_pton_ipv6(const char *src, unsigned char *dst, size_t size)
+{
+  static const char xdigits_l[] = "0123456789abcdef",
+    xdigits_u[] = "0123456789ABCDEF";
+  unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
+  const char *xdigits, *curtok;
+  int ch, saw_xdigit;
+  unsigned int val;
+  int digits;
+  int bits;
+  size_t bytes;
+  int words;
+  int ipv4;
+
+  memset((tp = tmp), '\0', NS_IN6ADDRSZ);
+  endp = tp + NS_IN6ADDRSZ;
+  colonp = NULL;
+  /* Leading :: requires some special handling. */
+  if (*src == ':')
+    if (*++src != ':')
+      goto enoent;
+  curtok = src;
+  saw_xdigit = 0;
+  val = 0;
+  digits = 0;
+  bits = -1;
+  ipv4 = 0;
+  while ((ch = *src++) != '\0') {
+    const char *pch;
+
+    if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
+      pch = strchr((xdigits = xdigits_u), ch);
+    if (pch != NULL) {
+      val <<= 4;
+      val |= (pch - xdigits);
+      if (++digits > 4)
+        goto enoent;
+      saw_xdigit = 1;
+      continue;
+    }
+    if (ch == ':') {
+      curtok = src;
+      if (!saw_xdigit) {
+        if (colonp)
+          goto enoent;
+        colonp = tp;
+        continue;
+      } else if (*src == '\0')
+        goto enoent;
+      if (tp + NS_INT16SZ > endp)
+        return (0);
+      *tp++ = (unsigned char) (val >> 8) & 0xff;
+      *tp++ = (unsigned char) val & 0xff;
+      saw_xdigit = 0;
+      digits = 0;
+      val = 0;
+      continue;
+    }
+    if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
+        getv4(curtok, tp, &bits) > 0) {
+      tp += NS_INADDRSZ;
+      saw_xdigit = 0;
+      ipv4 = 1;
+      break;  /* '\0' was seen by inet_pton4(). */
+    }
+    if (ch == '/' && getbits(src, &bits) > 0)
+      break;
+    goto enoent;
+  }
+  if (saw_xdigit) {
+    if (tp + NS_INT16SZ > endp)
+      goto enoent;
+    *tp++ = (unsigned char) (val >> 8) & 0xff;
+    *tp++ = (unsigned char) val & 0xff;
+  }
+  if (bits == -1)
+    bits = 128;
+
+  words = (bits + 15) / 16;
+  if (words < 2)
+    words = 2;
+  if (ipv4)
+    words = 8;
+  endp =  tmp + 2 * words;
+
+  if (colonp != NULL) {
+    /*
+     * Since some memmove()'s erroneously fail to handle
+     * overlapping regions, we'll do the shift by hand.
+     */
+    const int n = (int)(tp - colonp);
+    int i;
+
+    if (tp == endp)
+      goto enoent;
+    for (i = 1; i <= n; i++) {
+      endp[- i] = colonp[n - i];
+      colonp[n - i] = 0;
+    }
+    tp = endp;
+  }
+  if (tp != endp)
+    goto enoent;
+
+  bytes = (bits + 7) / 8;
+  if (bytes > size)
+    goto emsgsize;
+  memcpy(dst, tmp, bytes);
+  return (bits);
+
+  enoent:
+  errno = ENOENT;
+  return (-1);
+
+  emsgsize:
+  errno = EMSGSIZE;
+  return (-1);
+}
+
+/*
+ * int
+ * inet_net_pton(af, src, dst, size)
+ *      convert network number from presentation to network format.
+ *      accepts hex octets, hex strings, decimal octets, and /CIDR.
+ *      "size" is in bytes and describes "dst".
+ * return:
+ *      number of bits, either imputed classfully or specified with /CIDR,
+ *      or -1 if some failure occurred (check errno).  ENOENT means it was
+ *      not a valid network specification.
+ * author:
+ *      Paul Vixie (ISC), June 1996
+ */
+int
+ares_inet_net_pton(int af, const char *src, void *dst, size_t size)
+{
+  switch (af) {
+  case AF_INET:
+    return (inet_net_pton_ipv4(src, dst, size));
+  case AF_INET6:
+    return (inet_net_pton_ipv6(src, dst, size));
+  default:
+    errno = EAFNOSUPPORT;
+    return (-1);
+  }
+}
+
+#endif
+
+#if !defined(HAVE_INET_PTON) || !defined(HAVE_INET_PTON_IPV6)
+int ares_inet_pton(int af, const char *src, void *dst)
+{
+  int size, result;
+
+  if (af == AF_INET)
+    size = sizeof(struct in_addr);
+  else if (af == AF_INET6)
+    size = sizeof(struct in6_addr);
+  else
+  {
+    errno = EAFNOSUPPORT;
+    return -1;
+  }
+  result = ares_inet_net_pton(af, src, dst, size);
+  if (result == -1 && errno == ENOENT)
+    return 0;
+  return (result > -1 ? 1 : -1);
+}
+#endif
--- a/ares/inet_net_pton.h
+++ b/ares/inet_net_pton.h
@@ -0,0 +1,31 @@
+/* $Id$ */
+
+/*
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef INET_NET_PTON_H
+#define INET_NET_PTON_H
+
+#if defined(HAVE_INET_PTON) && defined(HAVE_INET_PTON_IPV6)
+#define ares_inet_pton(x,y,z) inet_pton(x,y,z)
+#else
+int ares_inet_pton(int af, const char *src, void *dst);
+#endif
+#if defined(HAVE_INET_NET_PTON) && defined(HAVE_INET_NET_PTON_IPV6)
+#define ares_inet_net_pton(w,x,y,z) inet_net_pton(w,x,y,z)
+#else
+int ares_inet_net_pton(int af, const char *src, void *dst, size_t size);
+#endif
+
+#endif /* INET_NET_PTON_H */
--- a/ares/inet_ntop.c
+++ b/ares/inet_ntop.c
@@ -0,0 +1,220 @@
+/* $Id$ */
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#include "setup.h"
+
+#include <sys/types.h>
+
+#if defined(WIN32) && !defined(WATT32)
+#include "nameser.h"
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ares_ipv6.h"
+#include "inet_ntop.h"
+
+
+#if !defined(HAVE_INET_NTOP) || !defined(HAVE_INET_NTOP_IPV6)
+
+#ifdef SPRINTF_CHAR
+# define SPRINTF(x) strlen(sprintf/**/x)
+#else
+# define SPRINTF(x) ((size_t)sprintf x)
+#endif
+
+/*
+ * WARNING: Don't even consider trying to compile this on a system where
+ * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+ */
+
+static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size);
+static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size);
+
+/* char *
+ * inet_ntop(af, src, dst, size)
+ *     convert a network format address to presentation format.
+ * return:
+ *     pointer to presentation format address (`dst'), or NULL (see errno).
+ * author:
+ *     Paul Vixie, 1996.
+ */
+const char *
+ares_inet_ntop(int af, const void *src, char *dst, size_t size)
+{
+  switch (af)
+    {
+    case AF_INET:
+      return (inet_ntop4(src, dst, size));
+    case AF_INET6:
+      return (inet_ntop6(src, dst, size));
+    default:
+      errno = EAFNOSUPPORT;
+      return (NULL);
+    }
+  /* NOTREACHED */
+}
+
+/* const char *
+ * inet_ntop4(src, dst, size)
+ *     format an IPv4 address, more or less like inet_ntoa()
+ * return:
+ *     `dst' (as a const)
+ * notes:
+ *     (1) uses no statics
+ *     (2) takes a unsigned char* not an in_addr as input
+ * author:
+ *     Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop4(const unsigned char *src, char *dst, size_t size)
+{
+  static const char fmt[] = "%u.%u.%u.%u";
+  char tmp[sizeof "255.255.255.255"];
+
+  if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size)
+    {
+      errno = ENOSPC;
+      return (NULL);
+    }
+    strcpy(dst, tmp);
+    return (dst);
+}
+
+/* const char *
+ * inet_ntop6(src, dst, size)
+ *    convert IPv6 binary address into presentation (printable) format
+ * author:
+ *    Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop6(const unsigned char *src, char *dst, size_t size)
+{
+  /*
+   * Note that int32_t and int16_t need only be "at least" large enough
+   * to contain a value of the specified size.  On some systems, like
+   * Crays, there is no such thing as an integer variable with 16 bits.
+   * Keep this in mind if you think this function should have been coded
+   * to use pointer overlays.  All the world's not a VAX.
+   */
+  char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+  struct { int base, len; } best = { 0,0 }, cur = { 0,0 };
+  unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
+  int i;
+
+  /*
+   * Preprocess:
+   *  Copy the input (bytewise) array into a wordwise array.
+   *  Find the longest run of 0x00's in src[] for :: shorthanding.
+   */
+  memset(words, '\0', sizeof words);
+  for (i = 0; i < NS_IN6ADDRSZ; i++)
+      words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+  best.base = -1;
+  cur.base = -1;
+  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
+    {
+      if (words[i] == 0)
+        {
+          if (cur.base == -1)
+            cur.base = i, cur.len = 1;
+          else
+            cur.len++;
+        }
+      else
+        {
+          if (cur.base != -1)
+            {
+              if (best.base == -1 || cur.len > best.len)
+                best = cur;
+              cur.base = -1;
+            }
+        }
+    }
+  if (cur.base != -1)
+    {
+      if (best.base == -1 || cur.len > best.len)
+        best = cur;
+    }
+  if (best.base != -1 && best.len < 2)
+    best.base = -1;
+
+  /*
+   * Format the result.
+   */
+  tp = tmp;
+  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
+    {
+      /* Are we inside the best run of 0x00's? */
+      if (best.base != -1 && i >= best.base &&
+          i < (best.base + best.len))
+        {
+          if (i == best.base)
+             *tp++ = ':';
+          continue;
+        }
+      /* Are we following an initial run of 0x00s or any real hex? */
+      if (i != 0)
+        *tp++ = ':';
+      /* Is this address an encapsulated IPv4? */
+      if (i == 6 && best.base == 0 &&
+          (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
+        {
+          if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+            return (NULL);
+          tp += strlen(tp);
+          break;
+        }
+        tp += SPRINTF((tp, "%x", words[i]));
+    }
+
+  /* Was it a trailing run of 0x00's? */
+  if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ))
+    *tp++ = ':';
+  *tp++ = '\0';
+
+  /*
+   * Check for overflow, copy, and we're done.
+   */
+  if ((size_t)(tp - tmp) > size)
+    {
+      errno = ENOSPC;
+      return (NULL);
+    }
+  strcpy(dst, tmp);
+  return (dst);
+}
+#endif
+
--- a/ares/inet_ntop.h
+++ b/ares/inet_ntop.h
@@ -0,0 +1,26 @@
+/* $Id$ */
+
+/*
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifndef INET_NTOP_H
+#define INET_NTOP_H
+
+#ifdef HAVE_INET_NTOP
+#define ares_inet_ntop(w,x,y,z) inet_ntop(w,x,y,z)
+#else
+const char *ares_inet_ntop(int af, const void *src, char *dst, size_t size);
+#endif
+
+#endif /* INET_NET_NTOP_H */
--- a/ares/maketgz
+++ b/ares/maketgz
@@ -2,8 +2,6 @@

 $version = $ARGV[0];

-$name="c-ares";
-
 if($version eq "") {
    print "Enter version number!\n";
    exit;
@@ -14,87 +12,47 @@ if(!-f "ares.h") {
    exit;
 }

+my ($major, $minor, $patch)=split(/\./, $version);
+
+$major += 0;
+$minor += 0;
+$patch += 0;
+
+open(VER, "<ares_version.h") ||
+    die "can't open ares_version.h";
+open(NEWV, ">ares_version.h.dist");
+while(<VER>) {
+    $_ =~ s/^\#define ARES_VERSION_MAJOR .*/\#define ARES_VERSION_MAJOR $major/;
+    $_ =~ s/^\#define ARES_VERSION_MINOR .*/\#define ARES_VERSION_MINOR $minor/;
+    $_ =~ s/^\#define ARES_VERSION_PATCH .*/\#define ARES_VERSION_PATCH $patch/;
+    $_ =~ s/^\#define ARES_VERSION_STR .*/\#define ARES_VERSION_STR \"$version\"/;
+
+    print NEWV $_;
+}
+close(VER);
+close(NEWV);
+print "ares_version.h.dist created\n";
+
 if(!-f "configure") {
-    `autoconf`;
+    print "running buildconf\n";
+    `./buildconf`;
 }
+print "adding $version in the configure.ac file\n";
+`sed -e 's/AM_INIT_AUTOMAKE(c-ares, CVS)/AM_INIT_AUTOMAKE(c-ares, $version)/' < configure.ac > configure.ac-rel`;

-@files=`find . -name FILES`;
+# now make a new configure script with this
+print "makes a new configure script\n";
+`autoconf configure.ac-rel >configure`;

-my @entries;
+# now run this new configure to get a fine makefile
+print "running configure\n";
+`./configure`;

-sub dirpart {
-    my ($file)=@_;
-    my @p=split("/", $file);
-    $p[$#p]=""; # blank the last one
-    my $dir=join("/", @p);
+# now make the actual tarball
+print "running make dist\n";
+`make dist`;

-    $dir =~ s/^\.\///; # cut off ./ beginnings
-
-    $dir =~ s/\/$//;  # off / trailers
-
-    if(!$dir) {
-        $dir = ".";
-    }
-
-    return $dir;
-}
-
-sub add {
-    my ($file)=@_;
-
-    my $dir=dirpart($file);
-
-    open(FILE, "<$file");
-    while(<FILE>) {
-        if($_ =~ /^ *\#/) {
-            next;
-        }
-        chomp;
-        push @entries, "$dir/$_";
-    }
-    close(FILE);
-}
-
-for(@files) {
-    chomp;
-    add($_);
-}
-
-sub mkalldir {
-    my ($dir) = @_;
-
-    my @parts = split("/", $dir);
-
-    #print "IN: $dir\n";
-
-    my $sub="";
-    for(@parts) {
-        #print "PART: $_\n";
-
-        $sub .= "$_";
-        if($_ eq "") {
-            next;
-        }
-        mkdir($sub, 0777);
-        #print "make $sub\n";
-        $sub .= "/";
-    }
-    
-}
-
-for(@entries) {
-    my $dir = dirpart("$name-$version/$_");
- #   print "Create $dir\n";
-    mkalldir($dir);
- #   print "Copy $_ to $dir\n";
-    `cp -p $_ $dir`;
-}
-
-# make a tarball
-`tar -cf $name-$version.tar $name-$version`;
-# gzip the tarball
-`gzip -9 $name-$version.tar`;
-# remove the dir
-`rm -rf $name-$version`;
+print "removing temporary configure.ac file\n";
+`rm configure.ac-rel`;

 print "NOTE: now cvs tag this release!\n";
--- a/ares/nameser.h
+++ b/ares/nameser.h
@@ -1,16 +1,25 @@
+/* $Id$ */
+
 #ifndef ARES_NAMESER_H
 #define ARES_NAMESER_H

 /* Windows-only header file provided by liren@vivisimo.com to make his Windows
   port build */

+#ifndef NETWARE
 #include <windows.h>
 #include <process.h> /* for the _getpid() proto */
+#endif  /* !NETWARE */
 #include <sys/types.h>

+#ifndef NETWARE
+
 #define MAXHOSTNAMELEN 256

 #define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EMSGSIZE     WSAEMSGSIZE
+#define EAFNOSUPPORT WSAEAFNOSUPPORT

 /* Structure for scatter/gather I/O.  */
 struct iovec
@@ -21,13 +30,20 @@ struct iovec

 #define getpid() _getpid()

+int ares_writev (SOCKET s, const struct iovec *vector, size_t count);
+#define writev(s,vect,count)  ares_writev(s,vect,count)
+
 struct timezone { int dummy; };

 int ares_gettimeofday(struct timeval *tv, struct timezone *tz);
 #define gettimeofday(tv,tz) ares_gettimeofday(tv,tz)

-#define NS_CMPRSFLGS  0xc0  
+#endif  /* !NETWARE */

+#define NS_CMPRSFLGS  0xc0
+#define NS_IN6ADDRSZ  16
+#define NS_INT16SZ    2
+#define NS_INADDRSZ   4

  /* Flag bits indicating name compression. */
 #define INDIR_MASK    NS_CMPRSFLGS
@@ -124,7 +140,7 @@ typedef enum __ns_opcode {

 #define QUERY          ns_o_query

-#define NS_MAXLABEL   63 
+#define NS_MAXLABEL   63
 #define MAXLABEL       NS_MAXLABEL

 #define NS_RRFIXEDSZ  10      /* #/bytes of fixed data in r record */
@@ -211,16 +227,4 @@ typedef enum __ns_rcode {
 #define T_MAILA         ns_t_maila
 #define T_ANY           ns_t_any

-#ifndef __MINGW32__
-/* protos for the functions we provide in windows_port.c */
-int ares_strncasecmp(const char *s1, const char *s2, size_t n);
-int ares_strcasecmp(const char *s1, const char *s2);
-
-/* use this define magic to prevent us from adding symbol names to the library
-   that is a high-risk to collide with another libraries' attempts to do the
-   same */
-#define strncasecmp(a,b,c) ares_strncasecmp(a,b,c)
-#define strcasecmp(a,b) ares_strcasecmp(a,b)
-#endif
-
 #endif /* ARES_NAMESER_H */
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -0,0 +1,148 @@
+#ifndef __ARES_SETUP_H
+#define __ARES_SETUP_H
+
+/* Copyright (C) 2004 - 2005 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#if !defined(WIN32) && defined(__WIN32__)
+/* Borland fix */
+#define WIN32
+#endif
+
+#if !defined(WIN32) && defined(_WIN32)
+/* VS2005 on x64 fix */
+#define WIN32
+#endif
+
+/*
+ * Include configuration script results or hand-crafted
+ * configuration file for platforms which lack config tool.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+
+#ifdef WIN32
+#include "config-win32.h"
+#endif
+
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * Include header files for windows builds before redefining anything.
+ * Use this preproessor block only to include or exclude windows.h,
+ * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
+ * to any other further and independant block.
+ */
+
+#ifdef HAVE_WINDOWS_H
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  ifdef HAVE_WINSOCK2_H
+#    include <winsock2.h>
+#    ifdef HAVE_WS2TCPIP_H
+#       include <ws2tcpip.h>
+#    endif
+#  else
+#    ifdef HAVE_WINSOCK_H
+#      include <winsock.h>
+#    endif
+#  endif
+#endif
+
+/*
+ * Work-arounds for systems without configure support
+ */
+
+#ifndef HAVE_CONFIG_H
+
+#if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \
+    defined(__POCC__)
+#else
+#define ssize_t int
+#endif
+
+#ifndef HAVE_WS2TCPIP_H
+#define socklen_t int
+#endif
+
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * Recent autoconf versions define these symbols in config.h. We don't
+ * want them (since they collide with the libcurl ones when we build
+ *  --enable-debug) so we undef them again here.
+ */
+
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef VERSION
+#undef PACKAGE
+
+/*
+ * Typedef our socket type
+ */
+
+#if defined(WIN32) && !defined(WATT32)
+typedef SOCKET ares_socket_t;
+#define ARES_SOCKET_BAD INVALID_SOCKET
+#else
+typedef int ares_socket_t;
+#define ARES_SOCKET_BAD -1
+#endif
+
+/*
+ * Assume a few thing unless they're set by configure
+ */
+
+#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
+#define HAVE_SYS_TIME_H
+#endif
+
+#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
+#define HAVE_UNISTD_H 1
+#endif
+
+#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
+#define HAVE_SYS_UIO_H
+#endif
+
+#if (defined(WIN32) || defined(WATT32)) && \
+   !(defined(__MINGW32__) || defined(NETWARE) || defined(__DJGPP__))
+/* protos for the functions we provide in windows_port.c */
+int ares_strncasecmp(const char *s1, const char *s2, int n);
+int ares_strcasecmp(const char *s1, const char *s2);
+
+/* use this define magic to prevent us from adding symbol names to the library
+   that is a high-risk to collide with another libraries' attempts to do the
+   same */
+#define strncasecmp(a,b,c) ares_strncasecmp(a,b,c)
+#define strcasecmp(a,b) ares_strcasecmp(a,b)
+#endif
+
+/* IPv6 compatibility */
+#if !defined(HAVE_AF_INET6)
+#if defined(HAVE_PF_INET6)
+#define AF_INET6 PF_INET6
+#else
+#define AF_INET6 AF_MAX+1
+#endif
+#endif
+
+#endif /* __ARES_SETUP_H */
--- a/ares/vc/adig/adig.mak
+++ b/ares/vc/adig/adig.mak
@@ -1,213 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on adig.dsp
-!IF "$(CFG)" == ""
-CFG=adig - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to adig - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "adig - Win32 Release" && "$(CFG)" != "adig - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "adig.mak" CFG="adig - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "adig - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "adig - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "adig - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\adig.exe"
-
-!ELSE 
-
-ALL : "areslib - Win32 Release" "$(OUTDIR)\adig.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"areslib - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\adig.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\adig.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\adig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\adig.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\adig.pdb" /machine:I386 /out:"$(OUTDIR)\adig.exe" /libpath:"..\areslib\Release" 
-LINK32_OBJS= \
-	"$(INTDIR)\adig.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"..\areslib\Release\areslib.lib"
-
-"$(OUTDIR)\adig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "adig - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\adig.exe"
-
-!ELSE 
-
-ALL : "areslib - Win32 Debug" "$(OUTDIR)\adig.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"areslib - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\adig.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\adig.exe"
-	-@erase "$(OUTDIR)\adig.ilk"
-	-@erase "$(OUTDIR)\adig.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\adig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\adig.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\adig.pdb" /debug /machine:I386 /out:"$(OUTDIR)\adig.exe" /pdbtype:sept /libpath:"..\areslib\Debug" 
-LINK32_OBJS= \
-	"$(INTDIR)\adig.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"..\areslib\Debug\areslib.lib"
-
-"$(OUTDIR)\adig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("adig.dep")
-!INCLUDE "adig.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "adig.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "adig - Win32 Release" || "$(CFG)" == "adig - Win32 Debug"
-SOURCE=..\..\adig.c
-
-"$(INTDIR)\adig.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\getopt.c
-
-"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!IF  "$(CFG)" == "adig - Win32 Release"
-
-"areslib - Win32 Release" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
-   cd "..\adig"
-
-"areslib - Win32 ReleaseCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\adig"
-
-!ELSEIF  "$(CFG)" == "adig - Win32 Debug"
-
-"areslib - Win32 Debug" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
-   cd "..\adig"
-
-"areslib - Win32 DebugCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\adig"
-
-!ENDIF 
-
-
-!ENDIF 
-
--- a/ares/vc/adig/adig.plg
+++ b/ares/vc/adig/adig.plg
@@ -1,77 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
--------------------Configuration: areslib - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615A.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"Release/areslib.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
-"Z:\ARES-1.1.1\ares_gethostbyname.c"
-"Z:\ARES-1.1.1\ares_init.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615A.tmp" 
-Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615B.tmp" with contents
-[
-/nologo /out:"Release\areslib.lib" 
-".\Release\ares__close_sockets.obj"
-".\Release\ares__get_hostent.obj"
-".\Release\ares__read_line.obj"
-".\Release\ares_destroy.obj"
-".\Release\ares_expand_name.obj"
-".\Release\ares_fds.obj"
-".\Release\ares_free_errmem.obj"
-".\Release\ares_free_hostent.obj"
-".\Release\ares_free_string.obj"
-".\Release\ares_gethostbyaddr.obj"
-".\Release\ares_gethostbyname.obj"
-".\Release\ares_init.obj"
-".\Release\ares_mkquery.obj"
-".\Release\ares_parse_a_reply.obj"
-".\Release\ares_parse_ptr_reply.obj"
-".\Release\ares_process.obj"
-".\Release\ares_query.obj"
-".\Release\ares_search.obj"
-".\Release\ares_send.obj"
-".\Release\ares_strerror.obj"
-".\Release\ares_timeout.obj"
-".\Release\windows_port.obj"
-]
-Creating command line "link.exe -lib @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615B.tmp"
-<h3>Output Window</h3>
-Compiling...
-ares_gethostbyname.c
-Z:\ARES-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_init.c
-Z:\ARES-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-Z:\ARES-1.1.1\ares_init.c(141) : warning C4013: '_getpid' undefined; assuming extern returning int
-Z:\ARES-1.1.1\ares_init.c(236) : warning C4101: 'p' : unreferenced local variable
-Z:\ARES-1.1.1\ares_init.c(237) : warning C4101: 'linesize' : unreferenced local variable
-Z:\ARES-1.1.1\ares_init.c(235) : warning C4101: 'fp' : unreferenced local variable
-Creating library...
-<h3>
--------------------Configuration: adig - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615C.tmp" with contents
-[
-wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"Release/adig.pdb" /machine:I386 /out:"Release/adig.exe" /libpath:"..\areslib\Release" 
-".\Release\adig.obj"
-".\Release\getopt.obj"
-"\ARES-1.1.1\vc\areslib\Release\areslib.lib"
-]
-Creating command line "link.exe @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP615C.tmp"
-<h3>Output Window</h3>
-Linking...
-
-
-
-<h3>Results</h3>
-adig.exe - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
--- a/ares/vc/ahost/ahost.dep
+++ b/ares/vc/ahost/ahost.dep
@@ -1,2 +1,2 @@
-# Microsoft Developer Studio Generated Dependency File, included by ahost.mak
-
+# Microsoft Developer Studio Generated Dependency File, included by ahost.mak
+
--- a/ares/vc/ahost/ahost.dsp
+++ b/ares/vc/ahost/ahost.dsp
@@ -7,19 +7,19 @@
 CFG=ahost - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "ahost.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "ahost.mak" CFG="ahost - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "ahost - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "ahost - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
+!MESSAGE

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -74,7 +74,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\areslib\Debug"

-!ENDIF 
+!ENDIF

 # Begin Target

--- a/ares/vc/ahost/ahost.mak
+++ b/ares/vc/ahost/ahost.mak
@@ -1,223 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ahost.dsp
-!IF "$(CFG)" == ""
-CFG=ahost - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ahost - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "ahost - Win32 Release" && "$(CFG)" != "ahost - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ahost.mak" CFG="ahost - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ahost - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ahost - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ahost - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ahost.exe"
-
-!ELSE 
-
-ALL : "areslib - Win32 Release" "$(OUTDIR)\ahost.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"areslib - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\ahost.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\ahost.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\ahost.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ahost.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ahost.pdb" /machine:I386 /out:"$(OUTDIR)\ahost.exe" /libpath:"..\areslib\Release" 
-LINK32_OBJS= \
-	"$(INTDIR)\ahost.obj" \
-	"..\areslib\Release\areslib.lib"
-
-"$(OUTDIR)\ahost.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ahost.exe" "$(OUTDIR)\ahost.bsc"
-
-!ELSE 
-
-ALL : "areslib - Win32 Debug" "$(OUTDIR)\ahost.exe" "$(OUTDIR)\ahost.bsc"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"areslib - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\ahost.obj"
-	-@erase "$(INTDIR)\ahost.sbr"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\ahost.bsc"
-	-@erase "$(OUTDIR)\ahost.exe"
-	-@erase "$(OUTDIR)\ahost.ilk"
-	-@erase "$(OUTDIR)\ahost.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ahost.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ahost.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\ahost.sbr"
-
-"$(OUTDIR)\ahost.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=wsock32.lib areslib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ahost.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ahost.exe" /pdbtype:sept /libpath:"..\areslib\Debug" 
-LINK32_OBJS= \
-	"$(INTDIR)\ahost.obj" \
-	"..\areslib\Debug\areslib.lib"
-
-"$(OUTDIR)\ahost.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("ahost.dep")
-!INCLUDE "ahost.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "ahost.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "ahost - Win32 Release" || "$(CFG)" == "ahost - Win32 Debug"
-SOURCE=..\..\ahost.c
-
-!IF  "$(CFG)" == "ahost - Win32 Release"
-
-
-"$(INTDIR)\ahost.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
-
-
-"$(INTDIR)\ahost.obj"	"$(INTDIR)\ahost.sbr" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-!IF  "$(CFG)" == "ahost - Win32 Release"
-
-"areslib - Win32 Release" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
-   cd "..\ahost"
-
-"areslib - Win32 ReleaseCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\ahost"
-
-!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
-
-"areslib - Win32 Debug" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
-   cd "..\ahost"
-
-"areslib - Win32 DebugCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\ahost"
-
-!ENDIF 
-
-
-!ENDIF 
-
--- a/ares/vc/ahost/ahost.plg
+++ b/ares/vc/ahost/ahost.plg
@@ -1,16 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
--------------------Configuration: ahost - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-
-
-
-<h3>Results</h3>
-ahost.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
--- a/ares/vc/areslib/areslib.dsp
+++ b/ares/vc/areslib/areslib.dsp
@@ -7,19 +7,19 @@
 CFG=areslib - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "areslib.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -63,8 +63,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -74,7 +74,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo

-!ENDIF 
+!ENDIF

 # Begin Target

@@ -97,6 +97,10 @@ SOURCE=..\..\ares__read_line.c
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_cancel.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\ares_destroy.c
 # End Source File
 # Begin Source File
@@ -109,10 +113,6 @@ SOURCE=..\..\ares_fds.c
 # End Source File
 # Begin Source File

-SOURCE=..\..\ares_free_errmem.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\ares_free_hostent.c
 # End Source File
 # Begin Source File
@@ -141,6 +141,10 @@ SOURCE=..\..\ares_parse_a_reply.c
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_parse_aaaa_reply.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\ares_parse_ptr_reply.c
 # End Source File
 # Begin Source File
@@ -169,6 +173,22 @@ SOURCE=..\..\ares_timeout.c
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_version.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\bitncmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inet_net_pton.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inet_ntop.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\windows_port.c
 # End Source File
 # End Group
@@ -185,10 +205,30 @@ SOURCE=..\..\ares_dns.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_ipv6.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\ares_private.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_version.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\bitncmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inet_net_pton.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inet_ntop.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\nameser.h
 # End Source File
 # End Group
--- a/ares/vc/areslib/areslib.dsw
+++ b/ares/vc/areslib/areslib.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "areslib"=.\areslib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/ares/vc/areslib/areslib.mak
+++ b/ares/vc/areslib/areslib.mak
@@ -1,361 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on areslib.dsp
-!IF "$(CFG)" == ""
-CFG=areslib - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to areslib - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "areslib - Win32 Release" && "$(CFG)" != "areslib - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "areslib - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\areslib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\ares__close_sockets.obj"
-	-@erase "$(INTDIR)\ares__get_hostent.obj"
-	-@erase "$(INTDIR)\ares__read_line.obj"
-	-@erase "$(INTDIR)\ares_destroy.obj"
-	-@erase "$(INTDIR)\ares_expand_name.obj"
-	-@erase "$(INTDIR)\ares_fds.obj"
-	-@erase "$(INTDIR)\ares_free_errmem.obj"
-	-@erase "$(INTDIR)\ares_free_hostent.obj"
-	-@erase "$(INTDIR)\ares_free_string.obj"
-	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
-	-@erase "$(INTDIR)\ares_gethostbyname.obj"
-	-@erase "$(INTDIR)\ares_init.obj"
-	-@erase "$(INTDIR)\ares_mkquery.obj"
-	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
-	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
-	-@erase "$(INTDIR)\ares_process.obj"
-	-@erase "$(INTDIR)\ares_query.obj"
-	-@erase "$(INTDIR)\ares_search.obj"
-	-@erase "$(INTDIR)\ares_send.obj"
-	-@erase "$(INTDIR)\ares_strerror.obj"
-	-@erase "$(INTDIR)\ares_timeout.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\windows_port.obj"
-	-@erase "$(OUTDIR)\areslib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\ares__close_sockets.obj" \
-	"$(INTDIR)\ares__get_hostent.obj" \
-	"$(INTDIR)\ares__read_line.obj" \
-	"$(INTDIR)\ares_destroy.obj" \
-	"$(INTDIR)\ares_expand_name.obj" \
-	"$(INTDIR)\ares_fds.obj" \
-	"$(INTDIR)\ares_free_errmem.obj" \
-	"$(INTDIR)\ares_free_hostent.obj" \
-	"$(INTDIR)\ares_free_string.obj" \
-	"$(INTDIR)\ares_gethostbyaddr.obj" \
-	"$(INTDIR)\ares_gethostbyname.obj" \
-	"$(INTDIR)\ares_init.obj" \
-	"$(INTDIR)\ares_mkquery.obj" \
-	"$(INTDIR)\ares_parse_a_reply.obj" \
-	"$(INTDIR)\ares_parse_ptr_reply.obj" \
-	"$(INTDIR)\ares_process.obj" \
-	"$(INTDIR)\ares_query.obj" \
-	"$(INTDIR)\ares_search.obj" \
-	"$(INTDIR)\ares_send.obj" \
-	"$(INTDIR)\ares_strerror.obj" \
-	"$(INTDIR)\ares_timeout.obj" \
-	"$(INTDIR)\windows_port.obj"
-
-"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "areslib - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\areslib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\ares__close_sockets.obj"
-	-@erase "$(INTDIR)\ares__get_hostent.obj"
-	-@erase "$(INTDIR)\ares__read_line.obj"
-	-@erase "$(INTDIR)\ares_destroy.obj"
-	-@erase "$(INTDIR)\ares_expand_name.obj"
-	-@erase "$(INTDIR)\ares_fds.obj"
-	-@erase "$(INTDIR)\ares_free_errmem.obj"
-	-@erase "$(INTDIR)\ares_free_hostent.obj"
-	-@erase "$(INTDIR)\ares_free_string.obj"
-	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
-	-@erase "$(INTDIR)\ares_gethostbyname.obj"
-	-@erase "$(INTDIR)\ares_init.obj"
-	-@erase "$(INTDIR)\ares_mkquery.obj"
-	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
-	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
-	-@erase "$(INTDIR)\ares_process.obj"
-	-@erase "$(INTDIR)\ares_query.obj"
-	-@erase "$(INTDIR)\ares_search.obj"
-	-@erase "$(INTDIR)\ares_send.obj"
-	-@erase "$(INTDIR)\ares_strerror.obj"
-	-@erase "$(INTDIR)\ares_timeout.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\windows_port.obj"
-	-@erase "$(OUTDIR)\areslib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\ares__close_sockets.obj" \
-	"$(INTDIR)\ares__get_hostent.obj" \
-	"$(INTDIR)\ares__read_line.obj" \
-	"$(INTDIR)\ares_destroy.obj" \
-	"$(INTDIR)\ares_expand_name.obj" \
-	"$(INTDIR)\ares_fds.obj" \
-	"$(INTDIR)\ares_free_errmem.obj" \
-	"$(INTDIR)\ares_free_hostent.obj" \
-	"$(INTDIR)\ares_free_string.obj" \
-	"$(INTDIR)\ares_gethostbyaddr.obj" \
-	"$(INTDIR)\ares_gethostbyname.obj" \
-	"$(INTDIR)\ares_init.obj" \
-	"$(INTDIR)\ares_mkquery.obj" \
-	"$(INTDIR)\ares_parse_a_reply.obj" \
-	"$(INTDIR)\ares_parse_ptr_reply.obj" \
-	"$(INTDIR)\ares_process.obj" \
-	"$(INTDIR)\ares_query.obj" \
-	"$(INTDIR)\ares_search.obj" \
-	"$(INTDIR)\ares_send.obj" \
-	"$(INTDIR)\ares_strerror.obj" \
-	"$(INTDIR)\ares_timeout.obj" \
-	"$(INTDIR)\windows_port.obj"
-
-"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("areslib.dep")
-!INCLUDE "areslib.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "areslib.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "areslib - Win32 Release" || "$(CFG)" == "areslib - Win32 Debug"
-SOURCE=..\..\ares__close_sockets.c
-
-"$(INTDIR)\ares__close_sockets.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares__get_hostent.c
-
-"$(INTDIR)\ares__get_hostent.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares__read_line.c
-
-"$(INTDIR)\ares__read_line.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_destroy.c
-
-"$(INTDIR)\ares_destroy.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_expand_name.c
-
-"$(INTDIR)\ares_expand_name.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_fds.c
-
-"$(INTDIR)\ares_fds.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_free_errmem.c
-
-"$(INTDIR)\ares_free_errmem.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_free_hostent.c
-
-"$(INTDIR)\ares_free_hostent.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_free_string.c
-
-"$(INTDIR)\ares_free_string.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_gethostbyaddr.c
-
-"$(INTDIR)\ares_gethostbyaddr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_gethostbyname.c
-
-"$(INTDIR)\ares_gethostbyname.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_init.c
-
-"$(INTDIR)\ares_init.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_mkquery.c
-
-"$(INTDIR)\ares_mkquery.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_parse_a_reply.c
-
-"$(INTDIR)\ares_parse_a_reply.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_parse_ptr_reply.c
-
-"$(INTDIR)\ares_parse_ptr_reply.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_process.c
-
-"$(INTDIR)\ares_process.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_query.c
-
-"$(INTDIR)\ares_query.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_search.c
-
-"$(INTDIR)\ares_search.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_send.c
-
-"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_strerror.c
-
-"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_timeout.c
-
-"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\windows_port.c
-
-"$(INTDIR)\windows_port.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
--- a/ares/vc/areslib/areslib.plg
+++ b/ares/vc/areslib/areslib.plg
@@ -1,125 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
--------------------Configuration: areslib - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"Release/areslib.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
-"Z:\ares-1.1.1\ares__close_sockets.c"
-"Z:\ares-1.1.1\ares__get_hostent.c"
-"Z:\ares-1.1.1\ares__read_line.c"
-"Z:\ares-1.1.1\ares_destroy.c"
-"Z:\ares-1.1.1\ares_expand_name.c"
-"Z:\ares-1.1.1\ares_fds.c"
-"Z:\ares-1.1.1\ares_free_errmem.c"
-"Z:\ares-1.1.1\ares_free_hostent.c"
-"Z:\ares-1.1.1\ares_free_string.c"
-"Z:\ares-1.1.1\ares_gethostbyaddr.c"
-"Z:\ares-1.1.1\ares_gethostbyname.c"
-"Z:\ares-1.1.1\ares_init.c"
-"Z:\ares-1.1.1\ares_mkquery.c"
-"Z:\ares-1.1.1\ares_parse_a_reply.c"
-"Z:\ares-1.1.1\ares_parse_ptr_reply.c"
-"Z:\ares-1.1.1\ares_process.c"
-"Z:\ares-1.1.1\ares_query.c"
-"Z:\ares-1.1.1\ares_search.c"
-"Z:\ares-1.1.1\ares_send.c"
-"Z:\ares-1.1.1\ares_strerror.c"
-"Z:\ares-1.1.1\ares_timeout.c"
-"Z:\ares-1.1.1\windows_port.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603D.tmp" 
-Creating temporary file "C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603E.tmp" with contents
-[
-/nologo /out:"Release\areslib.lib" 
-".\Release\ares__close_sockets.obj"
-".\Release\ares__get_hostent.obj"
-".\Release\ares__read_line.obj"
-".\Release\ares_destroy.obj"
-".\Release\ares_expand_name.obj"
-".\Release\ares_fds.obj"
-".\Release\ares_free_errmem.obj"
-".\Release\ares_free_hostent.obj"
-".\Release\ares_free_string.obj"
-".\Release\ares_gethostbyaddr.obj"
-".\Release\ares_gethostbyname.obj"
-".\Release\ares_init.obj"
-".\Release\ares_mkquery.obj"
-".\Release\ares_parse_a_reply.obj"
-".\Release\ares_parse_ptr_reply.obj"
-".\Release\ares_process.obj"
-".\Release\ares_query.obj"
-".\Release\ares_search.obj"
-".\Release\ares_send.obj"
-".\Release\ares_strerror.obj"
-".\Release\ares_timeout.obj"
-".\Release\windows_port.obj"
-]
-Creating command line "link.exe -lib @C:\DOCUME~1\liren\LOCALS~1\Temp\RSP603E.tmp"
-<h3>Output Window</h3>
-Compiling...
-ares__close_sockets.c
-Z:\ares-1.1.1\ares__close_sockets.c(46) : warning C4013: 'close' undefined; assuming extern returning int
-ares__get_hostent.c
-ares__read_line.c
-ares_destroy.c
-ares_expand_name.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_fds.c
-ares_free_errmem.c
-ares_free_hostent.c
-ares_free_string.c
-ares_gethostbyaddr.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_gethostbyname.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_init.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-Z:\ares-1.1.1\ares_init.c(141) : warning C4013: '_getpid' undefined; assuming extern returning int
-Z:\ares-1.1.1\ares_init.c(236) : warning C4101: 'p' : unreferenced local variable
-Z:\ares-1.1.1\ares_init.c(237) : warning C4101: 'linesize' : unreferenced local variable
-Z:\ares-1.1.1\ares_init.c(235) : warning C4101: 'fp' : unreferenced local variable
-ares_mkquery.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_parse_a_reply.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-Z:\ares-1.1.1\ares_parse_a_reply.c(90) : warning C4018: '<' : signed/unsigned mismatch
-ares_parse_ptr_reply.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-Z:\ares-1.1.1\ares_parse_ptr_reply.c(71) : warning C4018: '<' : signed/unsigned mismatch
-ares_process.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_query.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_search.c
-Z:\ares-1.1.1\ares_search.c(229) : warning C4013: 'strncasecmp' undefined; assuming extern returning int
-ares_send.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-ares_strerror.c
-ares_timeout.c
-windows_port.c
-Z:\ares-1.1.1\nameser.h(153) : warning C4005: 'NOERROR' : macro redefinition
-        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\winerror.h(8022) : see previous definition of 'NOERROR'
-Creating library...
-
-
-
-<h3>Results</h3>
-areslib.lib - 0 error(s), 19 warning(s)
-</pre>
-</body>
-</html>
--- a/ares/windows_port.c
+++ b/ares/windows_port.c
@@ -1,15 +1,28 @@
+#include "setup.h"
+
+/* only do the following on windows
+ */
+#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <errno.h>
+#include <malloc.h>

+#ifdef WATT32
+#include <sys/socket.h>
+#else
 #include "nameser.h"
+#endif
+#include "ares.h"
+#include "ares_private.h"

 #ifndef __MINGW32__
 int
-ares_strncasecmp(const char *a, const char *b, size_t n)
+ares_strncasecmp(const char *a, const char *b, int n)
 {
-    size_t i;
+    int i;

    for (i = 0; i < n; i++) {
        int c1 = isupper(a[i]) ? tolower(a[i]) : a[i];
@@ -26,38 +39,67 @@ ares_strcasecmp(const char *a, const char *b)
 }
 #endif

-int 
-ares_gettimeofday(struct timeval *tv, struct timezone *tz) 
+/*
+ * Number of micro-seconds between the beginning of the Windows epoch
+ * (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970).
+ */
+#if defined(_MSC_VER) || defined(__WATCOMC__)
+#define EPOCH_FILETIME 11644473600000000Ui64
+#else
+#define EPOCH_FILETIME 11644473600000000ULL
+#endif
+
+int
+ares_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
    FILETIME        ft;
    LARGE_INTEGER   li;
    __int64         t;
-    static int      tzflag;

    if (tv)
    {
        GetSystemTimeAsFileTime(&ft);
        li.LowPart  = ft.dwLowDateTime;
        li.HighPart = ft.dwHighDateTime;
-        t  = li.QuadPart;       /* In 100-nanosecond intervals */
-        //t -= EPOCHFILETIME;     /* Offset to the Epoch time */
-        t /= 10;                /* In microseconds */
+        t  = li.QuadPart / 10;   /* In micro-second intervals */
+        t -= EPOCH_FILETIME;     /* Offset to the Epoch time */
        tv->tv_sec  = (long)(t / 1000000);
        tv->tv_usec = (long)(t % 1000000);
    }
-
-#if 0
-    if (tz)
-    {
-        if (!tzflag)
-        {
-            _tzset();
-            tzflag++;
-        }
-        tz->tz_minuteswest = _timezone / 60;
-        tz->tz_dsttime = _daylight;
-    }
-#endif
-
+    (void) tz;
    return 0;
 }
+
+int
+ares_writev (ares_socket_t s, const struct iovec *vector, size_t count)
+{
+  char *buffer, *bp;
+  size_t i, bytes = 0;
+
+  /* Find the total number of bytes to write
+   */
+  for (i = 0; i < count; i++)
+      bytes += vector[i].iov_len;
+
+  if (bytes == 0)   /* not an error */
+     return (0);
+
+  /* Allocate a temporary buffer to hold the data
+   */
+  buffer = bp = (char*) alloca (bytes);
+  if (!buffer)
+  {
+    errno = ENOMEM;
+    return (-1);
+  }
+
+  /* Copy the data into buffer.
+   */
+  for (i = 0; i < count; ++i)
+  {
+    memcpy (bp, vector[i].iov_base, vector[i].iov_len);
+    bp += vector[i].iov_len;
+  }
+  return send (s, (const void*)buffer, bytes, 0);
+}
+#endif /* WIN32 builds only */
--- a/85
+++ b/85
@@ -1,4 +1,26 @@
 #!/bin/sh
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 1998 - 2005, 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
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id$
+###########################################################################

 die(){
 	echo "$@"
@@ -13,7 +35,8 @@ findtool(){
  IFS=":"
  for path in $PATH
  do
-    if test -r "$path/$file"; then
+    # echo "checks for $file in $path" >&2
+    if test -f "$path/$file"; then
      echo "$path/$file"
      return
    fi
@@ -24,7 +47,7 @@ findtool(){
 # autoconf 2.57 or newer
 #
 need_autoconf="2.57"
-ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|head -n 1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
  echo "buildconf: autoconf not found."
  echo "            You need autoconf version $need_autoconf or newer installed."
@@ -45,7 +68,7 @@ echo "buildconf: autoconf version $ac_version (ok)"
 #--------------------------------------------------------------------------
 # autoheader 2.50 or newer
 #
-ah_version=`${AUTOHEADER:-autoheader} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+ah_version=`${AUTOHEADER:-autoheader} --version 2>/dev/null|head -n 1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ah_version"; then
  echo "buildconf: autoheader not found."
  echo "            You need autoheader version 2.50 or newer installed."
@@ -67,7 +90,7 @@ echo "buildconf: autoheader version $ah_version (ok)"
 # automake 1.7 or newer
 #
 need_automake="1.7"
-am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//' -e 's/\(.*\)\(-p.*\)/\1/'`
+am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -n 1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//' -e 's/\(.*\)\(-p.*\)/\1/'`
 if test -z "$am_version"; then
  echo "buildconf: automake not found."
  echo "            You need automake version $need_automake or newer installed."
@@ -85,6 +108,13 @@ fi

 echo "buildconf: automake version $am_version (ok)"

+ac=`findtool ${ACLOCAL:-aclocal}`
+if test -z "$ac"; then
+  echo "buildconf: aclocal not found. Weird automake installation!"
+  exit 1
+else
+  echo "buildconf: aclocal found"
+fi

 #--------------------------------------------------------------------------
 # libtool check
@@ -99,9 +129,18 @@ LIBTOOL_WANTED_VERSION=1.4.2
 # glibtool, with 'libtool' being something completely different.
 libtool=`findtool glibtool 2>/dev/null`
 if test ! -x "$libtool"; then
-  libtool=`findtool libtool`
+  libtool=`findtool ${LIBTOOL:-libtool}`
 fi
-lt_pversion=`$libtool --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
+
+if test -z "$LIBTOOLIZE"; then
+  # set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
+  # $libtool is already the full path
+  libtoolize="${libtool}ize"
+else
+  libtoolize=`findtool $LIBTOOLIZE`
+fi
+
+lt_pversion=`$libtool --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
 if test -z "$lt_pversion"; then
  echo "buildconf: libtool not found."
  echo "            You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
@@ -138,10 +177,17 @@ fi

 echo "buildconf: libtool version $lt_version (ok)"

+if test -f "$libtoolize"; then
+  echo "buildconf: libtoolize found"
+else
+  echo "buildconf: libtoolize not found. Weird libtool installation!"
+  exit 1
+fi
+
 #--------------------------------------------------------------------------
 # m4 check
 #
-m4=`${M4:-m4} --version 2>/dev/null|head -1`;
+m4=`${M4:-m4} --version 2>/dev/null|head -n 1`;
 m4_version=`echo $m4 | sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`

 if { echo $m4 | grep "GNU" >/dev/null 2>&1; } then
@@ -151,33 +197,42 @@ else
  exit 1
 fi

+#--------------------------------------------------------------------------
+# perl check
+#
+PERL=`findtool ${PERL:-perl}`

 # ------------------------------------------------------------

 # run the correct scripts now

 echo "buildconf: running libtoolize"
-${LIBTOOLIZE:-libtoolize} --copy --automake --force || die "The libtool command failed"
+$libtoolize --copy --automake --force || die "The libtoolize command failed"
 echo "buildconf: running aclocal"
 ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The aclocal command line failed"
-echo "buildconf: running aclocal hack to convert all mv to mv -f"
-perl -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4
+if test -n "$PERL"; then
+  echo "buildconf: running aclocal hack to convert all mv to mv -f"
+  $PERL -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4
+else
+  echo "buildconf: perl not found"
+  exit 1
+fi
 echo "buildconf: running autoheader"
 ${AUTOHEADER:-autoheader} || die "The autoheader command failed"
+echo "buildconf: cp lib/config.h.in src/config.h.in"
+cp lib/config.h.in src/config.h.in
 echo "buildconf: running autoconf"
 ${AUTOCONF:-autoconf}     || die "The autoconf command failed"

 if test -d ares; then
  cd ares
-  echo "buildconf: running aclocal in the ares directory"
-  ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The ares aclocal command failed"
-  echo "buildconf: running autoconf in the ares directory"
-  ${AUTOCONF:-autoconf}     || die "The ares autoconf command failed"
+  echo "buildconf: running in ares"
+  ./buildconf
  cd ..
 fi

 echo "buildconf: running automake"
-${AUTOMAKE:-automake} -a  || die "The automake command failed"
+${AUTOMAKE:-automake} -a -c  || die "The automake command failed"

 echo "buildconf: OK"
 exit 0
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -7,9 +7,6 @@ REM create ca-bundle.h
 echo /* This file is generated automatically */ >lib\ca-bundle.h
 echo #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") >>lib\ca-bundle.h

-REM create getdate.c
-copy lib\getdate.c.cvs lib\getdate.c
-
 REM create hugehelp.c
 copy src\hugehelp.c.cvs src\hugehelp.c

--- a/configure.ac
+++ b/configure.ac
--- a/curl-config.in
+++ b/curl-config.in
@@ -1,10 +1,30 @@
 #! /bin/sh
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 2001 - 2006, 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
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id$
+###########################################################################
 #
 # The idea to this kind of setup info script was stolen from numerous
 # other packages, such as neon, libxml and gnome.
 #
-# $Id$
-#
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
@@ -19,7 +39,9 @@ Available values for OPTION include:
  --ca        ca bundle install path
  --cc        compiler
  --cflags    pre-processor and compiler flags
-  --feature   newline separated list of enabled features
+  --checkfor [version] check for (lib)curl of the specified version
+  --features  newline separated list of enabled features
+  --protocols newline separated list of enabled protocols
  --help      display this help and exit
  --libs      library linking information
  --prefix    curl install prefix
@@ -45,19 +67,22 @@ while test $# -gt 0; do

    case "$1" in
    --ca)
-	echo @CURL_CA_BUNDLE@
+	echo "@CURL_CA_BUNDLE@"
 	;;

    --cc)
-	echo @CC@
+	echo "@CC@"
 	;;

    --prefix)
-	echo $prefix
+	echo "$prefix"
 	;;

-    --feature)
-	if test "@OPENSSL_ENABLED@" = "1"; then
+    --feature|--features)
+	if test "@USE_SSLEAY@" = "1"; then
+          echo "SSL"
+          NTLM=1 # OpenSSL implies NTLM
+        elif test -n "@USE_GNUTLS@"; then
          echo "SSL"
        fi
 	if test "@KRB4_ENABLED@" = "1"; then
@@ -69,37 +94,75 @@ while test $# -gt 0; do
 	if test "@HAVE_LIBZ@" = "1"; then
          echo "libz"
        fi
-	if test "@CURL_DISABLE_HTTP@" = "1"; then
-          echo "HTTP-disabled"
-        fi
-	if test "@CURL_DISABLE_FTP@" = "1"; then
-          echo "FTP-disabled"
-        fi
-	if test "@CURL_DISABLE_GOPHER@" = "1"; then
-          echo "GOPHER-disabled"
-        fi
-	if test "@CURL_DISABLE_FILE@" = "1"; then
-          echo "FILE-disabled"
-        fi
-	if test "@CURL_DISABLE_TELNET@" = "1"; then
-          echo "TELNET-disabled"
-        fi
-	if test "@CURL_DISABLE_LDAP@" = "1"; then
-          echo "LDAP-disabled"
-        fi
-	if test "@CURL_DISABLE_DICT@" = "1"; then
-          echo "DICT-disabled"
-        fi
 	if test "@HAVE_ARES@" = "1"; then
          echo "AsynchDNS"
        fi
+	if test "@IDN_ENABLED@" = "1"; then
+          echo "IDN"
+        fi
+	if test "@USE_WINDOWS_SSPI@" = "1"; then
+          echo "SSPI"
+          NTLM=1
+        fi
+	if test "$NTLM" = "1"; then
+          echo "NTLM"
+        fi
 	;;

+    --protocols)
+	if test "@CURL_DISABLE_HTTP@" != "1"; then
+          echo "HTTP"
+	  if test "@USE_SSLEAY@" = "1"; then
+            echo "HTTPS"
+          fi
+        fi
+	if test "@CURL_DISABLE_FTP@" != "1"; then
+          echo "FTP"
+	  if test "@USE_SSLEAY@" = "1"; then
+            echo "FTPS"
+          fi
+        fi
+	if test "@CURL_DISABLE_FILE@" != "1"; then
+          echo "FILE"
+        fi
+	if test "@CURL_DISABLE_TELNET@" != "1"; then
+          echo "TELNET"
+        fi
+	if test "@CURL_DISABLE_LDAP@" != "1"; then
+          echo "LDAP"
+        fi
+	if test "@CURL_DISABLE_DICT@" != "1"; then
+          echo "DICT"
+        fi
+	if test "@CURL_DISABLE_TFTP@" != "1"; then
+          echo "TFTP"
+        fi
+	;;
    --version)
 	echo libcurl @VERSION@
 	exit 0
 	;;

+    --checkfor)
+        checkfor=$2
+        cmajor=`echo $checkfor | cut -d. -f1`
+        cminor=`echo $checkfor | cut -d. -f2`
+        # when extracting the patch part we strip off everything after a
+	# dash as that's used for things like version 1.2.3-CVS
+	cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
+        checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
+        numuppercase=`echo @VERSIONNUM@ | tr 'a-f' 'A-F'`
+        nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
+
+	if test "$nownum" -ge "$checknum"; then
+	  # silent success
+	  exit 0
+	else
+	  echo "requested version $checkfor is newer than existing @VERSION@"
+	  exit 1
+	fi
+	;;
+
    --vernum)
 	echo @VERSIONNUM@
 	exit 0
@@ -123,8 +186,7 @@ while test $# -gt 0; do

    *)
        echo "unknown option: $1"
-	usage
-	exit 1
+	usage 1
 	;;
    esac
    shift
--- a/curl-style.el
+++ b/curl-style.el
@@ -20,6 +20,13 @@
    )
  "Curl C Programming Style")

+(defun curl-code-cleanup ()
+  "no docs"
+  (interactive)
+  (untabify (point-min) (point-max))
+  (delete-trailing-whitespace)
+)
+
 ;; Customizations for all of c-mode, c++-mode, and objc-mode
 (defun curl-c-mode-common-hook ()
  "Curl C mode hook"
@@ -28,12 +35,12 @@
  (setq tab-width 8
 	indent-tabs-mode nil		; Use spaces. Not tabs.
 	comment-column 40
-	c-font-lock-extra-types (append '("bool" "CURL" "CURLcode" "ssize_t" "size_t" "socklen_t" "fd_set" "time_t" "curl_off_t" "curl_socket_t" "in_addr_t" "CURLSHcode" "CURLMcode"))
+	c-font-lock-extra-types (append '("bool" "CURL" "CURLcode" "ssize_t" "size_t" "socklen_t" "fd_set" "time_t" "curl_off_t" "curl_socket_t" "in_addr_t" "CURLSHcode" "CURLMcode" "Curl_addrinfo"))
 	)
  ;; keybindings for C, C++, and Objective-C.  We can put these in
  ;; c-mode-base-map because of inheritance ...
  (define-key c-mode-base-map "\M-q" 'c-fill-paragraph)
-  (define-key c-mode-base-map "\M-m" 'delete-trailing-whitespace)
+  (define-key c-mode-base-map "\M-m" 'curl-code-cleanup)
  (setq c-recognize-knr-p nil)
  ;;; (add-hook 'write-file-hooks 'delete-trailing-whitespace t)
  (setq show-trailing-whitespace t)
--- a/docs/BINDINGS
+++ b/docs/BINDINGS
@@ -1,7 +1,7 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                             \___|\___/|_| \_\_____|

                               libcurl bindings
@@ -17,22 +17,31 @@ archives, but must be downloaded and installed separately.

 Ada95

-  Writtten by Andreas Almroth.
+  Writtten by Andreas Almroth
  http://www.almroth.com/adacurl/index.html

 Basic

-  ScriptBasic bindings to libcurl. Writtten by Peter Verhas.
+  ScriptBasic bindings to libcurl. Writtten by Peter Verhas
  http://scriptbasic.com/

+C
+  libcurl is a C library in itself!
+  http://curl.haxx.se/libcurl/
+
 C++

-  Written by Jean-Philippe Barrette-LaPierre.
-  http://www.sourceforge.net/projects/curlpp
+  Written by Jean-Philippe Barrette-LaPierre
+  http://rrette.com/curlpp.html
+
+Ch
+
+  Written by Stephen Nestinger and Jonathan Rogado
+  http://chcurl.sourceforge.net/

 Cocoa

-  Written by Dan Wood.
+  Written by Dan Wood
  http://curlhandle.sourceforge.net/

 D
@@ -42,26 +51,49 @@ D

 Dylan

-  Written by Chris Double.
+  Written by Chris Double
  http://dylanlibs.sourceforge.net/

 Euphoria

-  Written by Ray Smith.
+  Written by Ray Smith
  http://rays-web.com/eulibcurl.htm

 Ferite
+  Written by Paul Querna
  http://www.ferite.org/

+Gambas
+  http://gambas.sourceforge.net
+
+glib/GTK+
+  Written by Richard Atterer
+  http://atterer.net/glibcurl/
+
 Java

-  Written by Daniel Stenberg.
+  Maintained by Vic Hanson
  http://curl.haxx.se/libcurl/java/

+Lisp
+
+  Written by Liam Healy
+  http://common-lisp.net/project/cl-curl/
+
 Lua

-  Written by Steve Dekorte.
-  http://curl.haxx.se/libcurl/lua/
+  LuaCURL Written by Alexander Marinov
+  http://luacurl.luaforge.net/
+
+Mono
+
+  Written by Jeffrey Phillips
+  http://forge.novell.com/modules/xfmod/project/?libcurl-mono
+
+.NET
+
+  libcurl-net Written by Jeffrey Phillips
+  http://sourceforge.net/projects/libcurl-net/

 Object-Pascal

@@ -70,7 +102,7 @@ Object-Pascal

 O'Caml

-  Written by Lars Nilsson.
+  Written by Lars Nilsson
  http://sourceforge.net/projects/ocurl/

 Pascal
@@ -80,40 +112,74 @@ Pascal

 Perl

-  Maintained by Cris Bailiff.
+  Maintained by Cris Bailiff
  http://curl.haxx.se/libcurl/perl/

 PHP

-  Written by Sterling Hughes.
+  Written by Sterling Hughes
  http://curl.haxx.se/libcurl/php/

 PostgreSQL

-  Written by Gian Paolo Ciceri.
+  Written by Gian Paolo Ciceri
  http://gborg.postgresql.org/project/pgcurl/projdisplay.php

 Python

-  Written by Kjetil Jacobsen.
+  PycURL is written by Kjetil Jacobsen
  http://pycurl.sourceforge.net/

+R
+
+  RCurl is written by Duncan Temple Lang
+  http://www.omegahat.org/RCurl/
+
 Rexx

-  Written Mark Hessling. 
+  Written Mark Hessling
  http://rexxcurl.sourceforge.net/

 Ruby

-  Written by Hirotaka Matsuyuki. 
+  Written by Hirotaka Matsuyuki
  http://www.d1.dion.ne.jp/~matuyuki/ruby.html

 Scheme

-  Bigloo binding written by Kirill Lisovsky.
+  Bigloo binding written by Kirill Lisovsky
  http://curl.haxx.se/libcurl/scheme/

+S-Lang
+
+  S-Lang binding written by John E Davis
+  http://www.jedsoft.org/slang/modules/curl.html
+
+SPL
+
+  SPL binding written by Clifford Wolf
+  http://www.clifford.at/spl/
+
 Tcl

-  Written by Andr<64>s Garc<72>a. 
+  Tclcurl is written by Andr<64>s Garc<72>a
  http://personal1.iddeo.es/andresgarci/tclcurl/english/docs.html
+
+Visual Basic
+
+  libcurl-vb is written by Jeffrey Phillips
+  http://sourceforge.net/projects/libcurl-vb/
+
+Q
+  The libcurl module is part of the default install
+  http://q-lang.sourceforge.net/
+
+wxWidgets
+
+  Written by Casey O'Donnell
+  http://homepage.mac.com/codonnell/wxcurldav/
+
+XBLite
+
+  Written by David Szafranski
+  http://perso.wanadoo.fr/xblite/libraries.html
--- a/docs/CONTRIBUTE
+++ b/docs/CONTRIBUTE
@@ -1,14 +1,14 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                             \___|\___/|_| \_\_____|

-To Think About When Contributing Source Code
+                        When Contributing Source Code

- This document is intended to offer some simple guidelines that can be useful
- to keep in mind when you decide to contribute to the project. This concerns
- new features as well as corrections to existing flaws or bugs.
+ This document is intended to offer guidelines that can be useful to keep in
+ mind when you decide to contribute to the project. This concerns new features
+ as well as corrections to existing flaws or bugs.

 Join the Community

@@ -20,13 +20,26 @@ Join the Community
 The License Issue

 When contributing with code, you agree to put your changes and new code under
- the same license curl and libcurl is already using unless stated otherwise.
+ the same license curl and libcurl is already using unless stated and agreed
+ otherwise.

 If you add a larger piece of code, you can opt to make that file or set of
 files to use a different license as long as they don't enforce any changes to
 the rest of the package and they make sense. Such "separate parts" can not be
- GPL (as we don't want the GPL virus to attack users of libcurl) but they must
- use "GPL compatible" licenses.
+ GPL licensed (as we don't want copyleft to affect users of libcurl) but they
+ must use "GPL compatible" licenses (as we want to allow users to use libcurl
+ properly in GPL licensed environments).
+
+ When changing existing source code, you do not alter the copyright of the
+ original file(s). The copyright will still be owned by the original
+ creator(s) or those who have been assigned copyright by the original
+ author(s).
+
+ By submitting a patch to the curl project, you are assumed to have the right
+ to the code and to be allowed by your employer or whatever to hand over that
+ patch/code to us. We will credit you for your changes as far as possible, to
+ give credit but also to keep a trace back to who made what changes. Please
+ always provide us with your full real name when contributing!

 What To Read

@@ -138,15 +151,15 @@ How To Make a Patch

 If you have modified a single file, try something like:

-     diff -u undmodified-file.c my-changed-one.c > my-fixes.diff
+     diff -u unmodified-file.c my-changed-one.c > my-fixes.diff

 If you have modified several files, possibly in different directories, you
 can use diff recursively:

-     diff -ur curl-original-dir curl-modfied-sources-dir > my-fixes.diff
+     diff -ur curl-original-dir curl-modified-sources-dir > my-fixes.diff

 The GNU diff and GNU patch tools exist for virtually all platforms, including
- all kinds of unixes and Windows:
+ all kinds of Unixes and Windows:

 For unix-like operating systems:

--- a/docs/DISTRO-DILEMMA
+++ b/docs/DISTRO-DILEMMA
@@ -0,0 +1,211 @@
+  Date: May 15, 2006
+  Author: Daniel Stenberg <daniel@haxx.se>
+  URL: http://curl.haxx.se/legal/distro-dilemma.html
+
+Condition
+
+ This document is written to describe the situation as it is right
+ now. libcurl 7.15.3 is currently the latest version available. Things may of
+ course change in the future.
+
+ This document reflects my view and understanding of these things. Please tell
+ me where and how you think I'm wrong, and I'll try to correct my mistakes.
+
+Background 
+
+ The Free Software Foundation has deemed the Original BSD license[1] to be
+ "incompatible"[2] with GPL[3]. I'd rather say it is the other way around, but
+ the point is the same: if you distribute a binary version of a GPL program,
+ it MUST NOT be linked with any Original BSD-licensed parts or libraries.
+ Doing so will violate the GPL license. For a long time, very many GPL
+ licensed programs have avoided this license mess by adding an exception[8] to
+ their license. And many others have just closed their eyes for this problem.
+
+ libcurl is MIT-style[4] licensed - how on earth did this dilemma fall onto
+ our plates?
+
+ libcurl is only a little library. libcurl can be built to use OpenSSL for its
+ SSL/TLS capabilities. OpenSSL is basically Original BSD licensed[5].
+
+ If libcurl built to use OpenSSL is used by a GPL-licensed application and you
+ decide to distribute a binary version of it (Linux distros - for example -
+ tend to), you have a clash. GPL vs Original BSD.
+
+ This dilemma is not libcurl-specific nor is it specific to any particular
+ Linux distro. (This article mentions and refers to Debian several times, but
+ only because Debian seems to be the only Linux distro to have faced this
+ issue yet since no other distro is shipping libcurl built with two SSL
+ libraries.)
+
+Part of the Operating System
+
+ This would not be a problem if the used lib would be considered part of the
+ underlying operating system, as then the GPL license has an exception
+ clause[6] that allows applications to use such libs without having to be
+ allowed to distribute it or its sources. Possibly some distros will claim
+ that OpenSSL is part of their operating system.
+
+ Debian does however not take this stance and has officially(?) claimed that
+ OpenSSL is not a required part of the Debian operating system
+
+GnuTLS
+
+ With the release of libcurl 7.14.0 (May 2005), libcurl can now get built to
+ use GnuTLS instead of OpenSSL. GnuTLS is an LGPL[7] licensed library that
+ offers a matching set of features as OpenSSL does. Now, you can build and
+ distribute an TLS/SSL capable libcurl without including any Original BSD
+ licensed code.
+
+ I believe Debian is the first distro to provide libcurl/GnutTLS packages.
+
+GnuTLS vs OpenSSL
+
+ While these two libraries offer similar features, they are not equal. Both
+ libraries have features the other one lacks. libcurl does not (yet) offer a
+ standardized stable ABI if you decide to switch from using libcurl-openssl to
+ libcurl-gnutls or vice versa. The GnuTLS support is very recent in libcurl
+ and it has not been tested nor used very extensively, while the OpenSSL
+ equivalent code has been used and thus matured for more than seven (7) years.
+
+ GnuTLS
+   - LGPL licensened
+   - supports SRP
+   - lacks SSLv2 support
+   - lacks MD2 support (used by at least some CA certs)
+   - lacks the crypto functions libcurl uses for NTLM
+
+ OpenSSL
+   - Original BSD licensened
+   - lacks SRP
+   - supports SSLv2
+   - older and more widely used
+   - provides crypto functions libcurl uses for NTLM
+   - libcurl can do non-blocking connects with it in 7.15.4 and later
+
+The Better License, Original BSD or LGPL?
+
+ It isn't obvious or without debate to any objective interested party that
+ either of these licenses are the "better" or even the "preferred" one in a
+ generic situation.
+
+ Instead, I think we should accept the fact that the SSL/TLS libraries and
+ their different licenses will fit different applications and their authors
+ differently depending on the applications' licenses and their general usage
+ pattern (considering how LGPL libraries for example can be burdensome for
+ embedded systems usage).
+
+ In Debian land, there seems to be a common opinion that LGPL is "maximally
+ compatible" with apps while Original BSD is not. Like this:
+
+        http://lists.debian.org/debian-devel/2005/09/msg01417.html
+
+More SSL Libraries
+
+ In libcurl, there's no stopping us here. There are at least a few more Open
+ Source/Free SSL/TLS libraries and we would very much like to support them as
+ well, to offer application authors an even wider scope of choice.
+
+Application Angle of this Problem
+
+ libcurl is built to use one SSL/TLS library. It uses a single fixed name (by
+ default) on the built/created lib file, and applications are built/linked to
+ use that single lib. Replacing one libcurl instance with another one that
+ uses the other SSL/TLS library might break one or more applications (due to
+ ABI differences and/or different feature set). You want your application to
+ use the libcurl it was built for.
+
+Project cURL Angle of this Problem
+
+ We distribute libcurl and everyone may build libcurl with either library at
+ their choice. This problem is not directly a problem of ours. It merely
+ affects users - GPL application authors only - of our lib as it comes
+ included and delivered on some distros.
+
+ libcurl has different ABI when built with different SSL/TLS libraries due to
+ these reasons:
+
+ 1. No one has worked on fixing this. The mutex/lock callbacks should be set
+    with a generic libcurl function that should use the proper underlying
+    functions.
+
+ 2. The CURLOPT_SSL_CTX_FUNCTION option is not possible to "emulate" on GnuTLS
+    but simply requires OpenSSL.
+
+ 3. There might be some other subtle differences just because nobody has yet
+    tried to make a fixed ABI like this.
+
+Distro Angle of this Problem
+
+ To my knowledge there is only one distro that ships libcurl built with either
+ one of the SSL libs supported.
+
+ Debian Linux is now (since mid September 2005) providing two different
+ libcurl packages, one for libcurl built with OpenSSL and one built with
+ GnuTLS. They use different .so names and can this both be installed in a
+ single system simultaneously. This has been said to be a transitional system
+ not desired to keep in the long run.
+
+Fixing the Only Problem
+
+ The only problem is thus for distributions that want to offer libcurl
+ versions built with more than one SSL/TLS library.
+
+ Since multiple libcurl binaries using different names are ruled out, we need
+ to come up with a way to have one single libcurl that someone uses different
+ underlying libraries. The best(?) approach currently suggested involves this:
+
+ A new intermediate library (named lib2 so far in the discussions) with the
+ single purpose of providing libcurl with SSL/TLS capabilities. It would have
+ a unified API and ABI no matter what underlying library it would use.
+
+ There would be one lib2 binary provided for each supported SSL/TLS library.
+ For example: lib2-openssl, lib2-gnutls, lib2-yassl, lib2-matrixssl and
+ lib2-nossl. Yes, take note of the last one that provides the lib2 ABI but
+ that lacks the actual powers.
+
+ When libcurl is built and linked, it will be linked against a lib2 with the
+ set ABI.
+
+ When you link an app against libcurl, it would also need to provide one of
+ the (many) lib2 libs to decide what approach that fits the app. An app that
+ doesn't want SSL at all would still need to link with the lib2-nossl lib.
+
+ GPL apps can pick the lib2-gnutls, others may pick the lib2-openssl.
+
+ This concept works equally well both for shared and static libraries.
+
+ A positive side effect of this approach could be a more generic "de facto"
+ standard API for SSL/TLS libraries.
+
+When Will This Happen
+
+ This is not a problem in curl, it doesn't solve any actual technical problems
+ in our project. Don't hold your breath for this to happen very soon (if at
+ all) unless you step forward and contribute.
+
+ The suggestion that is outlined above is still only a suggestion. Feel free
+ to bring a better idea!
+
+ Also, to keep in mind: I don't want this new concept to have too much of an
+ impact on the existing code. Preferably it should be possible to build the
+ code like today (without the use of lib2), should you decide to ignore the
+ problems outlined in this document.
+
+ Work on this was suggested by Richard Atterer:
+
+        http://curl.haxx.se/mail/lib-2005-09/0066.html
+
+Footnotes
+
+ [1] = http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6
+ [2] = http://www.fsf.org/licensing/essays/bsd.html
+ [3] = http://www.fsf.org/licensing/licenses/gpl.html
+ [4] = http://curl.haxx.se/docs/copyright.html
+ [5] = http://www.openssl.org/source/license.html
+ [6] = http://www.fsf.org/licensing/licenses/gpl.html end of section 3
+ [7] = http://www.fsf.org/licensing/licenses/lgpl.html
+ [8] = http://en.wikipedia.org/wiki/OpenSSL_exception
+
+Feedback/Updates provided by
+
+ Eric Cooper
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: March 16, 2004 (http://curl.haxx.se/docs/faq.html)
+Updated: November 2, 2005 (http://curl.haxx.se/docs/faq.html)
                                  _   _ ____  _
                              ___| | | |  _ \| |
                             / __| | | | |_) | |
@@ -10,20 +10,22 @@ FAQ
 1. Philosophy
  1.1 What is cURL?
  1.2 What is libcurl?
-  1.3 What is cURL not?
+  1.3 What is curl not?
  1.4 When will you make curl do XXXX ?
-  1.5 Who makes cURL?
-  1.6 What do you get for making cURL?
+  1.5 Who makes curl?
+  1.6 What do you get for making curl?
  1.7 What about CURL from curl.com?
  1.8 I have a problem who do I mail?
+  1.9 Where do I buy commercial support for curl?
+  1.10 How many are using curl?

 2. Install Related Problems
  2.1 configure doesn't find OpenSSL even when it is installed
-   2.1.1. native linker doesn't find OpenSSL
-   2.1.2. only the libssl lib is missing
+   2.1.1 native linker doesn't find OpenSSL
+   2.1.2 only the libssl lib is missing
  2.2 Does curl work/build with other SSL libraries?
  2.3 Where can I find a copy of LIBEAY32.DLL?
-  2.4 Does cURL support Socks (RFC 1928) ?
+  2.4 Does curl support Socks (RFC 1928) ?

 3. Usage Problems
  3.1 curl: (1) SSL is disabled, https: not supported
@@ -41,6 +43,9 @@ FAQ
  3.13 Why does my single/double quotes fail?
  3.14 Does curl support javascript or pac (automated proxy config)?
  3.15 Can I do recursive fetches with curl?
+  3.16 What certificates do I need when I use SSL?
+  3.17 How do I list the root dir of an FTP server?
+  3.18 Can I use curl to send a POST/PUT and not wait for a response?

 4. Running Problems
  4.1 Problems connecting to SSL servers.
@@ -61,6 +66,8 @@ FAQ
  4.10 My HTTP request using HEAD, PUT or DELETE doesn't work!
  4.11 Why does my HTTP range requests return the full document?
  4.12 Why do I get "certificate verify failed" ?
+  4.13 Why is curl -R on Windows one hour off?
+  4.14 Redirects work in browser but not with curl!

 5. libcurl Issues
  5.1 Is libcurl thread-safe?
@@ -70,6 +77,11 @@ FAQ
  5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ?
  5.6 What about Keep-Alive or persistent connections?
  5.7 Link errors when building libcurl on Windows!
+  5.8 libcurl.so.3: open failed: No such file or directory
+  5.9 How does libcurl resolve host names?
+  5.10 How do I prevent libcurl from writing the response to stdout?
+  5.11 How do I make libcurl not receive the whole HTTP response?
+  5.12 Can I make libcurl fake or hide my real IP address?

 6. License Issues
  6.1 I have a GPL program, can I use the libcurl library?
@@ -78,6 +90,12 @@ FAQ
  6.4 I have a program that uses LGPL libraries, can I use libcurl?
  6.5 Can I modify curl/libcurl for my program and keep the changes secret?
  6.6 Can you please change the curl/libcurl license to XXXX?
+  6.7 What are my obligations when using libcurl in my commerical apps?
+
+ 7. PHP/CURL Issues
+  7.1 What is PHP/CURL?
+  7.2 Who write PHP/CURL?
+  7.3 Can I perform multiple requests using the same handle?

 ==============================================================================

@@ -85,24 +103,44 @@ FAQ

  1.1 What is cURL?

-  cURL (or simply just 'curl') is a command line tool for getting or sending
-  files using URL syntax. The name is a play on 'Client for URLs', originally
-  with URL spelled in uppercase to make it obvious it deals with URLs. The
-  fact it can also be pronounced 'see URL' also helped, it works as an
-  abbrivation for "Client URL Request Library" or why not the recursive
+  cURL is the name of the project. The name is a play on 'Client for URLs',
+  originally with URL spelled in uppercase to make it obvious it deals with
+  URLs. The fact it can also be pronounced 'see URL' also helped, it works as
+  an abbreviation for "Client URL Request Library" or why not the recursive
  version: "Curl URL Request Library".

-  Curl supports a range of common Internet protocols, currently including
-  HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and FILE.
+  The cURL project produces two products:

-  We spell it cURL or just curl. We pronounce it with an initial k sound:
-  [kurl].
+  libcurl

-  NOTE: there are numerous sub-projects and related projects that also use the
-  word curl in the project names in various combinations, but you should take
+    A free and easy-to-use client-side URL transfer library, supporting FTP,
+    FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP.  libcurl supports
+    HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP
+    form based upload, proxies, cookies, user+password authentication, file
+    transfer resume, http proxy tunneling and more!
+
+    libcurl is highly portable, it builds and works identically on numerous
+    platforms, including Solaris, NetBSD, FreeBSD, OpenBSD, Darwin, HPUX,
+    IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, BeOs, Mac
+    OS X, Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS and more...
+
+    libcurl is free, thread-safe, IPv6 compatible, feature rich, well
+    supported and fast.
+
+  curl
+
+    A command line tool for getting or sending files using URL syntax.
+
+    Since curl uses libcurl, it supports a range of common Internet protocols,
+    currently including HTTP, HTTPS, FTP, FTPS, LDAP, DICT, TELNET and FILE.
+
+  We pronounce curl and cURL with an initial k sound: [kurl].
+
+  There are numerous sub-projects and related projects that also use the word
+  curl in the project names in various combinations, but you should take
  notice that this FAQ is directed at the command-line tool named curl (and
  libcurl the library), and may therefore not be valid for other curl-related
-  projects.
+  projects. (There is however a small section for the PHP/CURL in this FAQ.)

  1.2 What is libcurl?

@@ -112,7 +150,11 @@ FAQ
  You can use libcurl for free in your application, be it open source,
  commercial or closed-source.

-  1.3 What is cURL not?
+  libcurl is most probably the most portable, most powerful and most often
+  used C-based multi-platform file transfer library on this planet - be it
+  open source or commercial.
+
+  1.3 What is curl not?

  Curl is *not* a wget clone. That is a common misconception.  Never, during
  curl's development, have we intended curl to replace wget or compete on its
@@ -127,7 +169,7 @@ FAQ
  script (or write a new program that interfaces libcurl) and do it.

  Curl is not a PHP tool, even though it works perfectly well when used from
-  or with PHP.
+  or with PHP (when using the PHP/CURL module).

  Curl is not a single-OS program. Curl exists, compiles, builds and runs
  under a wide range of operating systems, including all modern Unixes (and a
@@ -161,35 +203,32 @@ FAQ
  * If you write the code, chances are bigger that it will get into curl
    faster.

-  1.5 Who makes cURL?
+  1.5 Who makes curl?

-  cURL and libcurl are not made by any single individual. Sure, Daniel
-  Stenberg writes the major parts, but other persons' submissions are
+  curl and libcurl are not made by any single individual. Daniel Stenberg is
+  project leader and main developer, but other persons' submissions are
  important and crucial. Anyone can contribute and post their changes and
  improvements and have them inserted in the main sources (of course on the
  condition that developers agree on that the fixes are good).

-  The list of contributors in the docs/THANKS file is only a small part of all
-  the people that every day provide us with bug reports, suggestions, ideas
-  and source code.
+  The full list of the more than 450 contributors is found in the docs/THANKS
+  file.

  curl is developed by a community, with Daniel at the wheel.

-  1.6 What do you get for making cURL?
+  1.6 What do you get for making curl?

  Project cURL is entirely free and open. No person gets paid for developing
-  curl. We do this voluntarily on our spare time.
+  (lib)curl. We do this voluntarily on our spare time.

  We get some help from companies. Contactor Data hosts the curl web site,
  Haxx owns the curl web site's domain and sourceforge.net hosts project
-  services we take advantage from, like the bug tracker.
+  services we take advantage from, like the bug tracker. Also, some companies
+  have sponsored certain parts of the development in the past and I hope some
+  will continue to do so in the future.

-  If you want to support our project with a donation or similar, one way of
-  doing that would be to buy "gift certificates" at useful online shopping
-  sites, such as amazon.com or thinkgeek.com. Another way would be to sponsor
-  us through a banner-program or even better: by helping us coding,
-  documenting, testing etc. You're welcome to send us a buck using paypal, as
-  described here: http://curl.haxx.se/donation.html
+  If you want to support our project, consider a donation or a banner-program
+  or even better: by helping us coding, documenting, testing etc.

  1.7 What about CURL from curl.com?

@@ -220,14 +259,66 @@ FAQ
  users thanks to the web based archives of the mailing lists), thus saving us
  from having to repeat ourselves even more. Thanks for respecting this.

+  If you have found or simply suspect a security problem in curl or libcurl,
+  mail curl-security at haxx.se (closed list of receivers, mails are not
+  disclosed) and tell. Then we can produce a fix in a timely manner before the
+  flaw is announced to the world, thus lessen the impact the problem will have
+  on existing users.
+
+  1.9 Where do I buy commercial support for curl?
+
+  curl is fully open source. It means you can hire any skilled engineer to fix
+  your curl-related problems.
+
+  We list available alternatives on the curl web site:
+  http://curl.haxx.se/support.html
+
+  1.10 How many are using curl?
+
+  It is impossible to tell.
+
+  We don't know how many users that knowingly have installed and use curl.
+
+  We don't know how many users that use curl without knowing that they are in
+  fact using it.
+
+  We don't know how many users that downloaded or installed curl and then
+  never use it.
+
+  Some facts to use as input to the math:
+
+  curl packages have been downloaded from the curl.haxx.se site well over a
+  million times. curl is installed by default with most Linux
+  distributions. curl is installed by default with Mac OS X. curl and libcurl
+  as used by numerous applications that include libcurl binaries in their
+  distribution packages (like Adobe Acrobat Reader and Google Earth).
+
+  More than 40 known named companies use curl in commercial environments and
+  products. More than 100 known named open source projects depend on
+  (lib)curl.
+
+  In a poll on the curl web site mid-2005, more than 50% of the 300+ answers
+  estimated a user base of one million users or more.
+
+  In March 2005, the "Linux Counter project" estimated a total Linux user base
+  of some 29 millions, while Netcraft detected some 4 million "active" Linux
+  based web servers. A guess is that a fair amount of these Linux
+  installations have curl installed.
+
+  http://curl.haxx.se/docs/companies.html
+  http://curl.haxx.se/docs/programs.html
+  http://curl.haxx.se/libcurl/using/apps.html
+  http://counter.li.org/estimates.php
+  http://news.netcraft.com/archives/2005/03/14/fedora_makes_rapid_progress.html
+

 2. Install Related Problems

-  2.1. configure doesn't find OpenSSL even when it is installed
+  2.1 configure doesn't find OpenSSL even when it is installed

  This may be because of several reasons.

-    2.1.1. native linker doesn't find openssl
+    2.1.1 native linker doesn't find openssl

    Affected platforms:
      Solaris (native cc compiler)
@@ -249,7 +340,7 @@ FAQ

    Solution submitted by: Bob Allison <allisonb@users.sourceforge.net>

-    2.1.2. only the libssl lib is missing
+    2.1.2 only the libssl lib is missing

    If all include files and the libcrypto lib is present, with only the
    libssl being missing according to configure, this is mostly likely because
@@ -262,14 +353,14 @@ FAQ
    configure. Make sure that you remove the config.cache file before you
    rerun configure with the new flags.

-  2.2. Does curl work/build with other SSL libraries?
+  2.2 Does curl work/build with other SSL libraries?

-  Curl has been written to use OpenSSL, although there should not be much
-  problems using a different library. If anyone does "port" curl to use a
+  Curl has been written to use OpenSSL or GnuTLS, although there should not be
+  many problems using a different library. If anyone does "port" curl to use a
  different SSL library, we are of course very interested in getting the
  patch!

-  2.3. Where can I find a copy of LIBEAY32.DLL?
+  2.3 Where can I find a copy of LIBEAY32.DLL?

  That is an OpenSSL binary built for Windows.

@@ -278,14 +369,14 @@ FAQ
  accurate and up-to-date pointers to recent OpenSSL DLLs and other binary
  packages.

-  2.4. Does cURL support Socks (RFC 1928) ?
+  2.4 Does curl support Socks (RFC 1928) ?

-  Yes, SOCKS5 is supported when curl is built with IPv6 support disabled.
+  Yes, SOCKS5 is supported.


 3. Usage problems

-  3.1. curl: (1) SSL is disabled, https: not supported
+  3.1 curl: (1) SSL is disabled, https: not supported

  If you get this output when trying to get anything from a https:// server,
  it means that the configure script couldn't find all libs and include files
@@ -300,13 +391,13 @@ FAQ
  Also, check out the other paragraph in this FAQ labeled "configure doesn't
  find OpenSSL even when it is installed".

-  3.2. How do I tell curl to resume a transfer?
+  3.2 How do I tell curl to resume a transfer?

  Curl supports resumed transfers both ways on both FTP and HTTP.

  Try the -C option.

-  3.3. Why doesn't my posting using -F work?
+  3.3 Why doesn't my posting using -F work?

  You can't simply use -F or -d at your choice. The web server that will
  receive your post assumes one of the formats. If the form you're trying to
@@ -320,7 +411,7 @@ FAQ
  through the mailing list archives for old postings and questions regarding
  this.

-  3.4. How do I tell curl to run custom FTP commands?
+  3.4 How do I tell curl to run custom FTP commands?

  You can tell curl to perform optional commands both before and/or after a
  file transfer. Study the -Q/--quote option.
@@ -329,13 +420,13 @@ FAQ
  FTP commands without transferring anything. Therefore you must always specify
  a URL to transfer to/from even when doing custom FTP commands.

-  3.5. How can I disable the Pragma: nocache header?
+  3.5 How can I disable the Pragma: nocache header?

  You can change all internally generated headers by adding a replacement with
  the -H/--header option. By adding a header with empty contents you safely
  disable that one. Use -H "Pragma:" to disable that specific header.

-  3.6. Does curl support ASP, XML, XHTML or HTML version Y?
+  3.6 Does curl support ASP, XML, XHTML or HTML version Y?

  To curl, all contents are alike. It doesn't matter how the page was
  generated. It may be ASP, PHP, Perl, shell-script, SSI or plain
@@ -344,7 +435,7 @@ FAQ

  See also item 3.14 regarding javascript.

-  3.7. Can I use curl to delete/rename a file through FTP?
+  3.7 Can I use curl to delete/rename a file through FTP?

  Yes. You specify custom FTP commands with -Q/--quote.

@@ -360,6 +451,8 @@ FAQ

     curl -L http://redirector.com

+  Not all redirects are HTTP ones, see 4.14
+
  3.9 How do I use curl in my favorite programming language?

  There exist many language interfaces/bindings for curl that integrates it
@@ -369,8 +462,7 @@ FAQ

  Find out more about which languages that support curl directly, and how to
  install and use them, in the libcurl section of the curl web site:
-
-        http://curl.haxx.se/libcurl/
+  http://curl.haxx.se/libcurl/

  In February 2003, there are interfaces available for the following
  languages: Basic, C, C++, Cocoa, Dylan, Euphoria, Java, Lua, Object-Pascal,
@@ -443,28 +535,77 @@ FAQ

  Some work-arounds usually suggested to overcome this javascript dependency:

-    - Depending on the javascript complexity, write up a script that
-      translates it to another language and execute that.
+  - Depending on the javascript complexity, write up a script that
+    translates it to another language and execute that.

-    - Read the javascript code and rewrite the same logic in another language.
+  - Read the javascript code and rewrite the same logic in another language.

-    - Implement a javascript interpreter, people have successfully used the
-      Mozilla javascript engine in the past.
+  - Implement a javascript interpreter, people have successfully used the
+    Mozilla javascript engine in the past.

-    - Ask your admins to stop this, for a static proxy setup or similar.
+  - Ask your admins to stop this, for a static proxy setup or similar.

  3.15 Can I do recursive fetches with curl?

  No. curl itself has no code that performs recursive operations, such as
-  those performed by wget.
+  those performed by wget and similar tools.

  There exist wrapper scripts with that functionality (for example the
  curlmirror perl script), and you can write programs based on libcurl to do
  it, but the command line tool curl itself cannot.

+  3.16 What certificates do I need when I use SSL?
+
+  There are three different kinds of "certificates" to keep track of when we
+  talk about using SSL-based protocols (HTTPS or FTPS) using curl or libcurl.
+
+  - Client certificate. The server you communicate may require that you can
+    provide this in order to prove that you actually are who you claim to be.
+    If the server doesn't require this, you don't need a client certificate.
+
+  - Server certificate. The server you communicate with has a server
+    certificate. You can and should verify this certificate to make sure that
+    you are truly talking to the real server and not a server impersonating
+    it.
+
+  - Certificate Authority certificate ("CA cert"). You often have several CA
+    certs in a CA cert bundle that can be used to verify a server certificate
+    that was signed by one of the authorities in the bundle. curl comes with a
+    default CA cert bundle. You can override the default.
+
+    The server certificate verification process is made by using a Certificate
+    Authority certificate ("CA cert") that was used to sign the server
+    certificate. Server certificate verification is enabled by default in curl
+    and libcurl and is often the reason for problems as explained in FAQ entry
+    4.12 and the SSLCERTS document
+    (http://curl.haxx.se/docs/sslcerts.html). Server certificates that are
+    "self-signed" or otherwise signed by a CA that you do not have a CA cert
+    for, cannot be verified. If the verification during a connect fails, you
+    are refused access. You then need to explicitly disable the verification
+    to connect to the server.
+
+  3.17 How do I list the root dir of an FTP server?
+
+  There are two ways. The way defined in the RFC is to use an encoded slash
+  in the first path part. List the "/tmp" dir like this:
+
+     curl ftp://ftp.sunet.se/%2ftmp/
+
+  or the not-quite-kosher-but-more-readable way, by simply starting the path
+  section of the URL with a slash:
+
+     curl ftp://ftp.sunet.se//tmp/
+
+  3.18 Can I use curl to send a POST/PUT and not wait for a response?
+ 
+  No.
+
+  But you could easily write your own program using libcurl to do such stunts.
+
+
 4. Running Problems

-  4.1. Problems connecting to SSL servers.
+  4.1 Problems connecting to SSL servers.

  It took a very long time before we could sort out why curl had problems to
  connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.  The
@@ -479,7 +620,7 @@ FAQ
  There have also been examples where the remote server didn't like the SSLv2
  request and instead you had to force curl to use SSLv3 with -3/--sslv3.

-  4.2. Why do I get problems when I use & or % in the URL?
+  4.2 Why do I get problems when I use & or % in the URL?

  In general unix shells, the & letter is treated special and when used, it
  runs the specified command in the background. To safely send the & as a part
@@ -497,7 +638,7 @@ FAQ
  pass in a POST using -d/--data you must encode it as '%25' (which then also
  needs the %-letter doubled on Windows machines).

-  4.3. How can I use {, }, [ or ] to specify multiple URLs?
+  4.3 How can I use {, }, [ or ] to specify multiple URLs?

  Because those letters have a special meaning to the shell, and to be used in
  a URL specified to curl you must quote them.
@@ -511,7 +652,7 @@ FAQ

    curl -g 'www.site.com/weirdname[].html'

-  4.4. Why do I get downloaded data even though the web page doesn't exist?
+  4.4 Why do I get downloaded data even though the web page doesn't exist?

  Curl asks remote servers for the page you specify. If the page doesn't exist
  at the server, the HTTP protocol defines how the server should respond and
@@ -562,14 +703,17 @@ FAQ
    slash. Try the same operation again _with_ the trailing URL, or use the
    -L/--location option to follow the redirection.

-  4.6. Can you tell me what error code 142 means?
+  4.6 Can you tell me what error code 142 means?

-  All error codes that are larger than the highest documented error code means
+  All curl error codes are described at the end of the man page, in the
+  section called "EXIT CODES".
+
+  Error codes that are larger than the highest documented error code means
  that curl has exited due to a crash. This is a serious error, and we
  appreciate a detailed bug report from you that describes how we could go
  ahead and repeat this!

-  4.7. How do I keep user names and passwords secret in Curl command lines?
+  4.7 How do I keep user names and passwords secret in Curl command lines?

  This problem has two sides:

@@ -603,7 +747,7 @@ FAQ
  If there is a bug, read the BUGS document first. Then report it as described
  in there.

-  4.9. Curl can't authenticate to the server that requires NTLM?
+  4.9 Curl can't authenticate to the server that requires NTLM?

  This is supported in curl 7.10.6 or later. No earlier curl version knows
  of this magic.
@@ -651,18 +795,49 @@ FAQ
  Details are also in the SSLCERTS file in the release archives, found online
  here: http://curl.haxx.se/docs/sslcerts.html

+  4.13 Why is curl -R on Windows one hour off?
+
+  During daylight savings time, when -R is used, curl will set a time that
+  appears one hour off. This happens due to a flaw in how Windows stores and
+  uses file modification times and it is not easily worked around. For details
+  on this problem, read this: http://www.codeproject.com/datetime/dstbugs.asp
+
+  4.14 Redirects work in browser but not with curl!
+
+  curl supports HTTP redirects fine (see item 3.8). Browsers generally support
+  at least two other ways to perform directs that curl does not:
+
+  - Meta tags. You can write a HTML tag that will cause the browser to
+    redirect to another given URL after a certain time.
+
+  - Javascript. You can write a javascript program embeded in a HTML page
+    that redirects the browser to another given URL.
+
+  There is no way to make curl follow these redirects. You must either
+  manually figure out what the page is set to do, or you write a script that
+  parses the results and fetches the new URL.
+
+
 5. libcurl Issues

-  5.1. Is libcurl thread-safe?
+  5.1 Is libcurl thread-safe?

  Yes.

-  We have written the libcurl code specificly adjusted for multi-threaded
+  We have written the libcurl code specifically adjusted for multi-threaded
  programs. libcurl will use thread-safe functions instead of non-safe ones if
  your system has such.

-  We would appreciate some kind of report or README file from those who have
-  used libcurl in a threaded environment.
+  If you use a OpenSSL-powered libcurl in a multi-threaded environment, you
+  need to provide one or two locking functions:
+
+    http://www.openssl.org/docs/crypto/threads.html#DESCRIPTION
+
+  If you use a GnuTLS-powered libcurl in a multi-threaded environment, you
+  need to provide locking function(s) for libgcrypt (which is used by GnuTLS
+  for the crypto functions).
+
+    http://www.gnu.org/software/gnutls/manual/html_node/Multi_002dthreaded-applications.html

  5.2 How can I receive all data into a large memory chunk?

@@ -674,8 +849,8 @@ FAQ

  One solution to this problem could be to have a pointer to a struct that you
  pass to the callback function. You set the pointer using the
-  curl_easy_setopt(CURLOPT_FILE) function. Then that pointer will be passed to
-  the callback instead of a FILE * to a file:
+  CURLOPT_WRITEDATA option. Then that pointer will be passed to the callback
+  instead of a FILE * to a file:

        /* imaginary struct */
        struct MemoryStruct {
@@ -687,7 +862,7 @@ FAQ
        size_t
        WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
        {
-          register int realsize = size * nmemb;
+          size_t realsize = size * nmemb;
          struct MemoryStruct *mem = (struct MemoryStruct *)data;

          mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
@@ -743,6 +918,97 @@ FAQ

  (Provided by Andrew Francis)

+  When building an application that uses the static libcurl library, you must
+  add -DCURL_STATICLIB to your CFLAGS. Otherwise the linker will look for
+  dynamic import symbols. If you get linker error like "unknown symbol
+  __imp__curl_easy_init ..." you have linked against the wrong (static)
+  library.  If you want to use the libcurl.dll and import lib, you don't need
+  any extra CFLAGS, but use one of the import libraries below. These are the
+  libraries produced by the various lib/Makefile.* files:
+
+  Target:          static lib.   import lib for libcurl*.dll.
+  -----------------------------------------------------------
+  MingW:           libcurl.a     libcurldll.a
+  MSVC (release):  libcurl.lib   libcurl_imp.lib
+  MSVC (debug):    libcurld.lib  libcurld_imp.lib
+  Borland:         libcurl.lib   libcurl_imp.lib
+
+
+  5.8 libcurl.so.3: open failed: No such file or directory
+
+  This is an error message you might get when you try to run a program linked
+  with a shared version of libcurl and your run-time linker (ld.so) couldn't
+  find the shared library named libcurl.so.3.
+
+  You need to make sure that ld.so finds libcurl.so.3. You can do that
+  multiple ways, and it differs somewhat between different operating systems,
+  but they are usually:
+
+  * Add an option to the linker command line that specify the hard-coded path
+    the run-time linker should check for the lib (usually -R)
+
+  * Set an environment variable (LD_LIBRARY_PATH for example) where ld.so
+    should check for libs
+
+  * Adjust the system's config to check for libs in the directory where you've
+    put the dir (like Linux's /etc/ld.so.conf)
+
+  'man ld.so' and 'man ld' will tell you more details
+
+  5.9 How does libcurl resolve host names?
+
+  libcurl supports a large a number of different name resolve functions. One
+  of them is picked at build-time and will be used unconditionally. Thus, if
+  you want to change name resolver function you must rebuild libcurl and tell
+  it to use a different function.
+
+  - The non-ipv6 resolver that can use one out of four host name resolve calls
+    (depending on what your system supports):
+
+    A - gethostbyname()
+    B - gethostbyname_r() with 3 arguments
+    C - gethostbyname_r() with 5 arguments
+    D - gethostbyname_r() with 6 arguments
+
+  - The ipv6-resolver that uses getaddrinfo()
+
+  - The c-ares based name resolver that uses the c-ares library for resolves.
+    Using this offers asynchronous name resolves but it currently has no IPv6
+    support.
+
+  - The Windows threaded resolver. It use:
+
+    A - gethostbyname() on plain ipv4 windows hosts
+    B - getaddrinfo() on ipv6-enabled windows hosts
+
+  Also note that libcurl never resolves or reverse-lookups addresses given as
+  pure numbers, such as 127.0.0.1 or ::1.
+
+  5.10 How do I prevent libcurl from writing the response to stdout?
+
+  libcurl provides a default built-in write function that writes received data
+  to stdout. Set the CURLOPT_WRITEFUNCTION to receive the data, or possibly
+  set CURLOPT_WRITEDATA to a different FILE * handle.
+
+  5.11 How do I make libcurl not receive the whole HTTP response?
+
+  You make the write callback (or progress callback) return an error and
+  libcurl will then abort the transfer.
+
+  5.12 Can I make libcurl fake or hide my real IP address?
+
+  No. libcurl operates on a higher level than so. Besides, faking IP address
+  would imply sending IP packages with a made-up source address, and then you
+  normally get a problem with intercepting the packages sent back as they
+  would then not be routed to you!
+
+  If you use a proxy to access remote sites, the sites will not see your local
+  IP address but instead the address of the proxy.
+
+  Also note that on many networks NATs or other IP-munging techniques are used
+  that makes you see and use a different IP address locally than what the
+  remote server will see you coming from.
+

 6. License Issues

@@ -751,32 +1017,35 @@ FAQ
  is just a brief summary for the cases we get the most questions. (Parts of
  this section was much enhanced by Bjorn Reese.)

-  6.1. I have a GPL program, can I use the libcurl library?
+  We are not lawyers and this is not legal advice. You should probably consult
+  one if you want true and accurate legal insights without our prejudice.
+
+  6.1 I have a GPL program, can I use the libcurl library?

  Yes!

  Since libcurl may be distributed under the MIT/X derivate license, it can be
  used together with GPL in any software.

-  6.2. I have a closed-source program, can I use the libcurl library?
+  6.2 I have a closed-source program, can I use the libcurl library?

  Yes!

  libcurl does not put any restrictions on the program that uses the library.

-  6.3. I have a BSD licensed program, can I use the libcurl library?
+  6.3 I have a BSD licensed program, can I use the libcurl library?

  Yes!

  libcurl does not put any restrictions on the program that uses the library.

-  6.4. I have a program that uses LGPL libraries, can I use libcurl?
+  6.4 I have a program that uses LGPL libraries, can I use libcurl?

  Yes!

  The LGPL license doesn't clash with other licenses.

-  6.5. Can I modify curl/libcurl for my program and keep the changes secret?
+  6.5 Can I modify curl/libcurl for my program and keep the changes secret?

  Yes!

@@ -784,7 +1053,7 @@ FAQ
  the sources, on the condition that the copyright texts in the sources are
  left intact.

-  6.6. Can you please change the curl/libcurl license to XXXX?
+  6.6 Can you please change the curl/libcurl license to XXXX?

  No.

@@ -794,3 +1063,51 @@ FAQ
  we want on curl/libcurl and it does not spread to other programs or
  libraries that use it. It should be possible for everyone to use libcurl or
  curl in their projects, no matter what license they already have in use.
+
+  6.7 What are my obligations when using libcurl in my commerical apps?
+
+  Next to none. All you need to adhere to is the MIT-style license (stated in
+  the COPYING file) which basically says you have to include the copyright
+  notice in "all copies" and that you may not use the copyright holder's name
+  when promoting your software.
+
+  You do not have to release any of your source code.
+
+  You do not have to reveal or make public any changes to the libcurl source
+  code.
+
+  You do not have to reveal or make public that you are using libcurl within
+  your app.
+
+  As can be seen here: http://curl.haxx.se/docs/companies.html and
+  elsewhere, more and more companies are dicovering the power
+  of libcurl and take advantage of it even in commercial environments.
+
+
+7. PHP/CURL Issues
+
+  7.1 What is PHP/CURL?
+
+  The module for PHP that makes it possible for PHP programs to access curl-
+  functions from within PHP.
+
+  In the cURL project we call this module PHP/CURL to differentiate it from
+  curl the command line tool and libcurl the library. The PHP team however
+  does not refer to it like this (for unknown reasons). They call it plain
+  CURL (often using all caps) which causes much confusion to users which in
+  turn gives us a higher question load.
+
+  7.2 Who write PHP/CURL?
+
+  PHP/CURL is a module that comes with the regular PHP package. It depends and
+  uses libcurl, so you need to have libcurl installed properly first before
+  PHP/CURL can be used. PHP/CURL is written by Sterling Hughes.
+
+  7.3 Can I perform multiple requests using the same handle?
+
+  Yes - at least in PHP version 4.3.8 and later (this has been known to not
+  work in earlier versions, but the exact version when it started to work is
+  unknown to me).
+
+  After a transfer, you just set new options in the handle and make another
+  transfer. This will make libcurl to re-use the same connection if it can.
--- a/Show More
+++ b/Show More