release time for 7.15.5

to multi_runsingle() without it being really necessary or good

.cvsignore

@@ -12,3 +12,4 @@ depcomp
 config.guess
 config.sub
 ltmain.sh
+libcurl.pc

COPYING

@@ -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.
 

CVS-INFO

@@ -53,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

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
@@ -31,6 +31,9 @@ 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:

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
@@ -174,6 +174,12 @@ vc-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
@@ -194,9 +200,21 @@ 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 SSL=1
-	$(MAKE) -C src -f Makefile.netware SSL=1
+	$(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

README

@@ -7,7 +7,7 @@
 README
 
   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
+  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,50 +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/
-        Austria   -- http://curl.gds.tuwien.ac.at/
-        Denmark   -- http://curl.cofman.dk/
-        Estonia   -- http://curl.wildyou.net/
-        France    -- http://curl.mirror.internet.tp/
-        Germany   -- http://curl.kgt.org/
-        Germany   -- http://curl.mirror.at.stealer.net/
-        Germany   -- http://curl.netmirror.org/
-        Russia    -- http://curl.tsuren.net/
-        Taiwan    -- http://curl.cs.pu.edu.tw/
-        Thailand  -- http://curl.siamu.ac.th/
-        US (CA)   -- http://curl.mirror.redwire.net/
-        US (CA)   -- http://curl.mirrormonster.com/
-        US (CA)   -- http://curl.signal42.com/
-        US (TX)   -- http://curl.109k.com/
-
-DOWNLOAD
-
-  The official download mirror sites are:
-
-        Australia -- http://curl.planetmirror.com/download.html
-        Austria   -- http://curl.gds.tuwien.ac.at/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/
-        Taiwan    -- http://curl.cs.pu.edu.tw/download.html
-        Thailand  -- http://curl.siamu.ac.th/download.html
-        US (CA)   -- http://curl.mirror.redwire.net/download.html
-        US (CA)   -- http://curl.mirrormonster.com/download.html
-        US (CA)   -- http://curl.signal42.com/download.html
-        US (TX)   -- http://curl.109k.com/download.html
+        Sweden       http://curl.haxx.se/
+        Mirrors      http://curlm.haxx.se/
 
 CVS
 

RELEASE-NOTES

@@ -1,47 +1,57 @@
-Curl and libcurl 7.13.1
+Curl and libcurl 7.15.5
 
- Public curl release number:               86
- Releases counted from the very beginning: 113
- Available command line options:           104
- Available curl_easy_setopt() options:     122
- Number of public functions in libcurl:    46
- Amount of public web site mirrors:        18
- Number of known libcurl bindings:         30
+ Public curl release number:               95
+ Releases counted from the very beginning: 122
+ Available command line options:           114
+ Available curl_easy_setopt() options:     133
+ Number of public functions in libcurl:    54
+ Amount of public web site mirrors:        33
+ Number of known libcurl bindings:         32
+ Number of contributors:                   506
 
 This release includes the following changes:
 
- o CURLOPT_COOKIEFILE set to "" is now activating the cookie engine
- o FTP code overhaul => multi interface much less blocking
- o Added CURLE_LOGIN_DENIED to be returned when curl is denied login to FTP
-   servers
+ o added --ftp-ssl-reqd
+ o modified the prototype for the socket callback set with
+   CURLMOPT_SOCKETFUNCTION
+ o added curl_multi_assign()
+ o added CURLOPT_FTP_ALTERNATIVE_TO_USER and --ftp-alternative-to-user
+ o added a vcproj file for building libcurl
+ o added curl_formget()
+ o added CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_RECV_SPEED_LARGE
+ o added configure --enable-hidden-symbols
+ o Made -K on a file that couldn't be read cause a warning to be displayed
 
 This release includes the following bugfixes:
 
- o -# crash when more data than expected was retrieved
- o NTLM/krb4 buffer overflow fixed (CAN-2005-0490)
- o proxy auth bug when following redirects to another host
- o socket leak when local bind failed
- o HTTP POST with --anyauth picking NTLM
- o SSL problems when downloading exactly 16KB data
- o out of memory conditions preserve error codes better
- o a few crashes at out of memory
- o inflate buffer usage bugfix
- o better DICT protocol adherence
- o disable valgrind-checking while testing if libcurl is built shared
- o locale names in some date strings
+ o chunked encoding when custom header "Transfer-Encoding: chunked" is set
+ o Curl_strerror() crash on unknown errors
+ o changing Content-Type when doing formposts
+ o added CURL_EXTERN to a few recent multi functions that lacked them
+ o splay-tree related problems for internal expire time handling
+ o FTP ASCII CRLF counter reset
+ o cookie parser now compares paths case sensitive
+ o an easy handle with shared DNS cache added to a multi handle caused a crash
+ o couldn't override the Proxy-Connection: header for non-CONNECT requests
+ o curl_multi_fdset() could wrongly return -1 as max_fd value
 
-Other curl-related news since the previous public release:
+Other curl-related news:
 
- o libcurl-vb 1.0 http://sf.net/projects/libcurl-vb/
- o pycurl 7.13.0: http://pycurl.sf.net/
- o new german mirror: http://curl.mons-new-media.de
- o new US mirror: http://curl.islandofpoker.com
+ o yassl 1.3.7 can now be used with libcurl as an optional TLS library for
+   HTTPS/FTPS support: http://www.yassl.com/
+ o cURLpp 0.6.0 was released: http://rrette.com/curlpp.html
+ o pycurl-7.15.4 was released: http://pycurl.sf.net
+
+New curl mirrors:
+
+ o 
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Gisle Vanem, David Byron, Marty Kuhrt, Maruko, Eric Vergnaud, Christopher
- R. Palmer, Mike Dobbs, David in bug report #1124588, Ralph Mitchell,
- Rene Rebe, Dave Dribin, Dan Fandrich
+ Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner, Toshiyuki Maezawa,
+ Ingmar Runge, Ates Goral, David McCreedy, Jari Sundell, Georg Horn,
+ Gisle Vanem, Yang Tse, Michael Jerris, Dan Nelson, Yves Lejeune,
+ Maciej Karpiuk, Mark Lentczner
 
         Thanks! (and sorry if I forgot to mention someone)

TODO-RELEASE

@@ -1,34 +1,5 @@
-Issues not sorted in any particular order.
-
-To get fixed in 7.13.2 (planned release: April 2005)
+To get fixed in 7.15.5 (planned release: August 2006)
 ======================
 
-58 - Fix KNOWN_BUGS #19: "FTP 3rd party transfers with the multi interface
-     doesn't work"
+66 - 
 
-47 - Peter Sylvester's patch for SRP on the TLS layer
-     Awaits OpenSSL support for this, no need to support this in libcurl before
-     there's an OpenSSL release that does it.
-
-58 - SSPI for libcurl on Windows
-
-59 - --form-string and --form-file as discussed on curl-users list
-
-To get fixed in 7.14.0
-======================
-
-55 - Add a function to the multi interface that gets file descriptors, as an
-     alternative to the curl_multi_fdset(). This is necessary to allow apps to
-     properly avoid the FD_SETSIZE problem.
-
-56 - Make curl_easy_perform() a wrapper-function that simply creates a multi
-     handle, adds the easy handle to it, runs curl_multi_perform() until the
-     transfer is done, then detach the easy handle, destroy the multi handle
-     and return the easy handle's return code. This will thus make everything
-     internally use and assume the multi interface. The select()-loop should
-     use the new function from (55).
-
-57 - Add an interface to libcurl for getting and setting cookies from an easy
-     handle. One idea: http://curl.haxx.se/mail/lib-2004-12/0195.html the
-     older idea: http://curl.haxx.se/dev/COOKIES. We need to settle on some
-     middle ground I guess.

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

ares/CHANGES

@@ -1,5 +1,154 @@
   Changelog for the c-ares project
 
+* August 3 2006
+
+- Ravi Pratap fixed ares_getsock() to actually return the proper bitmap and
+  not always zero!
+
+Version 1.3.1 (June 24, 2006)
+
+* July 23, 2006
+
+- Gisle Vanem added getopt() to the ahost program. Currently accepts
+  only [-t {a|aaaa}] to specify address family in ares_gethostbyname().
+
+* June 19, 2006
+
+- (wahern) Removed "big endian" DNS section and RR data integer parser
+  macros from ares_dns.h, which break c-ares on my Sparc64. Bit-wise
+  operations in C operate on logical values. And in any event the octets are
+  already in big-endian (aka network) byte order so they're being reversed
+  (thus the source of the breakage).
+
+* June 18, 2006
+
+- William Ahern handles EAGAIN/EWOULDBLOCK errors in most of the I/O calls
+  from area_process.c.
+
+  TODO: Handle one last EAGAIN for a UDP socket send(2) in
+  ares__send_query().
+
+* 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, 2005)
+
+* 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

ares/FILES

@@ -13,6 +13,7 @@ Makefile.in
 Makefile.dj
 Makefile.m32
 Makefile.netware
+Makefile.vc6
 install-sh
 mkinstalldirs
 configure

ares/Makefile.am

@@ -4,18 +4,17 @@ lib_LTLIBRARIES = libcares.la
 
 man_MANS = $(MANPAGES)
 
-MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/adig/adig.mak	\
- vc/adig/adig.plg vc/vc.dsw vc/ahost/ahost.dep vc/ahost/ahost.dsp	\
- vc/ahost/ahost.mak vc/ahost/ahost.plg vc/areslib/areslib.dep		\
- vc/areslib/areslib.dsp vc/areslib/areslib.mak vc/areslib/areslib.plg
+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)
+ $(MSVCFILES) AUTHORS config-win32.h
 
 
-VER=-version-info 0:0:0
+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.
@@ -44,7 +43,13 @@ VER=-version-info 0:0:0
 # set age to 0. (c:r:a=0)
 #
 
-libcares_la_LDFLAGS = $(VER)
+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

ares/Makefile.dj

@@ -9,7 +9,12 @@ include Makefile.inc
 WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
 
 CC      = gcc
-CFLAGS  = -O2 -Wall -DWATT32 -Dselect=select_s -I$(WATT32_ROOT)/inc
+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
 

ares/Makefile.inc

@@ -1,15 +1,19 @@
-CSOURCES = ares_fds.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
+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
+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      \
+           setup_once.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_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

ares/Makefile.m32

@@ -7,29 +7,21 @@
 ## Quick hack by Guenter; comments to: /dev/nul
 
 CC = gcc
-AR = ar
 RANLIB = ranlib
-STRIP = strip -g
-#RM = rm -f 
 
 ########################################################
 ## Nothing more to do below this line!
 
 LIB=libcares.a
 CC=gcc
-#CPPFLAGS=@CPPFLAGS@
-WARN_FLAGS=-Wall
-CFLAGS=-O2
-CFLAGS+=${WARN_CFLAGS} ${ERROR_CFLAGS}
-DEFS=-DMINGW32
+CFLAGS=-O2 -Wall
 LDFLAGS=-s
 LIBS=-lwsock32
-ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
 
 MANPAGES := $(patsubst %.c,%.o,$(wildcard ares_*.3))
 
 OBJS	:= $(patsubst %.c,%.o,$(wildcard ares_*.c))
-OBJS	+= windows_port.o
+OBJS	+= windows_port.o inet_ntop.o inet_net_pton.o bitncmp.o
 
 $(LIB): ${OBJS}
 	ar cru $@ ${OBJS}
@@ -51,7 +43,7 @@ ahost.exe: ahost.o $(LIB)
 ${OBJS}: ares.h ares_dns.h ares_private.h
 
 .c.o:
-	${CC} -c ${ALL_CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 check:
 
@@ -73,3 +65,4 @@ clean:
 
 distclean: clean
 	rm -f config.cache config.log config.status Makefile
+

ares/Makefile.netware

@@ -20,7 +20,7 @@ endif
 TARGETS = adig.nlm ahost.nlm
 LTARGET = libcares.lib
 VERSION	= $(LIBCARES_VERSION)
-COPYR	= Copyright (c) 1996 - 2004, Daniel Stenberg, <daniel@haxx.se>
+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
@@ -88,8 +88,8 @@ LD	= nlmconv
 LDFLAGS	= -T
 AR	= ar
 ARFLAGS	= -cq
-CFLAGS	+= -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
-CFLAGS	+= -Wall -Wno-format # -pedantic
+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
@@ -104,7 +104,7 @@ SDK_LIBC = $(NDK_ROOT)/libc
 
 ifeq ($(LIBARCH),LIBC)
 	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
-	INCLUDES += -I$(SDK_LIBC)/include/winsock
+	# INCLUDES += -I$(SDK_LIBC)/include/winsock
 	CFLAGS += -D_POSIX_SOURCE
 #	CFLAGS += -D__ANSIC__
 else
@@ -126,7 +126,10 @@ DL	= '
 #-include $(NDKBASE)/nlmconv/ncpfs.inc
 endif
 
-OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard ares_*.c))
+# 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
 
@@ -253,9 +256,10 @@ config.h: Makefile.netware
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
 	@echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
-	@echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
-	@echo $(DL)#define PACKAGE_BUGREPORT "curl-bug@haxx.se"$(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) >> $@
@@ -272,7 +276,9 @@ config.h: Makefile.netware
 	@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_RECV 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SEND 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SOCKET 1$(DL) >> $@
@@ -293,10 +299,28 @@ config.h: Makefile.netware
 	@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 RECV_TYPE_ARG1 int$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG2 char *$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG3 int$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG4 int$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_RETV int$(DL) >> $@
 	@echo $(DL)#define RETSIGTYPE void$(DL) >> $@
+	@echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG1 int$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG2 char *$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_RETV int$(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

ares/Makefile.vc6

@@ -0,0 +1,197 @@
+# $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 setup_once.h ares.h ares_private.h \
+  ares_ipv6.h
+$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h setup_once.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 setup_once.h     \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h setup_once.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 setup_once.h \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h setup_once.h ares.h
+$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h setup_once.h nameser.h       \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h setup_once.h     \
+  ares.h ares_private.h ares_ipv6.h inet_net_pton.h
+$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h setup_once.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 setup_once.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 setup_once.h ares.h  \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h setup_once.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 setup_once.h ares.h
+$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h setup_once.h ares.h          \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h setup_once.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 setup_once.h ares.h        \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h setup_once.h ares.h        \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h setup_once.h nameser.h     \
+  ares.h ares_dns.h
+$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h setup_once.h ares_version.h
+$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h setup_once.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 setup_once.h   \
+  nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h setup_once.h nameser.h     \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h setup_once.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            \
+  setup_once.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          \
+  setup_once.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 setup_once.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 setup_once.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 setup_once.h nameser.h           \
+  ares_ipv6.h inet_ntop.h

ares/adig.c

@@ -27,14 +27,23 @@
 #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
@@ -45,8 +54,10 @@
 #define T_SRV 33 /* server selection */
 #endif
 
+#ifndef optind
 extern int optind;
 extern char *optarg;
+#endif
 
 struct nv {
   const char *name;
@@ -216,7 +227,7 @@ int main(int argc, char **argv)
           /* Set the TCP port number. */
           if (!isdigit((unsigned char)*optarg))
             usage();
-          options.tcp_port = strtol(optarg, NULL, 0);
+          options.tcp_port = (unsigned short)strtol(optarg, NULL, 0);
           optmask |= ARES_OPT_TCP_PORT;
           break;
 
@@ -224,7 +235,7 @@ int main(int argc, char **argv)
           /* Set the UDP port number. */
           if (!isdigit((unsigned char)*optarg))
             usage();
-          options.udp_port = strtol(optarg, NULL, 0);
+          options.udp_port = (unsigned short)strtol(optarg, NULL, 0);
           optmask |= ARES_OPT_UDP_PORT;
           break;
         }
@@ -385,7 +396,7 @@ static const unsigned char *display_question(const unsigned char *aptr,
    */
   if (aptr + QFIXEDSZ > abuf + alen)
     {
-      free(name);
+      ares_free_string(name);
       return NULL;
     }
 
@@ -401,7 +412,7 @@ static const unsigned char *display_question(const unsigned char *aptr,
   if (dnsclass != C_IN)
     printf("\t%s", class_name(dnsclass));
   printf("\t%s\n", type_name(type));
-  free(name);
+  ares_free_string(name);
   return aptr;
 }
 
@@ -412,7 +423,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
   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);
@@ -425,7 +436,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
    */
   if (aptr + RRFIXEDSZ > abuf + alen)
     {
-      free(name);
+      ares_free_string(name);
       return NULL;
     }
 
@@ -438,7 +449,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
   aptr += RRFIXEDSZ;
   if (aptr + dlen > abuf + alen)
     {
-      free(name);
+      ares_free_string(name);
       return NULL;
     }
 
@@ -447,7 +458,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
   if (dnsclass != C_IN)
     printf("\t%s", class_name(dnsclass));
   printf("\t%s", type_name(type));
-  free(name);
+  ares_free_string(name);
 
   /* Display the RR data.  Don't touch aptr. */
   switch (type)
@@ -465,7 +476,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
       break;
 
     case T_HINFO:
@@ -474,12 +485,12 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       len = *p;
       if (p + len + 1 > aptr + dlen)
         return NULL;
-      printf("\t%.*s", len, p + 1);
+      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);
+      printf("\t%.*s", (int)len, p + 1);
       break;
 
     case T_MINFO:
@@ -489,13 +500,13 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
       p += len;
       status = ares_expand_name(p, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
       break;
 
     case T_MX:
@@ -504,12 +515,12 @@ static const unsigned char *display_rr(const unsigned char *aptr,
        */
       if (dlen < 2)
         return NULL;
-      printf("\t%d", (aptr[0] << 8) | aptr[1]);
+      printf("\t%d", DNS__16BIT(aptr));
       status = ares_expand_name(aptr + 2, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
       break;
 
     case T_SOA:
@@ -521,22 +532,19 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.\n", name);
-      free(name);
+      ares_free_string(name);
       p += len;
       status = ares_expand_name(p, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t\t\t\t\t\t%s.\n", name);
-      free(name);
+      ares_free_string(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]);
+      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:
@@ -548,7 +556,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
           len = *p;
           if (p + len + 1 > aptr + dlen)
             return NULL;
-          printf("\t%.*s", len, p + 1);
+          printf("\t%.*s", (int)len, p + 1);
           p += len + 1;
         }
       break;
@@ -557,8 +565,14 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       /* 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));
+      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:
@@ -578,11 +592,12 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
       break;
 
     default:
       printf("\t[Unknown RR; cannot parse]");
+      break;
     }
   printf("\n");
 

ares/ahost.c

@@ -1,4 +1,6 @@
 /* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * $Id$
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
@@ -29,23 +31,38 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
 #include "ares.h"
 #include "ares_dns.h"
+#include "inet_ntop.h"
+#include "inet_net_pton.h"
 
 #ifndef INADDR_NONE
 #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);
 static void usage(void);
 
 int main(int argc, char **argv)
 {
   ares_channel channel;
-  int status, nfds;
+  int status, nfds, c, addr_family = AF_INET;
   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);
@@ -53,7 +70,28 @@ int main(int argc, char **argv)
   WSAStartup(wVersionRequested, &wsaData);
 #endif
 
-  if (argc <= 1)
+  while ((c = getopt(argc,argv,"t:h")) != -1)
+    {
+      switch (c)
+        {
+        case 't':
+          if (!strcasecmp(optarg,"a"))
+            addr_family = AF_INET;
+          else if (!strcasecmp(optarg,"aaaa"))
+            addr_family = AF_INET6;
+          else
+            usage();
+          break;
+        case 'h':
+        default:
+          usage();
+          break;
+        }
+    }
+
+  argc -= optind;
+  argv += optind;
+  if (argc < 1)
     usage();
 
   status = ares_init(&channel);
@@ -64,15 +102,21 @@ int main(int argc, char **argv)
     }
 
   /* Initiate the queries, one per command-line argument. */
-  for (argv++; *argv; argv++)
+  for ( ; *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);
+          ares_gethostbyname(channel, *argv, addr_family, callback, *argv);
         }
     }
 
@@ -95,7 +139,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)
@@ -106,13 +149,26 @@ 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("");
     }
 }
 
 static void usage(void)
 {
-  fprintf(stderr, "usage: ahost {host|addr} ...\n");
+  fprintf(stderr, "usage: ahost [-t {a|aaaa}] {host|addr} ...\n");
   exit(1);
 }

ares/ares.h

@@ -29,12 +29,14 @@
 
 #if defined(WATT32)
   #include <netinet/in.h>
+  #include <sys/socket.h>
   #include <tcp.h>
-#elif defined(WIN32)
-  #include <winsock.h>
+#elif defined(WIN32) && !defined(__CYGWIN__)
+  #include <winsock2.h>
   #include <windows.h>
 #else
   #include <netinet/in.h>
+  #include <sys/socket.h>
 #endif
 
 #ifdef  __cplusplus
@@ -64,6 +66,13 @@ extern "C" {
 #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)
@@ -84,6 +93,60 @@ extern "C" {
 #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;
@@ -97,16 +160,21 @@ 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);
 typedef void (*ares_host_callback)(void *arg, int status,
                                    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,
@@ -123,8 +191,12 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family,
                         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);
-
+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);
 void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
@@ -137,12 +209,13 @@ int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
                      int alen, unsigned char **s, long *enclen);
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
                        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);
 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
 }

ares/ares__close_sockets.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -23,7 +25,7 @@
 #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;
 
@@ -46,11 +48,13 @@ void ares__close_sockets(struct server_state *server)
   /* Close the TCP and UDP sockets. */
   if (server->tcp_socket != ARES_SOCKET_BAD)
     {
+      SOCK_STATE_CALLBACK(channel, server->tcp_socket, 0, 0);
       closesocket(server->tcp_socket);
       server->tcp_socket = ARES_SOCKET_BAD;
     }
   if (server->udp_socket != ARES_SOCKET_BAD)
     {
+      SOCK_STATE_CALLBACK(channel, server->udp_socket, 0, 0);
       closesocket(server->udp_socket);
       server->udp_socket = ARES_SOCKET_BAD;
     }

ares/ares__get_hostent.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -30,12 +32,15 @@
 
 #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)
@@ -56,6 +61,17 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
       *p = 0;
       addr.s_addr = inet_addr(line);
       if (addr.s_addr == INADDR_NONE)
+       {
+          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. */
@@ -100,7 +116,7 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
       hostent->h_addr_list = malloc(2 * sizeof(char *));
       if (!hostent->h_addr_list)
         break;
-      hostent->h_addr_list[0] = malloc(sizeof(struct in_addr));
+      hostent->h_addr_list[0] = malloc(addrlen);
       if (!hostent->h_addr_list[0])
         break;
       hostent->h_aliases = malloc((naliases + 1) * sizeof(char *));
@@ -134,9 +150,12 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
         }
       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);

ares/ares__read_line.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -50,7 +52,7 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize)
       if ((*buf)[len - 1] == '\n')
         {
           (*buf)[len - 1] = 0;
-          return ARES_SUCCESS;
+          break;
         }
       offset = len;
 
@@ -61,4 +63,5 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize)
       *buf = newbuf;
       *bufsize *= 2;
     }
+  return ARES_SUCCESS;
 }

ares/ares_cancel.3

@@ -34,6 +34,6 @@ might have been stored in their arguments.
 .BR ares_init (3)
 .BR ares_destroy (3)
 .SH NOTES
-This function is not compatible with ares.
+This function was added in c-ares 1.2.0
 .SH AUTHOR
 Dirk Manske

ares/ares_cancel.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright (C) 2004 by Daniel Stenberg et al
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -38,6 +40,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]);
   }
 }

ares/ares_destroy.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -24,7 +26,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]);

ares/ares_dns.h

@@ -28,6 +28,15 @@
                                          ((p)[2] = ((v) >> 8) & 0xff), \
                                          ((p)[3] = (v) & 0xff))
 
+#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)

ares/ares_expand_name.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -21,6 +23,9 @@
 #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>
@@ -103,6 +108,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;
 }

ares/ares_expand_string.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -53,13 +55,13 @@ int ares_expand_string(const unsigned char *encoded,
   *s = malloc(len+1);
   if (*s == NULL)
     return ARES_ENOMEM;
-  q = *s; 
+  q = *s;
   strncpy((char *)q, (char *)encoded, len);
   q[len] = '\0';
 
   *s = q;
 
-  *enclen = len+1; 
+  *enclen = len+1;
 
   return ARES_SUCCESS;
 }

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
@@ -44,13 +46,13 @@ int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
             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;
-        }
+       {
+         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 (int)nfds;
 }

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

ares/ares_free_hostent.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this

ares/ares_free_string.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 2000 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -16,6 +18,7 @@
 #include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
+#include "ares_private.h"
 
 void ares_free_string(void *str)
 {

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,7 +14,6 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  */
-
 #include "setup.h"
 #include <sys/types.h>
 
@@ -23,6 +24,9 @@
 #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>
@@ -31,6 +35,7 @@
 
 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"
 
 #ifdef WATT32
 #undef WIN32
@@ -39,7 +44,8 @@
 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;
 
@@ -51,14 +57,21 @@ 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);
-static int file_lookup(struct in_addr *addr, 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)
 {
   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;
@@ -71,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;
@@ -82,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;
@@ -92,18 +109,38 @@ static void next_lookup(struct addr_query *aquery)
       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);
+          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, &host);
+          status = file_lookup(&aquery->addr, aquery->family, &host);
           if (status != ARES_ENOTFOUND)
             {
               end_aquery(aquery, status, host);
@@ -122,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)
@@ -141,27 +182,26 @@ 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 (IS_NT()) {
-        char tmp[MAX_PATH];
-        HKEY hkeyHosts;
+    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, tmp,
-                        &dwLength);
-                ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH);
-                RegCloseKey(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);
@@ -179,11 +219,23 @@ static int file_lookup(struct in_addr *addr, struct hostent **host)
   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);

ares/ares_gethostbyname.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -23,8 +25,13 @@
 #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>
@@ -33,6 +40,8 @@
 
 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"
+#include "bitncmp.h"
 
 #ifdef WATT32
 #undef WIN32
@@ -44,7 +53,7 @@ struct host_query {
   char *name;
   ares_host_callback callback;
   void *arg;
-
+  int family;
   const char *remaining_lookups;
 };
 
@@ -53,13 +62,17 @@ 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);
-static int fake_hostent(const char *name, ares_host_callback callback,
+static int fake_hostent(const char *name, int family, ares_host_callback callback,
                         void *arg);
-static int file_lookup(const char *name, struct hostent **host);
+static int file_lookup(const char *name, int family, struct hostent **host);
 static void sort_addresses(struct hostent *host, struct apattern *sortlist,
                            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);
+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)
@@ -67,13 +80,13 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family,
   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. */
@@ -85,6 +98,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);
@@ -112,13 +126,17 @@ static void next_lookup(struct host_query *hquery)
         case 'b':
           /* DNS lookup */
           hquery->remaining_lookups = p + 1;
-          ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
-                      hquery);
+          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);
+          status = file_lookup(hquery->name, hquery->family, &host);
           if (status != ARES_ENOTFOUND)
             {
               end_hquery(hquery, status, host);
@@ -138,11 +156,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
@@ -162,36 +196,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,
+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)
@@ -201,11 +233,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);
 
@@ -213,7 +243,7 @@ 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;
@@ -222,18 +252,18 @@ static int file_lookup(const char *name, struct hostent **host)
 #ifdef WIN32
   char PATH_HOSTS[MAX_PATH];
   if (IS_NT()) {
-        char tmp[MAX_PATH];
-        HKEY hkeyHosts;
+    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, tmp,
-                        &dwLength);
-                ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH);
-                RegCloseKey(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);
@@ -252,7 +282,7 @@ static int file_lookup(const char *name, struct hostent **host)
   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;
@@ -310,8 +340,66 @@ static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
 
   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;
+}
+

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.

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;
+}

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)

ares/ares_getsock.c

@@ -0,0 +1,69 @@
+/* $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;
+  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;
+
+  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 bitmap;
+}

ares/ares_init.3

@@ -98,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

ares/ares_init.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -27,10 +29,17 @@
 #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
@@ -44,6 +53,7 @@
 #include <errno.h>
 #include "ares.h"
 #include "ares_private.h"
+#include "inet_net_pton.h"
 
 #ifdef WATT32
 #undef WIN32  /* Redefined in MingW/MSVC headers */
@@ -54,19 +64,23 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
 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_nameserver(struct server_state **servers, int *nservers,
+                             char *str);
+static int set_search(ares_channel channel, const char *str);
+static int set_options(ares_channel channel, const char *str);
+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_nameserver(struct server_state **servers, int *nservers,
-                             char *str);
 static int config_sortlist(struct apattern **sortlist, int *nsort,
                            const 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);
-static int ip_addr(const char *s, int len, struct in_addr *addr);
-static void natural_mask(struct apattern *pat);
+#endif
 
 int ares_init(ares_channel *channelptr)
 {
@@ -81,6 +95,16 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
   struct server_state *server;
   struct timeval tv;
 
+#ifdef CURLDEBUG
+  const char *env = getenv("CARES_MEMDEBUG");
+
+  if (env)
+    curl_memdebug(env);
+  env = getenv("CARES_MEMLIMIT");
+  if (env)
+    curl_memlimit(atoi(env));
+#endif
+
   channel = malloc(sizeof(struct ares_channeldata));
   if (!channel)
     return ARES_ENOMEM;
@@ -101,6 +125,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.
@@ -180,6 +205,11 @@ 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)
@@ -264,7 +294,8 @@ static int get_res_nt(HKEY hKey, const char *subkey, char **obuf)
   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;
@@ -314,6 +345,7 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
   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);
@@ -326,7 +358,8 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
   if (!GetNetworkParams)
      goto quit;
 
-  if ((*GetNetworkParams) (fi, &size) != ERROR_BUFFER_OVERFLOW)
+  res = (*GetNetworkParams) (fi, &size);
+  if ((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS))
      goto quit;
 
   fi = alloca (size);
@@ -489,7 +522,7 @@ DhcpNameServer
   if (status == ARES_SUCCESS)
     status = ARES_EOF;
 
-#elif defined(riscos)
+#elif defined(__riscos__)
 
   /* Under RISC OS, name servers are listed in the
      system variable Inet$Resolvers, space separated. */
@@ -709,6 +742,7 @@ static int init_by_defaults(ares_channel channel)
   return ARES_SUCCESS;
 }
 
+#ifndef WIN32
 static int config_domain(ares_channel channel, char *str)
 {
   char *q;
@@ -749,6 +783,8 @@ static int config_lookup(ares_channel channel, const char *str,
   return (channel->lookups) ? ARES_SUCCESS : ARES_ENOMEM;
 }
 
+#endif
+
 static int config_nameserver(struct server_state **servers, int *nservers,
                              char *str)
 {
@@ -810,39 +846,74 @@ 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)
 {
-  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)
+      memcpy(ipbuf, str, (int)(q-str));
+      ipbuf[(int)(q-str)] = 0;
+      /* Find the prefix */
+      if (*q == '/')
         {
-          /* We have a pattern address; now determine the mask. */
-          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
+        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)
             {
-              str = q + 1;
-              while (*q && *q != ';' && !isspace((unsigned char)*q))
-                q++;
-              if (ip_addr(str, (int)(q - str), &pat.mask) != 0)
+              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);
-
-          /* Add this pattern to our list. */
-          newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern));
-          if (!newsort)
+          pat.family = AF_INET;
+          pat.type = PATTERN_MASK;
+          if (!sortlist_alloc(sortlist, nsort, &pat))
             return ARES_ENOMEM;
-          newsort[*nsort] = pat;
-          *sortlist = newsort;
-          (*nsort)++;
         }
       else
         {
@@ -856,6 +927,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
 
   return ARES_SUCCESS;
 }
+#endif
 
 static int set_search(ares_channel channel, const char *str)
 {
@@ -937,6 +1009,7 @@ static int set_options(ares_channel channel, const char *str)
   return ARES_SUCCESS;
 }
 
+#ifndef WIN32
 static char *try_config(char *s, const char *opt)
 {
   size_t len;
@@ -950,21 +1023,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)
@@ -979,15 +1065,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

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;
+  socklen_t        ai_addrlen;   /* Follow rfc3493 struct addrinfo */
+  char            *ai_canonname;
+  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 */

ares/ares_mkquery.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -21,12 +23,16 @@
 #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>
 #include <string.h>
 #include "ares.h"
 #include "ares_dns.h"
+#include "ares_private.h"
 
 /* Header format, from RFC 1035:
  *                                  1  1  1  1  1  1

ares/ares_parse_a_reply.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -24,6 +26,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>

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.

ares/ares_parse_aaaa_reply.c

@@ -0,0 +1,181 @@
+/* $Id$ */
+
+/* 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;
+}

ares/ares_parse_ptr_reply.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -23,6 +25,9 @@
 #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>

ares/ares_private.h

@@ -1,3 +1,6 @@
+#ifndef __ARES_PRIVATE_H
+#define __ARES_PRIVATE_H
+
 /* $Id$ */
 
 /* Copyright 1998 by the Massachusetts Institute of Technology.
@@ -33,6 +36,10 @@
 #define writev(s,v,c)     writev_s(s,v,c)
 #endif
 
+#ifdef NETWARE
+#include <time.h>
+#endif
+
 #define DEFAULT_TIMEOUT         5
 #define DEFAULT_TRIES           4
 #ifndef INADDR_NONE
@@ -58,6 +65,10 @@
 #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"
@@ -69,6 +80,8 @@
 
 #endif
 
+#include "ares_ipv6.h"
+
 struct send_request {
   /* Remaining data to send */
   const unsigned char *data;
@@ -124,9 +137,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 {
@@ -152,21 +179,29 @@ 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
    c-ares is built and linked with a similarly debug-build libcurl, but we do
    this anyway for convenience. */
-#ifndef CURL_EXTERN
-/* ugly hack to make this compile */
-#define CURL_EXTERN
-#endif
 #include "../lib/memdebug.h"
 #endif
+
+#endif /* __ARES_PRIVATE_H */
+

ares/ares_process.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -27,9 +29,19 @@
 #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>
@@ -42,12 +54,18 @@
 #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 int try_again(int errnum);
 static void write_tcp_data(ares_channel channel, fd_set *write_fds,
                            time_t now);
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now);
@@ -79,6 +97,31 @@ void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
   process_timeouts(channel, now);
 }
 
+/* Return 1 if the specified errno describes a readiness error, or 0
+ * otherwise. This is mostly for HP-UX, which could return EAGAIN or
+ * EWOULDBLOCK. See this man page
+ *
+ * 	http://devrsrc1.external.hp.com/STKS/cgi-bin/man2html?manpage=/usr/share/man/man2.Z/send.2
+ */
+static int try_again(int errnum)
+{
+#if !defined EWOULDBLOCK && !defined EAGAIN
+#error "Neither EWOULDBLOCK nor EAGAIN defined"
+#endif
+  switch (errnum)
+    {
+#ifdef EWOULDBLOCK
+    case EWOULDBLOCK:
+      return 1;
+#endif
+#if defined EAGAIN && EAGAIN != EWOULDBLOCK
+    case EAGAIN:
+      return 1;
+#endif
+    }
+  return 0;
+}
+
 /* If any TCP sockets select true for writing, write out queued data
  * we have for them.
  */
@@ -89,7 +132,7 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
   struct iovec *vec;
   int i;
   ssize_t scount;
-  int wcount;
+  ssize_t wcount;
   size_t n;
 
   for (i = 0; i < channel->nservers; i++)
@@ -117,11 +160,12 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
               vec[n].iov_len = sendreq->len;
               n++;
             }
-          wcount = writev(server->tcp_socket, vec, n);
+          wcount = (ssize_t)writev(server->tcp_socket, vec, n);
           free(vec);
           if (wcount < 0)
             {
-              handle_error(channel, i, now);
+              if (!try_again(GET_ERRNO()))
+                  handle_error(channel, i, now);
               continue;
             }
 
@@ -134,7 +178,10 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
                   wcount -= sendreq->len;
                   server->qhead = sendreq->next;
                   if (server->qhead == NULL)
-                    server->qtail = NULL;
+                    {
+                      SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+                      server->qtail = NULL;
+                    }
                   free(sendreq);
                 }
               else
@@ -150,11 +197,11 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
           /* Can't allocate iovecs; just send the first request. */
           sendreq = server->qhead;
 
-          scount = send(server->tcp_socket, sendreq->data, sendreq->len, 0);
-
+          scount = swrite(server->tcp_socket, sendreq->data, sendreq->len);
           if (scount < 0)
             {
-              handle_error(channel, i, now);
+              if (!try_again(GET_ERRNO()))
+                  handle_error(channel, i, now);
               continue;
             }
 
@@ -163,7 +210,10 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
             {
               server->qhead = sendreq->next;
               if (server->qhead == NULL)
-                server->qtail = NULL;
+                {
+                  SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+                  server->qtail = NULL;
+                }
               free(sendreq);
             }
           else
@@ -182,7 +232,8 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
 {
   struct server_state *server;
-  int i, count;
+  int i;
+  ssize_t count;
 
   for (i = 0; i < channel->nservers; i++)
     {
@@ -197,16 +248,17 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
           /* 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);
+          count = sread(server->tcp_socket,
+                        server->tcp_lenbuf + server->tcp_lenbuf_pos,
+                        2 - server->tcp_lenbuf_pos);
           if (count <= 0)
             {
-              handle_error(channel, i, now);
+              if (!(count == -1 && try_again(GET_ERRNO())))
+                  handle_error(channel, i, now);
               continue;
             }
 
-          server->tcp_lenbuf_pos += count;
+          server->tcp_lenbuf_pos += (int)count;
           if (server->tcp_lenbuf_pos == 2)
             {
               /* We finished reading the length word.  Decode the
@@ -223,16 +275,17 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
       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);
+          count = sread(server->tcp_socket,
+                        server->tcp_buffer + server->tcp_buffer_pos,
+                        server->tcp_length - server->tcp_buffer_pos);
           if (count <= 0)
             {
-              handle_error(channel, i, now);
+              if (!(count == -1 && try_again(GET_ERRNO())))
+                  handle_error(channel, i, now);
               continue;
             }
 
-          server->tcp_buffer_pos += count;
+          server->tcp_buffer_pos += (int)count;
           if (server->tcp_buffer_pos == server->tcp_length)
             {
               /* We finished reading this answer; process it and
@@ -254,7 +307,8 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
                              time_t now)
 {
   struct server_state *server;
-  int i, count;
+  int i;
+  ssize_t count;
   unsigned char buf[PACKETSZ + 1];
 
   for (i = 0; i < channel->nservers; i++)
@@ -266,11 +320,13 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
           !FD_ISSET(server->udp_socket, read_fds))
         continue;
 
-      count = recv(server->udp_socket, buf, sizeof(buf), 0);
-      if (count <= 0)
+      count = sread(server->udp_socket, buf, sizeof(buf));
+      if (count == -1 && try_again(GET_ERRNO()))
+        continue;
+      else if (count <= 0)
         handle_error(channel, i, now);
 
-      process_answer(channel, buf, count, i, 0, now);
+      process_answer(channel, buf, (int)count, i, 0, now);
     }
 }
 
@@ -364,7 +420,7 @@ static void handle_error(ares_channel channel, int whichserver, time_t now)
   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.
@@ -436,7 +492,10 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
       if (server->qtail)
         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;
     }
@@ -451,8 +510,9 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
               return;
             }
         }
-      if (send(server->udp_socket, query->qbuf, query->qlen, 0) == -1)
+      if (swrite(server->udp_socket, query->qbuf, query->qlen) == -1)
         {
+          /* FIXME: Handle EAGAIN here since it likely can happen. */
           query->skip_server[query->server] = 1;
           next_server(channel, query, now);
           return;
@@ -463,10 +523,77 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
     }
 }
 
+/*
+ * 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)
 {
   ares_socket_t s;
-  int flags;
   struct sockaddr_in sockin;
 
   /* Acquire a socket. */
@@ -475,25 +602,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
     return -1;
 
   /* Set the socket non-blocking. */
-
-#if defined(WIN32) || defined(WATT32)
-  flags = 1;
-  ioctlsocket(s, FIONBIO, &flags);
-#else
-  flags = fcntl(s, F_GETFL, 0);
-
-  if (flags == -1)
-    {
-      closesocket(s);
-      return -1;
-    }
-  flags |= O_NONBLOCK;
-  if (fcntl(s, F_SETFL, flags) == -1)
-    {
-      closesocket(s);
-      return -1;
-    }
-#endif
+  nonblock(s, TRUE);
 
   /* Connect to the server. */
   memset(&sockin, 0, sizeof(sockin));
@@ -509,6 +618,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
     }
   }
 
+  SOCK_STATE_CALLBACK(channel, s, 1, 0);
   server->tcp_buffer_pos = 0;
   server->tcp_socket = s;
   return 0;
@@ -524,6 +634,9 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
   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;
@@ -535,6 +648,8 @@ 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;
 }
@@ -645,7 +760,7 @@ static struct query *end_query (ares_channel channel, struct query *query, int s
   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);
 }

ares/ares_query.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -21,6 +23,9 @@
 #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>

ares/ares_search.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this

ares/ares_send.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -21,6 +23,9 @@
 #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>

ares/ares_strerror.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
@@ -38,7 +40,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)));

ares/ares_timeout.c

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this

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);
 

ares/bitncmp.c

@@ -0,0 +1,62 @@
+/* $Id$ */
+
+/*
+ * 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

ares/bitncmp.h

@@ -0,0 +1,26 @@
+#ifndef __ARES_BITNCMP_H
+#define __ARES_BITNCMP_H
+
+/* $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 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 /* __ARES_BITNCMP_H */

ares/buildconf

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-libtoolize --copy --automake --force
-aclocal
-autoheader
-autoconf
-automake --add-missing
+${LIBTOOLIZE:-libtoolize} --copy --automake --force
+${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
+${AUTOHEADER:-autoheader}
+${AUTOCONF:-autoconf}
+${AUTOMAKE:-automake} --add-missing

ares/config-win32.h

@@ -0,0 +1,144 @@
+#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
+
+/* Define if you have the getnameinfo function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to the type qualifier of arg 1 for getnameinfo. */
+#define GETNAMEINFO_QUAL_ARG1 const
+
+/* Define to the type of arg 1 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
+
+/* Define to the type of arg 2 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG2 socklen_t
+
+/* Define to the type of args 4 and 6 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG46 DWORD
+
+/* Define to the type of arg 7 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG7 int
+
+/* Define if you have the recv function. */
+#define HAVE_RECV 1
+
+/* Define to the type of arg 1 for recv. */
+#define RECV_TYPE_ARG1 SOCKET
+
+/* Define to the type of arg 2 for recv. */
+#define RECV_TYPE_ARG2 char *
+
+/* Define to the type of arg 3 for recv. */
+#define RECV_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for recv. */
+#define RECV_TYPE_ARG4 int
+
+/* Define to the function return type for recv. */
+#define RECV_TYPE_RETV int
+
+/* Define if you have the send function. */
+#define HAVE_SEND 1
+
+/* Define to the type of arg 1 for send. */
+#define SEND_TYPE_ARG1 SOCKET
+
+/* Define to the type qualifier of arg 2 for send. */
+#define SEND_QUAL_ARG2 const
+
+/* Define to the type of arg 2 for send. */
+#define SEND_TYPE_ARG2 char *
+
+/* Define to the type of arg 3 for send. */
+#define SEND_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for send. */
+#define SEND_TYPE_ARG4 int
+
+/* Define to the function return type for send. */
+#define SEND_TYPE_RETV int
+
+/* ---------------------------------------------------------------- */
+/*                          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 */

ares/configure.ac

@@ -1,5 +1,8 @@
+
 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)
@@ -13,12 +16,7 @@ solaris*)
 	;;
 esac
 
-# check for ssize_t
-AC_CHECK_TYPE(ssize_t, ,
-   AC_DEFINE(ssize_t, int, [the signed version of size_t]))
-
-AC_SEARCH_LIBS(gethostbyname, nsl)
-AC_SEARCH_LIBS(socket, socket)
+AC_LIBTOOL_WIN32_DLL
 
 dnl ************************************************************
 dnl Option to switch on debug options. This makes an assumption that
@@ -38,12 +36,22 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
     dnl when doing the debug stuff, use static library only
     AC_DISABLE_SHARED
 
-    dnl Checks for standard header files, to make memdebug.h inclusions bettter
-    AC_HEADER_STDC
+    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
@@ -53,14 +61,597 @@ 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 **********************************************************************
+dnl Checks for libraries.
+dnl **********************************************************************
+
+dnl gethostbyname without lib or in the nsl lib?
+AC_CHECK_FUNC(gethostbyname,
+              [HAVE_GETHOSTBYNAME="1"
+              ],
+              [ AC_CHECK_LIB(nsl, gethostbyname,
+                             [HAVE_GETHOSTBYNAME="1"
+                             LIBS="$LIBS -lnsl"
+                             ])
+              ])
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl gethostbyname in the socket lib?
+  AC_CHECK_LIB(socket, gethostbyname,
+               [HAVE_GETHOSTBYNAME="1"
+               LIBS="$LIBS -lsocket"
+               ])
+fi
+
+dnl At least one system has been identified to require BOTH nsl and socket
+dnl libs at the same time to link properly.
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  AC_MSG_CHECKING([for gethostbyname with both nsl and socket libs])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lnsl -lsocket $LIBS"
+  AC_TRY_LINK( ,
+             [gethostbyname();],
+             [ dnl found it!
+             HAVE_GETHOSTBYNAME="1"
+             AC_MSG_RESULT([yes])],
+             [ dnl failed!
+             AC_MSG_RESULT([no])
+             dnl restore LIBS
+             LIBS=$my_ac_save_LIBS]
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl This is for Msys/Mingw
+  AC_MSG_CHECKING([for gethostbyname in ws2_32])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lws2_32 $LIBS"
+  AC_TRY_LINK([#include <winsock2.h>],
+               [gethostbyname("www.dummysite.com");],
+               [ dnl worked!
+               ws2="yes"
+               AC_MSG_RESULT([yes])
+               HAVE_GETHOSTBYNAME="1"],
+               [ dnl failed, restore LIBS
+               LIBS=$my_ac_save_LIBS
+               AC_MSG_RESULT(no)]
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl This is for eCos with a stubbed DNS implementation
+  AC_MSG_CHECKING([for gethostbyname for eCos])
+  AC_TRY_LINK([
+#include <stdio.h>
+#include <netdb.h>],
+               [gethostbyname("www.dummysite.com");],
+               [ dnl worked!
+               AC_MSG_RESULT([yes])
+               HAVE_GETHOSTBYNAME="1"],
+               AC_MSG_RESULT(no)
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl gethostbyname in the net lib - for BeOS
+  AC_CHECK_LIB(net, gethostbyname,
+               [HAVE_GETHOSTBYNAME="1"
+               LIBS="$LIBS -lnet"
+               ])
+fi
+
+
+if test "$HAVE_GETHOSTBYNAME" = "1"; then
+  AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [If you have gethostbyname])
+else
+  AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
+fi
+
+dnl resolve lib?
+AC_CHECK_FUNC(strcasecmp, , [ AC_CHECK_LIB(resolve, strcasecmp) ])
+
+if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
+  AC_CHECK_LIB(resolve, strcasecmp,
+              [LIBS="-lresolve $LIBS"],
+               ,
+               -lnsl)
+fi
+
+dnl socket lib?
+AC_CHECK_FUNC(connect, , [ AC_CHECK_LIB(socket, connect) ])
+
+dnl dl lib?
+AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ])
+
+AC_MSG_CHECKING([whether to use libgcc])
+AC_ARG_ENABLE(libgcc,
+AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]),
+[ case "$enableval" in
+  yes)
+        LIBS="$LIBS -lgcc"
+       AC_MSG_RESULT(yes)
+       ;;
+  *)   AC_MSG_RESULT(no)
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+dnl **********************************************************************
+dnl Back to "normal" configuring
+dnl **********************************************************************
+
+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
+
+CURL_CHECK_HEADER_MALLOC
+
 dnl check for a few basic system headers we need
 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
+
+CURL_CHECK_FUNC_RECV
+
+CURL_CHECK_FUNC_SEND
+
+CURL_CHECK_MSG_NOSIGNAL
+
+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)

ares/inet_net_pton.c

@@ -0,0 +1,441 @@
+/* $Id$ */
+
+/*
+ * 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

ares/inet_net_pton.h

@@ -0,0 +1,31 @@
+#ifndef __ARES_INET_NET_PTON_H
+#define __ARES_INET_NET_PTON_H
+
+/* $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.
+ */
+
+#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 /* __ARES_INET_NET_PTON_H */

ares/inet_ntop.c

@@ -0,0 +1,228 @@
+/* $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")];
+  char *tp;
+  struct {
+    long base;
+    long len;
+  } best, cur;
+  unsigned long 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;
+  best.len = 0;
+  cur.len = 0;
+
+  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, "%lx", 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
+

ares/inet_ntop.h

@@ -0,0 +1,26 @@
+#ifndef __ARES_INET_NTOP_H
+#define __ARES_INET_NTOP_H
+
+/* $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.
+ */
+
+#if defined(HAVE_INET_NTOP) && defined(HAVE_INET_NTOP_IPV6)
+#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 /* __ARES_INET_NTOP_H */

ares/nameser.h

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef ARES_NAMESER_H
 #define ARES_NAMESER_H
 
@@ -5,7 +7,9 @@
    port build */
 
 #ifndef NETWARE
+#ifndef __CYGWIN__
 #include <windows.h>
+#endif
 #include <process.h> /* for the _getpid() proto */
 #endif  /* !NETWARE */
 #include <sys/types.h>
@@ -16,6 +20,8 @@
 
 #define EINPROGRESS WSAEINPROGRESS
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#define EMSGSIZE     WSAEMSGSIZE
+#define EAFNOSUPPORT WSAEAFNOSUPPORT
 
 /* Structure for scatter/gather I/O.  */
 struct iovec
@@ -36,8 +42,10 @@ int ares_gettimeofday(struct timeval *tv, struct timezone *tz);
 
 #endif  /* !NETWARE */
 
-#define NS_CMPRSFLGS  0xc0  
-
+#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
@@ -134,7 +142,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 */

ares/setup.h

@@ -1,7 +1,9 @@
-#ifndef ARES_SETUP_H
-#define ARES_SETUP_H
+#ifndef __ARES_SETUP_H
+#define __ARES_SETUP_H
 
-/* Copyright (C) 2004 by Daniel Stenberg et al
+/* $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
@@ -14,16 +16,83 @@
  * 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
-/* simple work-around for now, for systems without configure support */
+
+#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.  Under Cygwin things work
+ * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
+ * never be included when __CYGWIN__ is defined.  configure script takes
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
+ */
+
+#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
 
-/* 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. */
+#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
@@ -32,9 +101,11 @@
 #undef VERSION
 #undef PACKAGE
 
-/* now typedef our socket type */
+/*
+ * Typedef our socket type
+ */
+
 #if defined(WIN32) && !defined(WATT32)
-#include <winsock.h>
 typedef SOCKET ares_socket_t;
 #define ARES_SOCKET_BAD INVALID_SOCKET
 #else
@@ -42,14 +113,16 @@ typedef int ares_socket_t;
 #define ARES_SOCKET_BAD -1
 #endif
 
-/* Assume a few thing unless they're set by configure
+/*
+ * Assume a few thing unless they're set by configure
  */
+
 #if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
-#define HAVE_SYS_TIME_H  
+#define HAVE_SYS_TIME_H
 #endif
 
 #if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 
+#define HAVE_UNISTD_H 1
 #endif
 
 #if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
@@ -57,7 +130,7 @@ typedef int ares_socket_t;
 #endif
 
 #if (defined(WIN32) || defined(WATT32)) && \
-   !(defined(__MINGW32__) || defined(NETWARE))
+   !(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);
@@ -69,4 +142,21 @@ int ares_strcasecmp(const char *s1, const char *s2);
 #define strcasecmp(a,b) ares_strcasecmp(a,b)
 #endif
 
-#endif /* ARES_SETUP_H */
+/* 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
+
+/*
+ * Include macros and defines that should only be processed once.
+ */
+
+#ifndef __SETUP_ONCE_H
+#include "setup_once.h"
+#endif
+
+#endif /* __ARES_SETUP_H */

ares/setup_once.h

@@ -0,0 +1,109 @@
+#ifndef __SETUP_ONCE_H
+#define __SETUP_ONCE_H
+
+/* $Id$ */
+
+/* Copyright (C) 2004 - 2006 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 we have the MSG_NOSIGNAL define, make sure we use
+ * it as the fourth argument of send() and recv()
+ */
+
+#ifdef HAVE_MSG_NOSIGNAL
+#define SEND_4TH_ARG MSG_NOSIGNAL
+#else
+#define SEND_4TH_ARG 0
+#endif 
+
+
+/*
+ * The definitions for the return type and arguments types
+ * of functions recv() and send() belong and come from the
+ * configuration file. Do not define them in any other place.
+ *
+ * HAVE_RECV is defined if you have a function named recv()
+ * which is used to read incoming data from sockets. If your
+ * function has another name then don't define HAVE_RECV.
+ *
+ * If HAVE_RECV is defined then RECV_TYPE_ARG1, RECV_TYPE_ARG2,
+ * RECV_TYPE_ARG3, RECV_TYPE_ARG4 and RECV_TYPE_RETV must also
+ * be defined.
+ *
+ * HAVE_SEND is defined if you have a function named send()
+ * which is used to write outgoing data on a connected socket.
+ * If yours has another name then don't define HAVE_SEND.
+ *
+ * If HAVE_SEND is defined then SEND_TYPE_ARG1, SEND_QUAL_ARG2,
+ * SEND_TYPE_ARG2, SEND_TYPE_ARG3, SEND_TYPE_ARG4 and
+ * SEND_TYPE_RETV must also be defined.
+ */
+
+#ifdef HAVE_RECV
+#if !defined(RECV_TYPE_ARG1) || \
+    !defined(RECV_TYPE_ARG2) || \
+    !defined(RECV_TYPE_ARG3) || \
+    !defined(RECV_TYPE_ARG4) || \
+    !defined(RECV_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_recv
+  /* */
+#else
+#define sread(x,y,z) (ssize_t)recv((RECV_TYPE_ARG1)(x), \
+                                   (RECV_TYPE_ARG2)(y), \
+                                   (RECV_TYPE_ARG3)(z), \
+                                   (RECV_TYPE_ARG4)(SEND_4TH_ARG))
+#endif
+#else /* HAVE_RECV */
+#ifdef DJGPP
+#define sread(x,y,z) (ssize_t)read_s((int)(x), (char *)(y), (int)(z))
+#endif
+#ifndef sread
+  /* */
+  Error Missing_definition_of_macro_sread
+  /* */
+#endif
+#endif /* HAVE_RECV */
+
+#ifdef HAVE_SEND
+#if !defined(SEND_TYPE_ARG1) || \
+    !defined(SEND_QUAL_ARG2) || \
+    !defined(SEND_TYPE_ARG2) || \
+    !defined(SEND_TYPE_ARG3) || \
+    !defined(SEND_TYPE_ARG4) || \
+    !defined(SEND_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_send
+  /* */
+#else
+#define swrite(x,y,z) (ssize_t)send((SEND_TYPE_ARG1)(x), \
+                                    (SEND_TYPE_ARG2)(y), \
+                                    (SEND_TYPE_ARG3)(z), \
+                                    (SEND_TYPE_ARG4)(SEND_4TH_ARG))
+#endif
+#else /* HAVE_SEND */
+#ifdef DJGPP
+#define swrite(x,y,z) (ssize_t)write_s((int)(x), (char *)(y), (int)(z))
+#endif
+#ifndef swrite
+  /* */
+  Error Missing_definition_of_macro_swrite
+  /* */
+#endif
+#endif /* HAVE_SEND */
+
+
+#endif /* __SETUP_ONCE_H */
+

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 ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
-   cd "..\adig"
-
-"areslib - Win32 ReleaseCLEAN" : 
-   cd ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\adig"
-
-!ELSEIF  "$(CFG)" == "adig - Win32 Debug"
-
-"areslib - Win32 Debug" : 
-   cd ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
-   cd "..\adig"
-
-"areslib - Win32 DebugCLEAN" : 
-   cd ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\adig"
-
-!ENDIF 
-
-
-!ENDIF 
-

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>

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
+

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
 

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 ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
-   cd "..\ahost"
-
-"areslib - Win32 ReleaseCLEAN" : 
-   cd ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\ahost"
-
-!ELSEIF  "$(CFG)" == "ahost - Win32 Debug"
-
-"areslib - Win32 Debug" : 
-   cd ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
-   cd "..\ahost"
-
-"areslib - Win32 DebugCLEAN" : 
-   cd ".\areslib"
-   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\ahost"
-
-!ENDIF 
-
-
-!ENDIF 
-

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>

ares/vc/areslib/areslib.dsp

@@ -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
@@ -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
@@ -137,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
@@ -153,14 +161,6 @@ SOURCE=..\..\ares_search.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\ares_cancel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\ares_version.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\ares_send.c
 # End Source File
 # Begin Source File
@@ -173,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
@@ -189,7 +205,7 @@ SOURCE=..\..\ares_dns.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\ares_version.h
+SOURCE=..\..\ares_ipv6.h
 # End Source File
 # Begin Source File
 
@@ -197,6 +213,22 @@ 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

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>
+{{{
+}}}
+
+###############################################################################
+

ares/vc/areslib/areslib.mak

@@ -1,367 +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_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_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_cancel.obj" \
-	"$(INTDIR)\ares_version.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_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_cancel.obj"
-	-@erase "$(INTDIR)\ares_version.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_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_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_version.c
-
-"$(INTDIR)\ares_version.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_cancel.c
-
-"$(INTDIR)\ares_cancel.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
-

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>

ares/windows_port.c

@@ -1,5 +1,7 @@
 #include "setup.h"
 
+/* $Id$ */
+
 /* only do the following on windows
  */
 #if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
@@ -100,6 +102,6 @@ ares_writev (ares_socket_t s, const struct iovec *vector, size_t count)
     memcpy (bp, vector[i].iov_base, vector[i].iov_len);
     bp += vector[i].iov_len;
   }
-  return send (s, (const void*)buffer, bytes, 0);
+  return (int)swrite(s, buffer, bytes);
 }
 #endif /* WIN32 builds only */

buildconf

@@ -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,13 +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
 
-# set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
-LIBTOOLIZE="${libtool}ize"
+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 -1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
+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"
@@ -142,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
@@ -155,17 +197,26 @@ 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"
@@ -175,15 +226,13 @@ ${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

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,6 +39,7 @@ Available values for OPTION include:
   --ca        ca bundle install path
   --cc        compiler
   --cflags    pre-processor and compiler flags
+  --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
@@ -60,6 +81,9 @@ while test $# -gt 0; do
     --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
           echo "KRB4"
@@ -73,6 +97,16 @@ while test $# -gt 0; do
 	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)
@@ -88,9 +122,6 @@ while test $# -gt 0; do
             echo "FTPS"
           fi
         fi
-	if test "@CURL_DISABLE_GOPHER@" != "1"; then
-          echo "GOPHER"
-        fi
 	if test "@CURL_DISABLE_FILE@" != "1"; then
           echo "FILE"
         fi
@@ -103,12 +134,35 @@ while test $# -gt 0; do
 	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

docs/BINDINGS

@@ -46,8 +46,8 @@ Cocoa
 
 D
 
-  Written by Charles Sanders and James Wavro
-  http://www.atari-soldiers.com/libcurl.html
+  Written by Kenneth Bogert
+  http://curl.haxx.se/libcurl/d/
 
 Dylan
 
@@ -75,10 +75,15 @@ Java
   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
 
@@ -145,6 +150,16 @@ Scheme
   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
 
   Tclcurl is written by Andr<64>s Garc<72>a
@@ -156,10 +171,15 @@ Visual Basic
   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

docs/CONTRIBUTE

@@ -4,11 +4,11 @@
                             | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
-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
 

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

docs/FAQ

@@ -1,4 +1,4 @@
-Updated: December 21, 2004 (http://curl.haxx.se/docs/faq.html)
+Updated: November 2, 2005 (http://curl.haxx.se/docs/faq.html)
                                   _   _ ____  _
                               ___| | | |  _ \| |
                              / __| | | | |_) | |
@@ -16,6 +16,8 @@ FAQ
   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
@@ -43,6 +45,7 @@ FAQ
   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.
@@ -63,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?
@@ -74,6 +79,9 @@ FAQ
   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?
@@ -82,6 +90,7 @@ 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?
@@ -97,7 +106,7 @@ FAQ
   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 abbrivation for "Client URL Request Library" or why not the recursive
+  an abbreviation for "Client URL Request Library" or why not the recursive
   version: "Curl URL Request Library".
 
   The cURL project produces two products:
@@ -105,7 +114,7 @@ FAQ
   libcurl
 
     A free and easy-to-use client-side URL transfer library, supporting FTP,
-    FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP.  libcurl supports
+    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!
@@ -123,16 +132,15 @@ FAQ
     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, GOPHER, LDAP, DICT, TELNET and
-    FILE.
+    currently including HTTP, HTTPS, FTP, FTPS, LDAP, DICT, TELNET and FILE.
 
   We pronounce curl and cURL with an initial k sound: [kurl].
 
-  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
+  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?
 
@@ -142,6 +150,10 @@ FAQ
   You can use libcurl for free in your application, be it open source,
   commercial or closed-source.
 
+  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
@@ -193,15 +205,14 @@ FAQ
 
   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.
 
@@ -216,12 +227,8 @@ FAQ
   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?
 
@@ -252,6 +259,58 @@ 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
 
@@ -296,8 +355,8 @@ FAQ
 
   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!
 
@@ -392,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
@@ -503,24 +564,26 @@ FAQ
     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 certficate to make sure that
+    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. The server certificate verifaction 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.
+    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
@@ -533,6 +596,12 @@ FAQ
 
      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
 
@@ -726,6 +795,28 @@ 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
 
@@ -733,12 +824,20 @@ FAQ
 
   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?
 
@@ -750,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 {
@@ -858,7 +957,10 @@ FAQ
 
   5.9 How does libcurl resolve host names?
 
-  libcurl includes a number of different name resolve functions:
+  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):
@@ -871,12 +973,43 @@ FAQ
   - 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
 
   Curl and libcurl are released under a MIT/X derivate license. The license is
@@ -884,6 +1017,9 @@ FAQ
   is just a brief summary for the cases we get the most questions. (Parts of
   this section was much enhanced by Bjorn Reese.)
 
+  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!
@@ -928,13 +1064,38 @@ FAQ
   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. We often call it PHP/CURL to differentiate from
-  curl the command line tool and libcurl the library.
+  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?
 

docs/FEATURES

@@ -62,11 +62,11 @@ HTTP
 
 HTTPS (*1)
  - (all the HTTP features)
- - using certificates
+ - using client certificates
  - verify server certificate
  - via http-proxy
  - select desired encryption
- - force usage of a specific SSL version (SSLv2, SSLv3 or TLSv1)
+ - force usage of a specific SSL version (SSLv2(*7), SSLv3 or TLSv1)
 
 FTP
  - download
@@ -91,10 +91,13 @@ FTP
  - no dir depth limit
 
 FTPS (*1)
- - explicit ftps:// support that use SSL on both connections
- - implicit "AUTH TSL" and "AUTH SSL" usage to "upgrade" plain ftp://
+ - implicit ftps:// support that use SSL on both connections
+ - explicit "AUTH TSL" and "AUTH SSL" usage to "upgrade" plain ftp://
    connection to use SSL for both or one of the connections
 
+TFTP
+ - download / upload
+
 TELNET
  - connection negotiation
  - custom telnet options
@@ -106,10 +109,6 @@ LDAP (*2)
 DICT
  - extended DICT URL support
 
-GOPHER
- - GET
- - via http-proxy
-
 FILE
  - URL support
  - "uploads"
@@ -118,9 +117,10 @@ FILE
 FOOTNOTES
 =========
 
-  *1 = requires OpenSSL
+  *1 = requires OpenSSL or GnuTLS
   *2 = requires OpenLDAP
   *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
   *4 = requires FBopenssl
   *5 = requires a krb4 library, such as the MIT one or similar.
   *6 = requires c-ares
+  *7 = requires OpenSSL specificly, as GnuTLS only supports SSLv3 and TLSv1

docs/HISTORY

@@ -114,6 +114,8 @@ distributions and otherwise retrieved as part of other software.
 September 2002, with the release of curl 7.10 it is released under the MIT
 license only.
 
+January 2003. Started working on the distributed curl tests. The autobuilds.
+
 February 2003, the curl site averages at 20000 visits weekly. At any given
 moment, there's an average of 3 people browsing the curl.haxx.se site.
 
@@ -139,3 +141,13 @@ August 2004:
  Number of public functions in libcurl:    36
  Amount of public web site mirrors:        12
  Number of known libcurl bindings:         26
+
+April 2005:
+
+GnuTLS can now optionally be used for the secure layer when curl is built.
+
+September 2005:
+
+TFTP support was added.
+
+More than 100,000 unique visitors of the curl web site. 25 mirrors.

docs/INSTALL

@@ -129,175 +129,165 @@ UNIX
      If you're a curl developer and use gcc, you might want to enable more
      debug options with the --enable-debug option.
 
+     curl can be built to use a whole range of libraries to provide various
+     useful services, and configure will try to auto-detect a decent
+     default. But if you want to alter it, you can select how to deal with
+     each individual library.
+
+     To build with GnuTLS support instead of OpenSSL for SSL/TLS, note that
+     you need to use both --without-ssl and --with-gnutls.
+
+     To build with yassl support instead of OpenSSL or GunTLS, you must build
+     yassl with its OpenSSL emulation enabled and point to that directory root
+     with configure --with-ssl.
+
 Win32
 =====
 
-   Without SSL:
+   MingW32
+   -------
 
-      MingW32 (GCC-2.95) style
-      ------------------------
-        Run the 'mingw32.bat' file to get the proper environment variables
-        set, then run 'make mingw32' in the root dir.
+   Run the 'mingw32.bat' file to get the proper environment variables set,
+   then run 'make mingw32' in the root dir. Use  'make mingw32-ssl' to build
+   curl SSL enabled.
 
-        If you have any problems linking libraries or finding header files, be
-        sure to verify that the provided "Makefile.m32" files use the proper
-        paths, and adjust as necessary.
+   If you have any problems linking libraries or finding header files, be sure
+   to verify that the provided "Makefile.m32" files use the proper paths, and
+   adjust as necessary.
 
-      Cygwin style
-      ------------
-        Almost identical to the unix installation. Run the configure script in
-        the curl root with 'sh configure'. Make sure you have the sh
-        executable in /bin/ or you'll see the configure fail towards the end.
+   Cygwin
+   ------
 
-        Run 'make'
+   Almost identical to the unix installation. Run the configure script in the
+   curl root with 'sh configure'. Make sure you have the sh executable in
+   /bin/ or you'll see the configure fail towards the end.
 
-      Microsoft command line style
-      ----------------------------
-        Run the 'vcvars32.bat' file to get the proper environment variables
-        set, then run 'nmake vc' in the root dir.
+   Run 'make'
 
-        The vcvars32.bat file is part of the Microsoft development
-        environment.
+   Dev-Cpp
+   -------
 
-      IDE-style
-      -------------------------
-        If you use VC++, Borland or similar compilers. Include all lib source
-        files in a static lib "project" (all .c and .h files that is).
-        (you should name it libcurl or similar)
+   See the separate INSTALL.devcpp file for details.
 
-        Make the sources in the src/ drawer be a "win32 console application"
-        project. Name it curl.
+   MSVC from command line
+   ----------------------
 
-        For VC++ 6, there's an included Makefile.vc6 that should be possible
-        to use out-of-the-box.
+   Run the 'vcvars32.bat' file to get a proper environment. The
+   vcvars32.bat file is part of the Microsoft development environment and
+   you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
+   provided that you installed Visual C/C++ 6 in the default directory.
+
+   Then run 'nmake vc' in curl's root directory.
+
+   If you want to compile with zlib support, you will need to build
+   zlib (http://www.gzip.org/zlib/) as well. Please read the zlib
+   documentation on how to compile zlib. Define the ZLIB_PATH environment
+   variable to the location of zlib.h and zlib.lib, for example:
+
+     set ZLIB_PATH=c:\zlib-1.2.1
+
+   Then run 'nmake vc-zlib' in curl's root directory.
+
+   If you want to compile with SSL support you need the OpenSSL package.
+   Please read the OpenSSL documentation on how to compile and install
+   the OpenSSL libraries.  The build process of OpenSSL generates the
+   libeay32.dll and ssleay32.dll files in the out32dll subdirectory in
+   the OpenSSL home directory.  OpenSSL static libraries (libeay32.lib,
+   ssleay32.lib, RSAglue.lib) are created in the out32 subdirectory.
+
+   Before running nmake define the OPENSSL_PATH environment variable with
+   the root/base directory of OpenSSL, for example:
+
+     set OPENSSL_PATH=c:\openssl-0.9.7d
+
+   Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
+   directory.  'nmake vc-ssl' will create a libcurl static and dynamic
+   libraries in the lib subdirectory, as well as a statically linked
+   version of curl.exe in the src subdirectory.  This statically linked
+   version is a standalone executable not requiring any DLL at
+   runtime. This make method requires that you have the static OpenSSL
+   libraries available in OpenSSL's out32 subdirectory.
+   'nmake vc-ssl-dll' creates the libcurl dynamic library and
+   links curl.exe against libcurl and OpenSSL dynamically.
+   This executable requires libcurl.dll and the OpenSSL DLLs
+   at runtime.
+   Run 'nmake vc-ssl-zlib' to build with both ssl and zlib support.
+
+   Borland C++ compiler
+   ---------------------
+
+   compile openssl
+
+   Make sure you include the paths to curl/include and openssl/inc32 in
+   your bcc32.cnf file
+
+   eg : -I"c:\Bcc55\include;c:\path_curl\include;c:\path_openssl\inc32"
+
+   Check to make sure that all of the sources listed in lib/Makefile.b32
+   are present in the /path_to_curl/lib directory. (Check the src
+   directory for missing ones.)
+
+   Make sure the environment variable "BCCDIR" is set to the install
+   location for the compiler eg : c:\Borland\BCC55
+
+   command line:
+   make -f /path_to_curl/lib/Makefile-ssl.b32
+
+   compile simplessl.c with appropriate links
+
+   c:\curl\docs\examples\> bcc32 -L c:\path_to_curl\lib\libcurl.lib
+                                 -L c:\borland\bcc55\lib\psdk\ws2_32.lib
+                                 -L c:\openssl\out32\libeay32.lib
+                                 -L c:\openssl\out32\ssleay32.lib
+                                 simplessl.c
 
 
-   With SSL:
+   MSVC IDE
+   --------
 
-      MingW32 (GCC-2.95) style
-      ------------------------
-        Run the 'mingw32.bat' file to get the proper environment variables
-        set, then run 'make mingw32-ssl' in the root dir.
+   If you use VC++, Borland or similar compilers. Include all lib source
+   files in a static lib "project" (all .c and .h files that is).
+   (you should name it libcurl or similar)
 
-        If you have any problems linking libraries or finding header files, be
-        sure to look at the provided "Makefile.m32" files for the proper
-        paths, and adjust as necessary.
+   Make the sources in the src/ drawer be a "win32 console application"
+   project. Name it curl.
 
-      Cygwin style
-      ------------
-        Haven't done, nor got any reports on how to do. It should although be
-        identical to the unix setup for the same purpose. See above.
-
-      Microsoft command line style
-      ----------------------------
-
-        Run the 'vcvars32.bat' file to get a proper environment. The
-        vcvars32.bat file is part of the Microsoft development environment and
-        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
-        provided that you installed Visual C/C++ 6 in the default directory.
-
-        Then run 'nmake vc' in curl's root directory.
-
-        If you want to compile with zlib support, you will need to build
-        zlib (http://www.gzip.org/zlib/) as well. Please read the zlib
-        documentation on how to compile zlib. Define the ZLIB_PATH environment
-        variable to the location of zlib.h and zlib.lib, for example:
-
-          set ZLIB_PATH=c:\zlib-1.2.1
-
-        Then run 'nmake vc-zlib' in curl's root directory.
-
-        If you want to compile with SSL support you need the OpenSSL package.
-        Please read the OpenSSL documentation on how to compile and install
-        the OpenSSL libraries.  The build process of OpenSSL generates the
-        libeay32.dll and ssleay32.dll files in the out32dll subdirectory in
-        the OpenSSL home directory.  OpenSSL static libraries (libeay32.lib,
-        ssleay32.lib, RSAglue.lib) are created in the out32 subdirectory.
-
-        Before running nmake define the OPENSSL_PATH environment variable with
-        the root/base directory of OpenSSL, for example:
-
-          set OPENSSL_PATH=c:\openssl-0.9.7d
-
-        Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
-        directory.  'nmake vc-ssl' will create a libcurl static and dynamic
-        libraries in the lib subdirectory, as well as a statically linked
-        version of curl.exe in the src subdirectory.  This statically linked
-        version is a standalone executable not requiring any DLL at
-        runtime. This make method requires that you have the static OpenSSL
-        libraries available in OpenSSL's out32 subdirectory.
-        'nmake vc-ssl-dll' creates the libcurl dynamic library and
-        links curl.exe against libcurl and OpenSSL dynamically.
-        This executable requires libcurl.dll and the OpenSSL DLLs
-        at runtime.
-        Run 'nmake vc-ssl-zlib' to build with both ssl and zlib support.
-
-      Microsoft / Borland style
-      -------------------------
-        If you have OpenSSL, and want curl to take advantage of it, edit your
-        project properties to use the SSL include path, link with the SSL libs
-        and define the USE_SSLEAY symbol.
-
-      Using Borland C++ compiler version 5.5.1 (available as free download
-      from Borland's site)
-      ---------------------------------------------------------------------
-
-        compile openssl
-
-        Make sure you include the paths to curl/include and openssl/inc32 in
-        your bcc32.cnf file
+   For VC++ 6, there's an included Makefile.vc6 that should be possible
+   to use out-of-the-box.
 
 
-        eg : -I"c:\Bcc55\include;c:\path_curl\include;c:\path_openssl\inc32"
+   Disabling Specific Protocols in Win32 builds
+   --------------------------------------------
 
-        Check to make sure that all of the sources listed in lib/Makefile.b32
-        are present in the /path_to_curl/lib directory. (Check the src
-        directory for missing ones.)
+   The configure utility, unfortunately, is not available for the Windows
+   environment, therefore, you cannot use the various disable-protocol
+   options of the configure utility on this platform.
 
-        Make sure the environment variable "BCCDIR" is set to the install
-        location for the compiler eg : c:\Borland\BCC55
+   However, you can use the following defines to disable specific
+   protocols:
 
-        command line:
-        make -f /path_to_curl/lib/Makefile-ssl.b32
+   HTTP_ONLY             disables all protocols except HTTP
+   CURL_DISABLE_FTP      disables FTP
+   CURL_DISABLE_LDAP     disables LDAP
+   CURL_DISABLE_TELNET   disables TELNET
+   CURL_DISABLE_DICT     disables DICT
+   CURL_DISABLE_FILE     disables FILE
 
-        compile simplessl.c with appropriate links
+   If you want to set any of these defines you have the following
+   possibilities:
 
-        c:\curl\docs\examples\> bcc32 -L c:\path_to_curl\lib\libcurl.lib
-                                      -L c:\borland\bcc55\lib\psdk\ws2_32.lib
-                                      -L c:\openssl\out32\libeay32.lib
-                                      -L c:\openssl\out32\ssleay32.lib
-                                      simplessl.c
-
-   Disabling Specific Protocols:
-
-      The configure utility, unfortunately, is not available for the Windows
-      environment, therefore, you cannot use the various disable-protocol
-      options of the configure utility on this platform.
-
-      However, you can use the following defines to disable specific
-      protocols:
-
-      HTTP_ONLY             disables all protocols except HTTP
-      CURL_DISABLE_FTP      disables FTP
-      CURL_DISABLE_LDAP     disables LDAP
-      CURL_DISABLE_TELNET   disables TELNET
-      CURL_DISABLE_DICT     disables DICT
-      CURL_DISABLE_FILE     disables FILE
-      CURL_DISABLE_GOPHER   disables GOPHER
-
-      If you want to set any of these defines you have the following
-      possibilities:
-
-      - Modify lib/setup.h
-      - Modify lib/Makefile.vc6
-      - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
-        in the curllib.dsw/curllib.dsp Visual C++ 6 IDE project.
+   - Modify lib/setup.h
+   - Modify lib/Makefile.vc6
+   - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
+     in the curllib.dsw/curllib.dsp Visual C++ 6 IDE project.
 
 
-   Important (with SSL or not):
-      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.
+   Important static libcurl usage note
+   -----------------------------------
+
+   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.
 
 
 IBM OS/2
@@ -462,21 +452,19 @@ NetWare
    - optional zlib sources (at the moment only dynamic linking with zlib.imp);
      sources with NetWare Makefile can be obtained from:
      http://www.gknw.com/mirror/zlib/
+   - optional OpenSSL sources (version 0.9.8 or later which builds with BSD);
 
-   Set a search path to your compiler, linker and tools; if you want to have
-   zlib support then set the environment var ZLIB_PATH pointing to your zlib
-   sources, on Linux make sure the var OSTYPE contains the string 'linux';
-   and finally type 'make netware' from the top source directory...
-   I found on some Linux systems (RH9) that OS detection didnlt work although
+   Set a search path to your compiler, linker and tools; on Linux make
+   sure that the var OSTYPE contains the string 'linux'; and then type
+   'make netware' from the top source directory; other tagets available
+   are 'netware-ssl', 'netware-ssl-zlib', 'netware-zlib' and 'netware-ares';
+   if you need other combinations you can control the build with the
+   environment variables WITH_SSL, WITH_ZLIB, WITH_ARES and ENABLE_IPV6.
+   I found on some Linux systems (RH9) that OS detection didnt work although
    a 'set | grep OSTYPE' shows the var present and set; I simply overwrote it
-   with 'OSTYPE=linux-rh9-gnu' and the detection in the Makefile worked...;
-   other options are currently not supported, although partly prepared.
-   The Ares lib builds arlready fine, and both test tools work fine at least
-   when build with CodeWarrior...; don't know yet why they fail when build with
-   gcc though; if you want to compile with Ares support then set an env var
-   WITH_ARES=1; I've not tested yet including libares into curl.
+   with 'OSTYPE=linux-rh9-gnu' and the detection in the Makefile worked...
    Any help in testing appreciated!
-   Builds automatically created 4 times a day from current CVS are here:
+   Builds automatically created 8 times a day from current CVS are here:
    http://www.gknw.com/mirror/curl/autobuilds/
    the status of these builds can be viewed at the autobuild table:
    http://curl.haxx.se/auto/
@@ -530,13 +518,17 @@ CROSS COMPILE
 
        ./configure --host=ARCH-OS
 
+REDUCING SIZE
+=============
+
    There are a number of configure options that can be used to reduce the
    size of libcurl for embedded applications where binary size is an
-   important factor.  First, be sure to set the CFLAGS environment variable
-   when configuring with any compiler optimization flags to reduce the
-   size of the binary.  For gcc, this would mean at minimum:
+   important factor.  First, be sure to set the CFLAGS variable when
+   configuring with any relevant compiler optimization flags to reduce the
+   size of the binary.  For gcc, this would mean at minimum the -Os option
+   and probably the -march=X option as well, e.g.:
 
-      env CFLAGS='-Os' ./configure ...
+      ./configure CFLAGS='-Os' ...
 
    Be sure to specify as many --disable- and --without- flags on the configure
    command-line as you can to disable all the libcurl features that you
@@ -550,10 +542,24 @@ CROSS COMPILE
      --disable-crypto-auth (disables HTTP cryptographic authentication)
      --disable-ipv6 (disables support for IPv6)
      --disable-verbose (eliminates debugging strings and error code strings)
+     --enable-hidden-symbols (eliminates unneeded symbols in library)
      --without-libidn (disables support for the libidn DNS library)
      --without-ssl (disables support for SSL/TLS)
      --without-zlib (disables support for on-the-fly decompression)
 
+   The GNU linker has a number of options to reduce the size of the libcurl
+   dynamic libraries on some platforms even further. Specify them by giving
+   the options -Wl,-Bsymbolic and -Wl,-s on the gcc command-line.  
+   Be sure also to strip debugging symbols from your binaries after
+   compiling using 'strip' (or the appropriate variant if cross-compiling).
+   If space is really tight, you may be able to remove some unneeded
+   sections of the library using the -R option to objcopy (e.g. the
+   .comment section).
+
+   Using these techniques it is possible to create an HTTP-only shared
+   libcurl library for i386 Linux platforms that is less than 90 KB in
+   size (as of version 7.15.4).
+
    You may find that statically linking libcurl to your application will
    result in a lower total size.
 
@@ -578,17 +584,17 @@ PORTS
         - MIPS IRIX 6.2, 6.5
         - MIPS Linux
         - Pocket PC/Win CE 3.0
-        - Power AIX 3.2.5, 4.2, 4.3.1, 4.3.2, 5.1
+        - Power AIX 3.2.5, 4.2, 4.3.1, 4.3.2, 5.1, 5.2
         - PowerPC Darwin 1.0
         - PowerPC Linux
         - PowerPC Mac OS 9
         - PowerPC Mac OS X
         - SINIX-Z v5
         - Sparc Linux
-        - Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7, 8
+        - Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7, 8, 9, 10
         - Sparc SunOS 4.1.X
         - StrongARM (and other ARM) RISC OS 3.1, 4.02
-        - StrongARM Linux 2.4
+        - StrongARM/ARM7/ARM9 Linux 2.4, 2.6
         - StrongARM NetBSD 1.4.1
         - Ultrix 4.3a
         - i386 BeOS
@@ -596,14 +602,14 @@ PORTS
         - i386 Esix 4.1
         - i386 FreeBSD
         - i386 HURD
-        - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4
+        - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4, 2.6
         - i386 NetBSD
         - i386 Novell NetWare
         - i386 OS/2
         - i386 OpenBSD
         - i386 SCO unix
         - i386 Solaris 2.7
-        - i386 Windows 95, 98, ME, NT, 2000
+        - i386 Windows 95, 98, ME, NT, 2000, XP, 2003
         - i386 QNX 6
         - i486 ncr-sysv4.3.03 (NCR MP-RAS)
         - ia64 Linux 2.3.99

docs/INSTALL.devcpp

@@ -0,0 +1,302 @@
+DevCpp-Mingw Install & Compilation                                   Sept 2005
+==================================
+
+Reference Emails available at curl@haxx.se: 
+
+  Libcurl Install and Use Issues
+  Awaiting an Answer for Win 32 Install 
+  res = curl_easy_perform(curl); Error
+  Makefile Issues
+  
+
+Having previously done a thorough review of what was available that met my
+requirements under GPL, I settled for Libcurl as the software of choice for
+many reasons not the least of which was the support.
+
+Background
+----------
+
+This quest started when I innocently tried to incorporate the libcurl library
+into my simple source code. I figured that a few easy steps would accomplish
+this without major headaches. I had no idea that I would be facing an almost
+insurmountable challenge.
+
+The main problem lies in two areas. First the bulk of support for libcurl
+exists for a Unix/linux command line environments. This is of little help when
+it comes to Windows O/S.
+
+Secondly the help that does exist for the Windows O/S focused around mingw
+thru a command line argument environment.
+
+You may ask "Why is this a problem?"
+
+I'm using a Windows O/S with DevCpp. For those of you who are unfamiliar with
+DevCpp, it is a window shell GUI that replaces the command line environment
+for gcc. A definite improvement that I am unwilling to give up. However using
+DevCpp presented its own set of issues. Inadvertently I also made some
+careless errors such as compiling the 7.14 version of Makefile with an older
+version of source code. Thanks to Dan Fandrich for picking this up.
+
+I did eventually with the help of Daniel, Phillipe and others manage to
+implement successfully (the only mingw available version)
+curl-7.13.0-win32-ssl-devel-mingw32 into the DevCpp environment. Only the
+dynamic libcurl.dll libcurldll.a libraries worked. The static library which I
+was interested in did not. Furthermore when I tried to implement one of the
+examples included with the curl package (get info.c) it caused the executable
+to crash. Tracing the bug I found it in the code and function res =
+curl_easy_perform(curl);.
+
+At this point I had to make a choice as to whether invest my limited
+time-energy resource to fixing the bug or to compile the new version
+available. After searching the archives I found a very similar or the same bug
+reported from version 7.12x on. Daniel did inform me that he thought that this
+bug had been fixed with the latest version. So I proceeded to compile the
+latest SSL version where I faced other challenges.
+
+In order to make this process unremarkable for others using the same
+environment I decided to document the process so that others will find it
+routine. It would be a shame if newbies could not implement this excellent
+package for their use.
+
+I would like to thank the many others in this forum and in the DevCpp forum
+for their help. Without your help I may either have given up or it would have
+taken me many times longer to achieve success.
+
+The Cookbook Approach
+---------------------
+
+This discussion will be confined to a SSL static library compilation and
+installation. Limited mention and comments will be inserted where appropriate
+to help with non-SSL, dynamic libraries and executables.
+
+
+   Using Makefile from DevCpp to compile Libcurl libraries
+
+Preamble
+--------
+
+Using the latest version release - curl-7.14.0.tar.gz. Curl source code is
+platform independent. This simply means that the source code can be compiled
+for any Operating System (Linux/Unix Windows etc. and variations of thereof).
+
+The first thing to note is that inside curl-7.14.0 you will find two folders
+lib and src. Both contain Makefile.m32 (required for win mingw library or exe
+compilation) files which are different. The main difference between these two
+folders and the makefiles is that the src folder contents are used to compile
+an executable file(curl.exe) while the lib folder contents are used to compile
+a static (libcurl.a) and dynamic (libcurl.dll & libcurldll.a) file that can be
+used to compile libcurl with your own source code so that one can use and
+access all libcurl functions.
+
+Before we start please make sure that DevCpp is installed properly. In
+particular make sure you have no spaces in the name of any of the directories
+and subdirectories where DevCpp is installed. Failure to comply with the
+install instructions may produce erratic behaviour in DevCpp. For further info
+check the following sites
+
+http://aditsu.freeunixhost.com/dev-cpp-faq.html
+http://sourceforge.net/forum/message.php?msg_id=3252213
+
+As I have mentioned before I will confine this to the SSL Library compilations
+but the process is very similar for compilation of the executable - curl.exe;
+just substitute the src folder makefile in its stead.
+
+First use a text processor Notepad, or your own favourite text processor. To
+engage your favourite text processor, select Makefile.m32 click once with your
+mouse on file icon; icon turns blue, press the shift key and right-click on
+mouse, menu appears select "Open with", select your favourite text processor.
+
+Next read the contents of Makefile.m32. It includes instructions on its use.
+
+Method I - DOS Command Line
+---------------------------
+ 
+Note - The only reason I have included this method is that Method II which is
+the preferred method for compiling does not allow for the setting of option
+switches (e.g. SSL = 1 or SSL =0). At least that's what they tell me at the
+Dev-Cpp forum.
+
+1 - Make a copy of (D:\Dev-Cpp\bin) bin folder and name it "bin Original"
+place it in the Dev-Cpp installed directory (D:\Dev-Cpp\ for this example)
+
+2 - Copy the entire contents of the LIB folder of curl-7.14.0.tar.gz or zip
+version into the bin folder above (D:\Dev-Cpp\bin). The reason being is that
+the make.exe file resides in this folder. Make.exe will use - Makefile.m32,
+Makefile.inc, and the source code included in the lib folder to compile the
+source code. There is a PATH issue with make.exe that remains unresolved at
+least for me. Unless the entire source code to be compiled is placed entirely
+within the directory of make.exe an error message will be generated - "file
+xxxx.yyy not available".
+
+3- Go to Dev-Cpp\bin and double click on make .exe. You will see a DOS window
+quickly pop up and close very quickly. Not to worry! Please do not skip this
+step.
+
+4- Click on the start button\Programs\MS-DOS Prompt.Once the DOS Window is up
+Type the disk drive letter (e.g. E: ) engage the enter button. The path should
+automatically take you to the directory of the make.exe file.
+
+5- To compile the source code simply type at the DOS prompt make -f
+Makefile.m32 as per instructions contained in the Makefile.m32 file (use any
+text processor to read instructions). I don't believe that this makefile
+allows for the option of non SSL. Ignore any warnings.
+
+6- Collect and make copies of libcurl.a, libcurl.dll, libcurldll.a and any *.o
+compilations you might need in another directory outside of the bin directory
+as you will need this files shortly to set up libcurl for use with
+Dev-cpp. For most apps *.o is not required. Later on we will show what to do
+with these files.
+
+7- You are finished but before closing we need to do cleanup - erase the bin
+folder and rename the "bin Original" folder created in step 1 to bin.
+
+Note to compile a curl executable the process is probably similar but instead
+of using the LIB folder contents use the SRC folder contents and Makefiles in
+curl-7.14.0.tar.gz. File directories relative placements must be respected for
+compiling to take place successfully. This may not be possible with the PATH
+problem that make.exe experiences. If anyone has solved this PATH issue and
+please make sure it actually works on Win 9x/2000/XP before letting me
+know. Then please let me or Daniel in on the solution so that it can be
+included with these instructions. Thanks.
+
+or
+
+Method II - Dev-Cpp GUI
+-----------------------
+
+1- Copy the entire contents of the LIB folder of curl-7.14.0.tar.gz or zip
+version into any folder outside of (Dev-Cpp\bin).
+
+2- Drop the File/New/click on Project.
+
+3- New Project Dialogue box appears. Double click on the Static Library.
+
+4- Create Project Dialogue box appears. Select the LIB folder location to
+place and locate your Project File Name. Placing the Project File Name
+elsewhere may cause problems (PATH issue problem again).
+
+5- Drop down the Project/Project Options. Project Options Dialogue box
+appears.
+
+6- Select the Makefile tab in the Project Options Dialogue Box. Check Box -
+Use Custom Makefile. Click on the Folder icon at the extreme right of the
+Check Box. Select Makefile.m32 in the folder wherever you have placed the
+contents of the LIB Folder. Press OK and close the Dialogue Box.
+
+7- Drop the Menu Project/Click on Add to Project. Open File Dialogue Box
+appears.  The Dialogue Box should open in the folder wherever you have placed
+the contents of the LIB Folder. If not go there.
+
+8- Select Crtl-A to select all files in the LIB folder. Click on open to add
+files and close box. Wait till all files are added. This may take 30 seconds
+or longer.
+
+9- Drop the Menu Execute/Click on Compile. 
+
+10- That's it.
+
+
+   The following steps must be completed if Curl is to work properly
+   =================================================================
+
+LIB folder inclusions (*.a placement)
+-------------------------------------
+
+1- Refer to Method I - DOS Command Line point # 6 Take libcurl.a, libcurldll.a
+and install it in the directory C( or whichever drive Dev is installed)
+:\Dev-Cpp\lib.
+
+
+Include Folder
+--------------
+
+1- Create a new folder by the name of curl (do not change the name curl to
+some other name as it will cause major issues) in the directory
+C:\Dev-Cpp\include.
+
+2- Copy the entire contents of the curl folder of curl-7.14.0.tar.gz or zip
+ version into the newly created curl directory - C:\Dev-Cpp\include\curl.
+
+Links To Include And Lib Folder
+-------------------------------
+
+1- Drop the Menu - Tools\Compiler Options\Directories\Libraries. Make sure
+that C( or whichever drive Dev is installed):\DEV-CPP\lib is included.
+
+2- Next select the Menu - Tools\Compiler Options\Directories\C Includes. Make
+sure that C:\DEV-CPP\include and C:\Dev-Cpp\include\curl are included.
+
+3- Next select the Menu - Tools\Compiler Options\Directories\C++
+Includes. Make sure that C:\DEV-CPP\include and C:\Dev-Cpp\include\curl are
+included.
+
+Linker Links
+------------
+
+1- Drop the Menu - Tools\Compiler Options\Directories\Compiler.
+
+2- Make sure that the box "Add these commands to the linker command line" is
+checked.
+
+3- Include in the white space immediately below the box referred in 2 -lcurl
+-lws2_32 -lwinmm.
+
+SSL Files
+---------
+
+1- Get the latest openSSL (as of time of this writing)
+openssl-0.9.7e-win32-bin.zip for the minimalist package of the openssl-0.9.7e
+binaries ported to MS Windows 95/98/NT/XP using the MingW32/GCC-3.1
+development environment. The file may be downloaded at
+http://curl.haxx.se/download/.
+
+2- Open the above zip file. You will find two files - SDL.dll,
+SDL_mixer.dll. Install them in the directory C:\WINDOWS\SYSTEM32 for Win 9x
+users and c:\winnt\system32 for NT-family users.
+
+Multithreading Files
+--------------------
+
+To be completed
+
+#define
+-------
+
+1- Make sure that your program includes the following - #define CURL_STATICLIB
+must be declared FIRST before any other define functions may be
+added. Otherwise you may experience link errors.
+
+2- Don't forget to include   #include "curl/curl.h".
+
+e.g.
+    #define CURL_STATICLIB 
+#include <windows.h>
+    #include "curl/curl.h"
+#include <fstream>
+#include <iostream>
+#include <vector>
+etc...
+
+
+Static or Dynamic Library
+-------------------------
+
+The above steps apply for the use by a static library. Should you choose to
+use a dynamic library you will be required to perform these additional steps.
+
+1- Refer to Method I - DOS Command Line point # 6. Install libcurl.dll in the
+directory C:\WINDOWS\SYSTEM32 for Win 9x users and c:\winnt\system32 for
+NT-family users.
+
+2- Refer to Linker Links point 3 - Replace -lcurl with -lcurldll.
+
+Voila you're done.
+
+The non-SSL static Library build may not be possible to use at least as of the
+time of this writing - v7.14. Check reference emails - Phillipe and I found it
+impossible to fully compile as certain files were missing for linking. No big
+loss as SSL is a major plus.
+
+Hope this Helps
+
+Tom

docs/KNOWN_BUGS

@@ -3,20 +3,74 @@ join in and help us correct one or more of these! Also be sure to check the
 changelog of the current development status, as one or more of these problems
 may have been fixed since this was written!
 
-20. valgrind errors occur too often when 'make test' is used. It is because
-  too many third-party libs and tools have problems. When curl is built
-  without --disable-shared, the testing is done with a front-end script which
-  makes the valgrind testing include (ba)sh as well and that often causes
-  valgrind errors. Either we improve the valgrind error scanner a lot to
-  better identify (lib)curl errors only, or we disable valgrind checking by
-  default.
+34. The SOCKS connection codes don't properly acknowledge (connect) timeouts.
+
+33. Doing multi-pass HTTP authentication on a non-default port does not work.
+  This happens because the multi-pass code abuses the redirect following code
+  for doing multiple requests, and when we following redirects to an absolute
+  URL we must use the newly specified port and not the one specified in the
+  original URL. A proper fix to this would need to separate the negotiation
+  "redirect" from an actual redirect.
+
+32. (At least on Windows) If libcurl is built with c-ares and there's no DNS
+  server configured in the system, the ares_init() call fails and thus
+  curl_easy_init() fails as well. This causes weird effects for people who use
+  numerical IP addresses only.
+
+31. "curl-config --libs" will include details set in LDFLAGS when configure is
+  run that might be needed only for building libcurl. Similarly, it might
+  include options that perhaps aren't suitable both for static and dynamic
+  linking. Further, curl-config --cflags suffers from the same effects with
+  CFLAGS/CPPFLAGS.
+
+30. You need to use -g to the command line tool in order to use RFC2732-style
+  IPv6 numerical addresses in URLs.
+
+29. IPv6 URLs with zone ID is not supported.
+  http://www.ietf.org/internet-drafts/draft-fenner-literal-zone-02.txt
+  specifies the use of a plus sign instead of a percent when specifying zone
+  IDs in URLs to get around the problem of percent signs being
+  special. According to the reporter, Firefox deals with the URL _with_ a
+  percent letter (which seems like a blatant URL spec violation).
+
+   See http://curl.haxx.se/bug/view.cgi?id=1371118
+
+26. NTLM authentication using SSPI (on Windows) when (lib)curl is running in
+  "system context" will make it use wrong(?) user name - at least when compared
+  to what winhttp does. See http://curl.haxx.se/bug/view.cgi?id=1281867
+
+25. When doing a CONNECT request with curl it doesn't properly handle if the
+  proxy closes the connection within the authentication "negotiation phase".
+  Like if you do HTTPS or similar over a proxy and you use perhaps
+  --proxy-anyauth. There's work in progress on this problem, and a recent
+  patch was posted here: http://curl.haxx.se/mail/lib-2005-08/0074.html
+
+23. We don't support SOCKS for IPv6. We don't support FTPS over a SOCKS proxy.
+  We don't have any test cases for SOCKS proxy. We probably have even more
+  bugs and lack of features when a SOCKS proxy is used. And there seem to be a
+  problem with SOCKS when doing FTP: See
+  http://curl.haxx.se/bug/view.cgi?id=1371540
+
+22. Sending files to a FTP server using curl on VMS, might lead to curl
+  complaining on "unaligned file size" on completion. The problem is related
+  to VMS file structures and the perceived file sizes stat() returns. A
+  possible fix would involve sending a "STRU VMS" command.
+  http://curl.haxx.se/bug/view.cgi?id=1156287
+  
+21. FTP ASCII transfers do not follow RFC959. They don't convert the data
+   accordingly (not for sending nor for receiving). RFC 959 section 3.1.1.1
+   clearly describes how this should be done:
+
+     The sender converts the data from an internal character representation to
+     the standard 8-bit NVT-ASCII representation (see the Telnet
+     specification).  The receiver will convert the data from the standard
+     form to his own internal form.
+
+   Since 7.15.4 at least line endings are converted.
 
 19. FTP 3rd party transfers with the multi interface doesn't work. Test:
   define CURL_MULTIEASY, rebuild curl, run test case 230 - 232.
 
-18. test case 57 has </test> that should be </client> but when corrected, the
-  test case fails!
-
 16. FTP URLs passed to curl may contain NUL (0x00) in the RFC 1738 <user>,
   <password>, and <fpath> components, encoded as "%00".  The problem is that
   curl_unescape does not detect this, but instead returns a shortened C
@@ -27,10 +81,6 @@ may have been fixed since this was written!
   would not meaningfully support NUL characters within RFC 959 <string>,
   anyway (e.g., UNIX pathnames may not contain NUL).
 
-15. Test case 241 fails on all systems that support IPv6 but that don't have
-  the host name 'ip6-localhost' in /etc/hosts (or similar) since the test case
-  uses that host name to test the IPv6 name to address resolver.
-
 14. Test case 165 might fail on system which has libidn present, but with an
   old iconv version (2.1.3 is a known bad version), since it doesn't recognize
   the charset when named ISO8859-1. Changing the name to ISO-8859-1 makes the
@@ -50,11 +100,8 @@ may have been fixed since this was written!
 10. To get HTTP Negotiate authentication to work fine, you need to provide a
   (fake) user name (this concerns both curl and the lib) because the code
   wrongly only considers authentication if there's a user name provided.
-  Bug report #1004841. How? http://curl.haxx.se/mail/lib-2004-08/0182.html
-
-9. --limit-rate using -d or -F does not work. This is because the limit logic
-  is provided by the curl app in its read/write callbacks, and when doing
-  -d/-F the callbacks aren't used! Bug report #921395.
+  http://curl.haxx.se/bug/view.cgi?id=1004841. How?
+  http://curl.haxx.se/mail/lib-2004-08/0182.html
 
 8. Doing resumed upload over HTTP does not work with '-C -', because curl
   doesn't do a HEAD first to get the initial size. This needs to be done
@@ -77,11 +124,6 @@ may have been fixed since this was written!
   libcurl thinks of it as the *compressed* length. Some explanations are here:
   http://curl.haxx.se/mail/lib-2003-06/0146.html
 
-4. IPv6 support on AIX 4.3.3 doesn't work due to a missing sockaddr_storage
-  struct. It has been reported to work on AIX 5.1 though.
-
-3. GOPHER transfers seem broken
-
 2. If a HTTP server responds to a HEAD request and includes a body (thus
   violating the RFC2616), curl won't wait to read the response but just stop
   reading and return back. If a second request (let's assume a GET) is then
@@ -91,7 +133,3 @@ may have been fixed since this was written!
   and havoc is what happens.
   More details on this is found in this libcurl mailing list thread:
   http://curl.haxx.se/mail/lib-2002-08/0000.html
-
-1. LDAP support requires that not only the OpenLDAP shared libraries be
-   present at run time, but the development libraries (liblber.so and
-   libldap.so) as well (not applicable to Windows).

docs/LICENSE-MIXING

@@ -12,12 +12,11 @@ I am not a lawyer and this is not legal advice!
 
 One common dilemma is that GPL[1]-licensed code is not allowed to be linked
 with code licensed under the Original BSD license (with the announcement
-clause, unless there's a specified exception in the GPL-licensed module). You
-may still build your own copies that use them all, but distributing them as
-binaries would be to violate the GPL license - unless you accompany your
-license with an exception[2]. This particular problem was addressed when the
-Modified BSD license was created, which does not have the annoncement clause
-that collides with GPL.
+clause). You may still build your own copies that use them all, but
+distributing them as binaries would be to violate the GPL license - unless you
+accompany your license with an exception[2]. This particular problem was
+addressed when the Modified BSD license was created, which does not have the
+annoncement clause that collides with GPL.
 
 libcurl http://curl.haxx.se/docs/copyright.html
 
@@ -28,59 +27,86 @@ libcurl http://curl.haxx.se/docs/copyright.html
 
 OpenSSL http://www.openssl.org/source/license.html
 
-        Uses an Original BSD-style license with an announement clause that
-        makes it "incompatible" with GPL. You are not allowed to ship binaries
-        that link with OpenSSL that includes GPL code (unless that specific
-        GPL code includes an exception for OpenSSL - a habit that is growing
-        more and more common).
+        (May be used for SSL/TLS support) Uses an Original BSD-style license
+        with an announement clause that makes it "incompatible" with GPL. You
+        are not allowed to ship binaries that link with OpenSSL that includes
+        GPL code (unless that specific GPL code includes an exception for
+        OpenSSL - a habit that is growing more and more common). If OpenSSL's
+        licensing is a problem for you, consider using GnuTLS or yassl
+        instead.
+
+GnuTLS  http://www.gnutls.org/
+
+        (May be used for SSL/TLS support) Uses the LGPL[3] license. If this is
+        a problem for you, consider using OpenSSL instead. Also note that
+        GnuTLS itself depends on and uses other libs (libgcrypt and
+        libgpg-error) and they too are LGPL- or GPL-licensed.
+
+yassl   http://www.yassl.com/
+
+        (May be used for SSL/TLS support) Uses the GPL[1] license. If this is
+        a problem for you, consider using OpenSSL or GnuTLS instead.
 
 c-ares  http://daniel.haxx.se/projects/c-ares/license.html
 
-        Uses an MIT license that is very liberal and imposes no restrictions
-        on any other library or part you may link with.
+        (Used for asynchronous name resolves) Uses an MIT license that is very
+        liberal and imposes no restrictions on any other library or part you
+        may link with.
 
 zlib    http://www.gzip.org/zlib/zlib_license.html
 
-        Uses an MIT-style license that shouldn't collide with any other
-        library.
+        (Used for compressed Transfer-Encoding support) Uses an MIT-style
+        license that shouldn't collide with any other library.
 
 krb4
 
         While nothing in particular says that a Kerberos4 library must use any
         particular license, the one I've tried and used successfully so far
-        (kth-krb4) is Original BSD-licensed with the announcement clause. Some
-        of the code in libcurl that is written to deal with Kerberos4 likewise
-        have such a license.
+        (kth-krb4) is partly Original BSD-licensed with the announcement
+        clause. Some of the code in libcurl that is written to deal with
+        Kerberos4 is Modified BSD-licensed.
 
-GSSAPI
+MIT Kerberos http://web.mit.edu/kerberos/www/dist/
 
-        While nothing in particular says that a GSS/Kerberos5 library must use
-        any particular license, the one I've used (Heimdal) is Original BSD-
-        licensed with the announcement clause.
+        (May be used for GSS support) MIT licensed, that shouldn't collide
+        with any other parts.
+
+Heimdal http://www.pdc.kth.se/heimdal/
+
+        (May be used for GSS support) Heimdal is Original BSD licensed with
+        the announcement clause.
+
+GNU GSS http://www.gnu.org/software/gss/
+
+        (May be used for GSS support) GNU GSS is GPL licensed. Note that you
+        may not distribute binary curl packages that uses this if you build
+        curl to also link and use any Original BSD licensed libraries!
 
 fbopenssl
 
-        Unclear license. Based on its name, I assume that it uses the OpenSSL
-        license and thus shares the same issues as described for OpenSSL
-        above.
+        (Used for SPNEGO support) Unclear license. Based on its name, I assume
+        that it uses the OpenSSL license and thus shares the same issues as
+        described for OpenSSL above.
 
 libidn  http://www.gnu.org/licenses/lgpl.html
 
-        Uses the GNU Lesser General Public License. LGPL is a variation of GPL
-        with slightly less aggressive "copyleft". This license requires more
-        requirements to be met when distributing binaries, see the license for
-        details. Also note that if you distribute a binary that includes this
-        library, you must also include the full LGPL license text. Please
-        properly point out what parts of the distributed package that the
-        license addresses.
+        (Used for IDNA support) Uses the GNU Lesser General Public
+        License. LGPL is a variation of GPL with slightly less aggressive
+        "copyleft". This license requires more requirements to be met when
+        distributing binaries, see the license for details. Also note that if
+        you distribute a binary that includes this library, you must also
+        include the full LGPL license text. Please properly point out what
+        parts of the distributed package that the license addresses.
 
 OpenLDAP http://www.openldap.org/software/release/license.html
 
-        Uses a Modified BSD-style license. Since libcurl uses OpenLDAP as a
-        shared library only, I have not heard of anyone that ships OpenLDAP
-        linked with libcurl in an app.
+        (Used for LDAP support) Uses a Modified BSD-style license. Since
+        libcurl uses OpenLDAP as a shared library only, I have not heard of
+        anyone that ships OpenLDAP linked with libcurl in an app.
 
 
 [1] = GPL - GNU General Public License: http://www.gnu.org/licenses/gpl.html
 [2] = http://www.fsf.org/licenses/gpl-faq.html#GPLIncompatibleLibs details on
       how to write such an exception to the GPL
+[3] = LGPL - GNU Lesser General Public License:
+      http://www.gnu.org/licenses/lgpl.html

docs/MANUAL

@@ -23,10 +23,6 @@ SIMPLE USAGE
 
         curl ftp://cool.haxx.se/
 
-  Get a gopher document from funet's gopher server:
-
-        curl gopher://gopher.funet.fi
-
   Get the definition of curl from a dictionary:
 
         curl dict://dict.org/m:curl
@@ -94,10 +90,6 @@ USING PASSWORDS
 
    Probably most commonly used with private certificates, as explained below.
 
- GOPHER
-
-   Curl features no password support for gopher.
-
 PROXY
 
  Get an ftp file using a proxy named my-proxy that uses port 888:
@@ -299,6 +291,13 @@ POST (HTTP)
 
         curl -F "docpicture=@dog.gif" -F "catpicture=@cat.gif" 
 
+  To send a field value literally without interpreting a leading '@'
+  or '<', or an embedded ';type=', use --form-string instead of
+  -F. This is recommended when the value is obtained from a user or
+  some other unpredictable source. Under these circumstances, using
+  -F instead of --form-string would allow a user to trick curl into
+  uploading a file.
+
 REFERRER
 
   A HTTP request has the option to include information about which address
@@ -727,7 +726,7 @@ LDAP
   Working with LDAP URLs":
   http://developer.netscape.com/docs/manuals/dirsdk/csdk30/url.htm
 
-  RFC 2255, "The LDAP URL Format" http://www.rfc-editor.org/rfc/rfc2255.txt
+  RFC 2255, "The LDAP URL Format" http://curl.haxx.se/rfc/rfc2255.txt
 
   To show you an example, this is now I can get all people from my local LDAP
   server that has a certain sub-domain in their email address:
@@ -741,7 +740,7 @@ ENVIRONMENT VARIABLES
 
   Curl reads and understands the following environment variables:
 
-        http_proxy, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY
+        http_proxy, HTTPS_PROXY, FTP_PROXY
 
   They should be set for protocol-specific proxies. General proxy should be
   set with

docs/Makefile.am

@@ -14,10 +14,10 @@ SUBDIRS = examples libcurl
 
 CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)
 
-EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS	\
- README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS	\
- KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) HISTORY INSTALL		\
- $(PDFPAGES) LICENSE-MIXING README.netware
+EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS	 \
+ README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS	 \
+ KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) HISTORY INSTALL		 \
+ $(PDFPAGES) LICENSE-MIXING README.netware DISTRO-DILEMMA INSTALL.devcpp
 
 MAN2HTML= roffit < $< >$@
 

docs/THANKS

@@ -1,110 +1,512 @@
- This project has been alive for several years. Countless people have provided
- feedback that have improved curl. Here follows a (incomplete) list of people
- that have contributed with non-trivial parts:
+ This project has been alive for many years. Countless people have provided
+ feedback that have improved curl. Here follows a list of people that have
+ contributed (a-z order).
 
-Daniel Stenberg <daniel@haxx.se>
-Rafael Sagula <sagula@inf.ufrgs.br>
-Sampo Kellomaki <sampo@iki.fi>
-Linas Vepstas <linas@linas.org>
-Bjorn Reese <breese@mail1.stofanet.dk>
-Johan Anderson <johan@homemail.com>
-Kjell Ericson <Kjell.Ericson@haxx.se>
-Troy Engel <tengel@sonic.net>
-Ryan Nelson <ryan@inch.com>
-Bj<EFBFBD>rn Stenberg <bjorn@haxx.se>
-Angus Mackay <amackay@gus.ml.org>
-Eric Young <eay@cryptsoft.com>
-Simon Dick <simond@totally.irrelevant.org>
-Oren Tirosh <oren@monty.hishome.net>
-Steven G. Johnson <stevenj@alum.mit.edu>
-Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
-Andr<EFBFBD>s Garc<72>a <ornalux@redestb.es>
-Douglas E. Wegscheid <wegscd@whirlpool.com>
-Mark Butler <butlerm@xmission.com>
-Eric Thelin <eric@generation-i.com>
-Marc Boucher <marc@mbsi.ca>
-Greg Onufer <Greg.Onufer@Eng.Sun.COM>
-Doug Kaufman <dkaufman@rahul.net>
-David Eriksson <david@2good.com>
-Ralph Beckmann <rabe@uni-paderborn.de>
-T. Yamada <tai@imasy.or.jp>
-Lars J. Aas <larsa@sim.no>
-J<EFBFBD>rn Hartroth <Joern.Hartroth@computer.org>
-Matthew Clarke <clamat@van.maves.ca>
-Linus Nielsen Feltzing <linus@haxx.se>
-Felix von Leitner <felix@convergence.de>
-Dan Zitter <dzitter@zitter.net>
-Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
-Chris Maltby <chris@aurema.com>
-Ron Zapp <rzapper@yahoo.com>
-Paul Marquis <pmarquis@iname.com>
-Ellis Pritchard <ellis@citria.com>
-Damien Adant <dams@usa.net>
-Chris <cbayliss@csc.come>
-Marco G. Salvagno <mgs@whiz.cjb.net>
-Paul Marquis <pmarquis@iname.com>
-David LeBlanc <dleblanc@qnx.com>
-Rich Gray at Plus Technologies
-Luong Dinh Dung <u8luong@lhsystems.hu>
-Torsten Foertsch <torsten.foertsch@gmx.net>
-Kristian K<>hntopp <kris@koehntopp.de>
-Fred Noz <FNoz@siac.com>
-Caolan McNamara <caolan@csn.ul.ie>
-Albert Chin-A-Young <china@thewrittenword.com>
-Stephen Kick <skick@epicrealm.com>
-Martin Hedenfalk <mhe@stacken.kth.se>
-Richard Prescott <rip at step.polymtl.ca>
-Jason S. Priebe <priebe@wral-tv.com>
-T. Bharath <TBharath@responsenetworks.com>
-Alexander Kourakos <awk@users.sourceforge.net>
-James Griffiths <griffiths_james@yahoo.com>
-Loic Dachary <loic@senga.org>
-Robert Weaver <robert.weaver@sabre.com>
-Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
-Jun-ichiro itojun Hagino <itojun@iijlab.net>
-Frederic Lepied <flepied@mandrakesoft.com>
-Georg Horn <horn@koblenz-net.de>
-Cris Bailiff <c.bailiff@awayweb.com>
-Sterling Hughes <sterling@designmultimedia.com>
-S. Moonesamy
-Ingo Wilken <iw@WWW.Ecce-Terram.DE>
-Pawel A. Gajda <mis@k2.net.pl>
-Patrick Bihan-Faou
-Nico Baggus <Nico.Baggus@mail.ing.nl>
-Sergio Ballestrero
-Andrew Francis <locust@familyhealth.com.au>
-Tomasz Lacki <Tomasz.Lacki@primark.pl>
-Georg Huettenegger <georg@ist.org>
-John Lask <johnlask@hotmail.com>
-Eric Lavigne <erlavigne@wanadoo.fr>
-Marcus Webster <marcus.webster@phocis.com>
-G<EFBFBD>tz Babin-Ebell <babin<69>ebell@trustcenter.de>
-Andreas Damm <andreas-sourceforge@radab.org>
-Jacky Lam <sylam@emsoftltd.com>
-James Gallagher <jgallagher@gso.uri.edu>
-Kjetil Jacobsen <kjetilja@cs.uit.no>
-Markus F.X.J. Oberhumer <markus@oberhumer.com>
-Miklos Nemeth <mnemeth@kfkisystems.com>
-Kevin Roth <kproth@users.sourceforge.net>
-Ralph Mitchell <rmitchell@eds.com>
-Dan Fandrich <dan@coneharvesters.com>
-Jean-Philippe Barrette-LaPierre <jpb@rrette.com>
-Richard Bramante <RBramante@on.com>
-Daniel Kouril <kouril@ics.muni.cz>
-Dirk Manske <dm@nettraffic.de>
-David Meyer <meyer@paracel.com>
-Dominick Meglio <codemstr@ptd.net>
-Gisle Vanem <gvanem@broadpark.no>
-Giuseppe Attardi <attardi@di.unipi.it>
-Tor Arntsen <tor@spacetec.no>
-David Byron <DByron@everdreamcorp.com>
-David Phillips
+ If you have contributed but are missing here, please let us know!
+
+Adrian Schuur
+Alan Pinstein
+Albert Chin-A-Young
+Albert Choy
+Ale Vesely
+Aleksandar Milivojevic
+Alex Neblett
+Alex Suykov
+Alex aka WindEagle
+Alexander Kourakos
 Alexander Krasnostavsky
-G<EFBFBD>nter Knauf
+Alexander Lazic
+Alexander Zhuravlev
+Alexis Carvalho
+Amol Pattekar
+Andi Jahja
+Andreas Damm
+Andreas Ntaflos
+Andreas Olsson
+Andreas Rieke
+Andres Garcia
+Andrew Benham
+Andrew Bushnell
+Andrew Francis
+Andrew Fuller
+Andr<EFBFBD>s Garc<72>a
+Andy Cedilnik
+Andy Serpa
+Angus Mackay
+Antoine Calando
+Anton Kalmykov
+Arkadiusz Miskiewicz
+Ates Goral
+Augustus Saunders
+Avery Fay
+Ben Greear
+Ben Madsen
+Benjamin Gerard
 Bertrand Demiddelaer
-Peter Sylvester
-Alexis S. L. Carvalho
+Bjorn Reese
+Bj<EFBFBD>rn Stenberg
+Bob Schader
+Brad Burdick
+Bradford Bruce
+Brent Beardsley
+Brian Akins
+Brian Dessent
+Brian R Duffy
+Bruce Mitchener
+Bryan Henderson
+Bryan Kemp
+Caolan McNamara
 Casey O'Donnell
-Marty Kuhrt
-James Bursa
+Chih-Chung Chang
+Chris "Bob Bob"
+Chris Combes
+Chris Gaukroger
+Chris Maltby
+Christian Kurz
+Christian Robottom Reis
+Christophe Demory
+Christophe Legry
+Christopher R. Palmer
+Clarence Gardner
+Clifford Wolf
+Cody Jones
+Colin Watson
+Colm Buckley
+Cory Nelson
+Craig Davison
+Craig Markwardt
+Cris Bailiff
+Cyrill Osterwalder
+Damien Adant
+Dan Becker
+Dan C
+Dan Fandrich
+Dan Torop
+Dan Zitter
+Daniel Stenberg
+Daniel at touchtunes
+Darryl House
+Dave Dribin
+Dave Halbakken
+Dave Hamilton
+Dave May
+David Byron
+David Cohen
+David Eriksson
+David Houlder
+David Hull
+David J Meyer
+David James
+David Kimdon
+David Lang
+David LeBlanc
+David McCreedy
+David Odin
+David Phillips
+David Shaw
+David Tarendash
+David Thiel
+David Yan
+Detlef Schmier
+Diego Casorran
+Dima Barsky
+Dimitris Sarris
+Dinar
+Dirk Eddelbuettel
+Dirk Manske
+Dmitry Bartsevich
+Dolbneff A.V
+Domenico Andreoli
+Dominick Meglio
+Doug Kaufman
+Doug Porter
+Douglas E. Wegscheid
+Douglas R. Horner
+Dov Murik
+Duane Cathey
+Dustin Boswell
+Dylan Ellicott
+Dylan Salisbury
+Early Ehlinger
+Edin Kadribasic
+Ellis Pritchard
+Emiliano Ida
+Enrico Scholz
+Enrik Berkhan
+Eric Cooper
+Eric Lavigne
+Eric Melville
+Eric Rautman
+Eric Thelin
+Eric Vergnaud
+Eric Young
+Erick Nuwendam
+Erwan Legrand
+Erwin Authried
+Eugene Kotlyarov
+Evan Jordan
+Fabrizio Ammollo
+Fedor Karpelevitch
+Felix von Leitner
+Florian Schoppmann
+Forrest Cahoon
+Frank Keeney
+Frank Ticheler
+Fred New
+Fred Noz
+Frederic Lepied
+Gautam Mani
+Gaz Iqbal
+Georg Horn
+Georg Huettenegger
+Georg Wicherski
+Gerd v. Egidy
+Gerhard Herre
+Giaslas Georgios
+Gilad
+Gilbert Ramirez Jr.
+Gisle Vanem
+Giuseppe Attardi
+Giuseppe D'Ambrosio
+Glen Nakamura
+Glen Scott
 Greg Hewgill
+Greg Onufer
+Grigory Entin
+Guenole Bescon
+Guillaume Arluison
+Gustaf Hui
+Gwenole Beauchesne
+G<EFBFBD>tz Babin-Ebell
+G<EFBFBD>nter Knauf
+Hamish Mackenzie
+Hanno Kranzhoff
+Hans Steegers
+Hardeep Singh
+Harshal Pradhan
+Heikki Korpela
+Henrik Storner
+Hzhijun
+Ian Ford
+Ian Gulliver
+Ian Wilkes
+Ignacio Vazquez-Abrams
+Igor Polyakov
+Ilguiz Latypov
+Ilja van Sprundel
+Ingo Ralf Blum
+Ingo Wilken
+Jacky Lam
+Jacob Meuser
+James Bursa
+James Clancy
+James Cone
+James Gallagher
+James Griffiths
+James MacMillan
+Jamie Lokier
+Jamie Newton
+Jamie Wilkinson
+Jan Kunder
+Jason S. Priebe
+Jaz Fresh
+Jean Jacques Drouin
+Jean-Claude Chauve
+Jean-Louis Lemaire
+Jean-Marc Ranger
+Jean-Philippe Barrette-LaPierre
+Jeff Lawson
+Jeff Phillips
+Jeff Pohlmeyer
+Jeffrey Pohlmeyer
+Jeremy Friesner
+Jesper Jensen
+Jesse Noller
+Jim Drash
+Joe Halpin
+Joel Chen
+Johan Anderson
+Johan Nilsson
+John Crow
+John Janssen
+John Kelly
+John Lask
+John McGowan
+Jon Grubbs
+Jon Travis
+Jon Turner
+Jonas Forsman
+Jonatan Lander
+Jonathan Hseu
+Jongki Suwandi
+Josh Kapell
+Juan F. Codagnone
+Juan Ignacio Herv<72>s
+Juergen Wilke
+Jukka Pihl
+Julian Noble
+Jun-ichiro itojun Hagino
+Jurij Smakov
+J<EFBFBD>rg Mueller-Tolk
+J<EFBFBD>rn Hartroth
+Kai Sommerfeld
+Kai-Uwe Rommel
+Kang-Jin Lee
+Karl Moerder
+Karol Pietrzak
+Katie Wang
+Keith MacDonald
+Keith McGuigan
+Ken Hirsch
+Ken Rastatter
+Kent Boortz
+Kevin Fisk
+Kevin Lussier
+Kevin Roth
+Kimmo Kinnunen
+Kjell Ericson
+Kjetil Jacobsen
+Klevtsov Vadim
+Kris Kennaway
+Krishnendu Majumdar
+Kristian K<>hntopp
+Kyle Sallee
+Lachlan O'Dea
+Larry Campbell
+Larry Fahnoe
+Lars Gustafsson
+Lars J. Aas
+Lars Nilsson
+Lars Torben Wilson
+Legoff Vincent
+Lehel Bernadt
+Len Krause
+Linas Vepstas
+Ling Thio
+Linus Nielsen Feltzing
+Loic Dachary
+Loren Kirkby
+Luca Altea
+Luca Alteas
+Lucas Adamski
+Lukasz Czekierda
+Luke Call
+Luong Dinh Dung
+Maciej W. Rozycki
+Marc Boucher
+Marcelo Juchem 
+Marcin Konicki
+Marco G. Salvagno
+Marcus Webster
+Mario Schroeder
+Mark Butler
+Mark Eichin
+Markus Koetter
+Markus Moeller
+Markus Oberhumer
+Martijn Koster
+Martin C. Martin
+Martin Hedenfalk
+Marty Kuhrt
+Maruko
+Massimiliano Ziccardi
+Mathias Axelsson
+Mats Lidell
+Matt Veenstra
+Matthew Blain
+Matthew Clarke
+Maurice Barnum
+Mekonikum
+Mettgut Jamalla
+Michael Benedict
+Michael Curtis
+Michael Jahn
+Michael Mealling
+Michael Wallner
+Michal Bonino
+Michal Marek
+Michele Bini
+Mihai Ionescu
+Mikael Sennerholm
+Mike Bytnar
+Mike Dobbs
+Miklos Nemeth
+Mitz Wark
+Mohamed Lrhazi
+Mohun Biswas
+Moonesamy
+Nathan O'Sullivan
+Naveen Noel
+Neil Dunbar
+Neil Spring
+Nic Roets
+Nick Gimbrone
+Nick Humfrey
+Nico Baggus
+Nicolas Berloquin
+Nicolas Croiset
+Nicolas Fran<61>ois
+Niels van Tongeren
+Nikita Schmidt
+Nis Jorgensen
+Nodak Sodak
+Norbert Novotny
+Ofer
+Olaf St<53>ben
+Oren Tirosh
+P R Schaffner
+Patrick Bihan-Faou
+Patrick Smith
+Paul Harrington
+Paul Marquis
+Paul Moore
+Paul Nolan
+Paul Querna
+Pavel Cenek
+Pavel Orehov
+Pawel A. Gajda
+Pedro Neves
+Pete Su
+Peter Bray
+Peter Forret
+Peter Heuchert
+Peter Pentchev
+Peter Su
+Peter Sylvester
+Peter Todd
+Peter Verhas
+Peter Wullinger
+Peteris Krumins
+Phil Karn
+Philip Gladstone
+Philippe Hameau
+Philippe Raoult
+Philippe Vaucher
+Pierre
+Puneet Pawaia
+Quagmire
+Rafael Sagula
+Ralph Beckmann
+Ralph Mitchell
+Ramana Mokkapati
+Randy McMurchy
+Reinout van Schouwen
+Renaud Chaillat
+Renaud Duhaut
+Rene Bernhardt
+Rene Rebe
+Ricardo Cadime
+Rich Gray
+Richard Archer
+Richard Atterer
+Richard Bramante
+Richard Clayton
+Richard Cooper
+Richard Gorton
+Richard Prescott
+Rick Jones
+Rick Richardson
+Rob Stanzel
+Robert D. Young
+Robert Olson
+Robert Weaver
+Robin Kay
+Robson Braga Araujo
+Rodney Simmons
+Roland Blom
+Roland Krikava
+Roland Zimmermann
+Roman Koifman
+Ron Zapp
+Rosimildo da Silva
+Roy Shan
+Rune Kleveland
+Ryan Nelson
+S. Moonesamy
+Salvador D<>vila
+Salvatore Sorrentino
+Sampo Kellomaki
+Samuel D<>az Garc<72>a
+Samuel Listopad
+Sander Gates
+Saul good
+Scott Davis
+Sebastien Willemijns
+Sergio Ballestrero
+Seshubabu Pasam
+Shard
+Shawn Poulson
+Shmulik Regev
+Siddhartha Prakash Jain
+Simon Dick
+Simon Josefsson
+Simon Liu
+Spiridonoff A.V
+Stadler Stephan
+Stefan Esser
+Stefan Ulrich
+Stephan Bergmann
+Stephen Kick
+Stephen More
+Sterling Hughes
+Steve Green
+Steve Lhomme
+Steve Marx
+Steve Oliphant
+Steven Bazyl
+Steven G. Johnson
+Stoned Elipot
+Sven Neuhaus
+S<EFBFBD>bastien Willemijns
+T. Bharath
+T. Yamada
+Temprimus
+Thomas Klausner
+Thomas Schwinge
+Thomas Tonino
+Tim Baker
+Tim Bartley
+Tim Costello
+Tim Sneddon
+Toby Peterson
+Todd Kulesza
+Todd Vierling
+Tom Benoist
+Tom Lee
+Tom Mattison
+Tom Moers
+Tom Zerucha
+Tomas Pospisek
+Tomas Szepe
+Tomasz Lacki
+Tommy Tam
+Ton Voon
+Tor Arntsen
+Torsten Foertsch
+Toshiyuki Maezawa
+Traian Nicolescu
+Troels Walsted Hansen
+Troy Engel
+Tupone Alfredo
+Ulf H<>rnhammar
+Ulrich Zadow
+Vilmos Nebehaj
+Vincent Bronner
+Vincent Penquerc'h
+Vincent Sanders
+Vojtech Janota
+Vojtech Minarik
+Walter J. Mack
+Wayne Haigh
+Werner Koch
+Wesley Laxton
+Wez Furlong
+Wilfredo Sanchez
+Wojciech Zwiefka
+Xavier Bouchoux
+Yang Tse
+Yarram Sunil
+Zvi Har'El 
+nk
+swalkaus at yahoo.com
+tommink[at]post.pl

docs/TODO

@@ -14,42 +14,52 @@ TODO
 
  LIBCURL
 
- * Introduce an interface to libcurl that allows applications to easier get to
-   know what cookies that are received. CURLINFO_COOKIELIST to get a
-   curl_slist with cookies (netscape/mozilla cookie file formatted), and
-   CURLOPT_COOKIELIST to set a list of cookies (using the same format).
-   http://curl.haxx.se/mail/lib-2004-12/0195.html
-
  * Introduce another callback interface for upload/download that makes one
    less copy of data and thus a faster operation.
    [http://curl.haxx.se/dev/no_copy_callbacks.txt]
 
  * More data sharing. curl_share_* functions already exist and work, and they
    can be extended to share more. For example, enable sharing of the ares
-   channel.
+   channel and the connection cache.
 
  * Introduce a new error code indicating authentication problems (for proxy
    CONNECT error 407 for example). This cannot be an error code, we must not
    return informational stuff as errors, consider a new info returned by
-   curl_easy_getinfo() #845941
+   curl_easy_getinfo() http://curl.haxx.se/bug/view.cgi?id=845941
 
  * Use 'struct lifreq' and SIOCGLIFADDR instead of 'struct ifreq' and
    SIOCGIFADDR on newer Solaris versions as they claim the latter is obsolete.
+   To support ipv6 interface addresses properly.
 
  * Add the following to curl_easy_getinfo(): GET_HTTP_IP, GET_FTP_IP and
    GET_FTP_DATA_IP. Return a string with the used IP. Suggested by Alan.
 
+ * Add option that changes the interval in which the progress callback is
+   called at most.
+
+ * Make libcurl built with c-ares use c-ares' IPv6 abilities. They weren't
+   present when we first added c-ares support but they have been added since!
+   When this is done and works, we can actually start considering making c-ares
+   powered libcurl the default build (which of course would require that we'd
+   bundle the c-ares source code in the libcurl source code releases).
+
+ * Support CONNECT 407 responses that kill the connection and expect the
+   client to reconnect to complete the authentication. Currently libcurl
+   assumes that a proxy connection will be kept alive.
+
+ * Make the curl/*.h headers include the proper system includes based on what
+   was present at the time when configure was run. Currently, the sys/select.h
+   header is for example included by curl/multi.h only on specific platforms
+   we know MUST have it. This is error-prone. We therefore want the header
+   files to adapt to configure results. Those results must be stored in a new
+   header and they must use a curl name space, i.e not be HAVE_* prefix (as
+   that would risk collide with other apps that use libcurl and that runs
+   configure).
+
  LIBCURL - multi interface
 
- * Add a curl_multi_fdset() alternative that returns only two arrays with file
-   desrciptors for reading and writing to allow the app to use whatever
-   function it prefers. Plus, this allows apps to avoid the FD_SETSIZE problem
-   with select().
-
- * Add curl_multi_timeout() to make libcurl's ares-functionality better.
-
  * Make sure we don't ever loop because of non-blocking sockets return
-   EWOULDBLOCK or similar. This FTP command sending, the SSL connection etc.
+   EWOULDBLOCK or similar. The GnuTLS connection etc.
 
  * Make transfers treated more carefully. We need a way to tell libcurl we
    have data to write, as the current system expects us to upload data each
@@ -59,6 +69,13 @@ TODO
    ready to accept read data. Today libcurl feeds the data as soon as it is
    available for reading, no matter what.
 
+ * Make curl_easy_perform() a wrapper-function that simply creates a multi
+   handle, adds the easy handle to it, runs curl_multi_perform() until the
+   transfer is done, then detach the easy handle, destroy the multi handle and
+   return the easy handle's return code. This will thus make everything
+   internally use and assume the multi interface. The select()-loop should use
+   curl_multi_socket().
+
  DOCUMENTATION
 
  * More and better
@@ -68,12 +85,9 @@ TODO
  * Make the detection of (bad) %0d and %0a codes in FTP url parts earlier in
    the process to avoid doing a resolve and connect in vain.
 
- * Code overhaul to make it more state-machine like and to _never_ block on
-   waiting for server responses when used with the multi interface.
-
  * Support GSS/Kerberos 5 for ftp file transfer. This will allow user
    authentication and file encryption.  Possible libraries and example clients
-   are available from MIT or Heimdal. Requsted by Markus Moeller.
+   are available from MIT or Heimdal. Requested by Markus Moeller.
 
  * REST fix for servers not behaving well on >2GB requests. This should fail
    if the server doesn't set the pointer to the requested index. The tricky
@@ -121,6 +135,10 @@ TODO
 
  SSL
 
+ * Provide a libcurl API for setting mutex callbacks in the underlying SSL
+   library, so that the same application code can use mutex-locking
+   independently of OpenSSL or GnutTLS being used.
+
  * Anton Fedorov's "dumpcert" patch:
    http://curl.haxx.se/mail/lib-2004-03/0088.html
 
@@ -146,14 +164,36 @@ TODO
    it be? There's so much that could be done if it were! (brought by Chris
    Clark)
 
- * Make curl's SSL layer option capable of using other free SSL libraries.
-   Such as the Mozilla Security Services
-   (http://www.mozilla.org/projects/security/pki/nss/) and GnuTLS
-   (http://www.gnu.org/software/gnutls/) This subject has been brought up
-   again recently since GPL-licensed applications that link with libcurl MAY
-   NOT distribute binaries that use OpenSSL without adding an exception clause
-   to the GPL license. See the LICENSE-MIXING document and this:
-   http://www.gnome.org/~markmc/openssl-and-the-gpl.html
+ * Make curl's SSL layer capable of using other free SSL libraries.  Such as
+   Mozilla Security Services
+   (http://www.mozilla.org/projects/security/pki/nss/), MatrixSSL
+   (http://www.matrixssl.org/) or yaSSL (http://yassl.com/). At least the
+   latter two could be alternatives for those looking to reduce the footprint
+   of libcurl built with OpenSSL or GnuTLS.
+
+ * Peter Sylvester's patch for SRP on the TLS layer.
+   Awaits OpenSSL support for this, no need to support this in libcurl before
+   there's an OpenSSL release that does it.
+
+ * make the configure --with-ssl option first check for OpenSSL and then for
+   GnuTLS if OpenSSL wasn't detected.
+
+ GnuTLS
+
+ * Get NTLM working using the functions provided by libgcrypt, since GnuTLS
+   already depends on that to function. Not strictly SSL/TLS related, but
+   hey... Another option is to get available DES and MD4 source code from the
+   cryptopp library. They are fine license-wise, but are C++.
+
+ * SSL engine stuff?
+
+ * Work out a common method with Peter Sylvester's OpenSSL-patch for SRP
+   on the TLS to provide name and password
+
+ * Fix the connection phase to be non-blocking when multi interface is used
+
+ * Add a way to check if the connection seems to be alive, to corrspond to the
+   SSL_peak() way we use with OpenSSL.
 
  LDAP
 
@@ -163,16 +203,11 @@ TODO
 
  NEW PROTOCOLS
 
- * TFTP - RFC1350 (protocol) and RFC3617 (URI format)
-
-   Dan Fandrich: I wrote a tftp protocol module as part of the I-Boot
-   bootloader under a BSD-style license with attribution clause
-   http://download.intrinsyc.com/supported/tools/i-boot-lite/i-boot-lite-1.8/src/libs/net/tftp.c
-
  * RTSP - RFC2326 (protocol - very HTTP-like, also contains URL description)
 
  * SFTP/SCP/SSH (no RFCs for protocol nor URI/URL format). An implementation
-   should most probably use an existing ssh library, such as OpenSSH.
+   should most probably use an existing ssh library, such as OpenSSH. or
+   libssh2.org
 
  * RSYNC (no RFCs for protocol nor URI/URL format).  An implementation should
    most probably use an existing rsync library, such as librsync.
@@ -190,7 +225,7 @@ TODO
  * Globbing support for -d and -F, as in 'curl -d "name=foo[0-9]" URL'.
    Requested by Dane Jensen and others. This is easily scripted though.
 
- * Add an option that prevents cURL from overwiting existing local files. When
+ * Add an option that prevents cURL from overwriting existing local files. When
    used, and there already is an existing file with the target file name
    (either -O or -o), a number should be appended (and increased if already
    existing). So that index.html becomes first index.html.1 and then