Version 7.14.0

return, not exit, on several places
Converted some macros to use NS_* so they work on non-IPv6 systems
2005-05-16 12:58:41 +00:00 · 2005-05-16 07:07:00 +00:00 · 2005-05-15 16:31:01 +00:00 · 2005-05-15 04:38:53 +00:00 · 2005-05-14 21:15:36 +00:00 · 2005-05-14 20:45:49 +00:00
575 changed files with 27625 additions and 10267 deletions
--- a/2198
+++ b/2198
--- a/CHANGES.2004
+++ b/CHANGES.2004
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE

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

 All rights reserved.

--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -24,7 +24,7 @@
 AUTOMAKE_OPTIONS = foreign

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

 bin_SCRIPTS = curl-config

@@ -48,6 +48,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 +66,8 @@ test-full:
 test-torture:
 	@(cd tests; $(MAKE) all torture-test)

+endif
+
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -53,17 +53,60 @@ borland-clean:
 	cd ..\src
 	make -f Makefile.b32 clean

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

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

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

 vc:
 	cd lib
@@ -93,17 +136,53 @@ vc-ssl-dll:
 	cd lib
 	nmake /f Makefile.vc6 cfg=release-ssl-dll
 	cd ..\src
-	nmake /f Makefile.vc6
+	nmake /f Makefile.vc6 cfg=release-ssl-dll

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

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

 cygwin:
 	./configure
--- a/13
+++ b/13
@@ -34,20 +34,27 @@ WEB SITE

        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        -- http://curl.signal42.com/
+        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
@@ -57,8 +64,12 @@ DOWNLOAD
        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

 CVS

--- a/110
+++ b/110
@@ -1,84 +1,58 @@
-Curl and libcurl 7.12.2
+Curl and libcurl 7.14.0

- Public curl release number:               83
- Releases counted from the very beginning: 110
- Available command line options:           96
- Available curl_easy_setopt() options:     121
- Number of public functions in libcurl:    36
- Amount of public web site mirrors:        13
- Number of known libcurl bindings:         27
+ Public curl release number:               88
+ Releases counted from the very beginning: 115
+ Available command line options:           107
+ Available curl_easy_setopt() options:     122
+ Number of public functions in libcurl:    46
+ Amount of public web site mirrors:        23
+ Number of known libcurl bindings:         31
+ Number of contributors:                   437

 This release includes the following changes:

- o the IDN code now verifies that only TLD-legitmate letters are used in the
-   name or a warning is displayed (when verbose is enabled)
- o provides error texts for IDN errors
- o file upload parts in formposts now get their directory names cut off
- o added CURLINFO_OS_ERRNO
- o added CURLOPT_FTPSSLAUTH to allow ftp connects to attempt "AUTH TLS" instead
-   before "AUTH SSL"
- o curl_getdate() completely rewritten: may affect rare curl -z use cases
+ o modified default HTTP request headers
+ o curl --trace-time added for time stamping trace logs
+ o curl now respects the SSL_CERT_DIR and SSL_CERT_PATH environment variables
+ o more search paths for curl's default .curlrc config file check
+ o GnuTLS support, use configure --with-gnutls. Work on this was sponsored
+   by The Written Word.

 This release includes the following bugfixes:

- o CURLOPT_FTP_CREATE_MISSING_DIRS works for third party transfers
- o memory leak for cookies received with max-age set
- o potential memory leaks in the window name resolver
- o URLs with ?-letters in the user name or password fields
- o libcurl error message is now provided when send() fails
- o no more SIGPIPE on Mac OS X and other SO_NOSIGPIPE-supporting platforms
- o HTTP resume was refused if redirected
- o configure's gethostbyname check when both nsl and socket libs are required
- o configure --with-libidn now checks the given path before defaults
- o a race condition sometimes resulting in CURLE_COULDNT_RESOLVE_HOST in the
-   windows threaded name resolver code
- o isspace() invokes with negative values in the cookie code
- o a case of read-already-freed-data when CURLOPT_VERBOSE is used and a (very)
-   persistent connection
- o now includes descriptive error messages for IDN errors
- o more forgivning PASS response code check for better working with proftpd
- o curl/multi.h works better included in winsock-using apps
- o curl_easy_reset() no longer enables the progress meter
- o build fix for SSL disabled curl with SSL Engine support present
- o configure --with-ssl=PATH now ignores pkg-config path info
- o CURLOPT_SSLENGINE can be set to NULL even if no engine support is available
- o LDAP crash when more than one record was received
- o connect failures properly stores an error message in the errorbuffer
- o Rare Location:-following problem with bad original URL
- o -F can now add Content-Type on non-file sections
- o double Host: header when following Location: with replaced Host:
- o curl_multi_add_handle() return code
- o "Proxy-Connection: close" is now understood and properly dealt with
- o curl_getdate() crash
- o downloading empty files now calls the write callback properly
- o no reverse DNS lookups for ip-only addresses with ipv6-enabled libcurl
- o file handler leak when getting an empty file:// URL
- o libcurl works better multi-threaded on AIX (when built with xlc)
- o cookies over proxy didn't match the path properly
- o MSVC makefile fixes to build better
- o FTP response 530 on 'PASS' now sends back a better error message
+ o uses select() instead of poll() even on Mac OS X 10.4
+ o reconnected proxy use with NTLM auth on the same handle
+ o warns about bad -z date syntax
+ o docs/THANKS now contains all known contributors
+ o builds out-of-the-box on (presumably ipv6-enabled) AIX 4.3 hosts
+ o curl --head could wrongly complain on bad chunked-encoding
+ o --interface SIGSEGVed on a bad address
+ o kill the HTTPS server better when stopping the test suite
+ o builds fine with VS2005 on x64
+ o auth fix for HTTP redirects and .netrc usage
+ o FTP uploads show the progress meter easier
+ o MSVC makefile fixes for static libcurl builds
+ o configure fix for static libcurl build on Windows
+ o --retry-delay
+ o POST with read callback now uses Expect: 100-continue
+ o CURLOPT_PORT didn't actually use the set port number
+ o HTTP 304 response with Content-Length: header
+ o time-conditioned FTP uploads

 Other curl-related news since the previous public release:

- o AdacURL version 7.12.1 http://www.almroth.com/adacurl/index.html
- o pycurl version 7.12.1 http://pycurl.sourceforge.net/
- o tclcurl version 0.12.1
-   http://personal1.iddeo.es/andresgarci/tclcurl/english/
- o libcurl.NET was announce: http://www.seasideresearch.com/downloads.html
- o Get your fresh Mozilla-extracted ca cert bundle here:
-   http://curl.haxx.se/docs/caextract.html
- o New web mirror in Taiwan: http://curl.cs.pu.edu.tw/
+ o http://curl.mirroring.de/ is a new german curl mirror
+ o pycurl 7.13.2: http://pycurl.sf.net/
+ o TclCurl 0.13.2: http://personal1.iddeo.es/andresgarci/tclcurl/english/
+ o http://curl.webhosting76.com/ is a new US curl mirror
+ o http://curl.meulie.net/ is a new Canadian curl mirror

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

- Casey O'Donnell, Roland Krikava, Alex, Alexander Krasnostavsky, Kjetil
- Jacobsen, Ling Thio, Roman Koifman, Harshal Pradhan, Jonas Forsman, David
- Tarendash, Daniel at touchtunes, Bertrand Demiddelaer, Andreas Rieke,
- Jean-Claude Chauve, Dan Fandrich, Peter Sylvester, "Mekonikum", Jean-Philippe
- Barrette-LaPierre, G<>nter Knauf, Larry Campbell, Fedor Karpelevitch,
- Aleksandar Milivojevic, Gisle Vanem, Chris "Bob Bob", Chih-Chung Chang, Andy
- Cedilnik, Alan Pinstein, Eric Vergnaud, Traian Nicolescu, runekl at
- opoint.com
+ Christophe Legry, Cory Nelson, Gisle Vanem, Dan Fandrich, Toshiyuki Maezawa,
+ Olivier, Andres Garcia, Dave Dribin, Alex Suykov, Cory Nelson, Fred New,
+ Paul Moore, Alexander Zhuravlev, Bryan Henderson, Jeremy Brown, Allan,
+ Grigory Entin

        Thanks! (and sorry if I forgot to mention someone)
--- a/35
+++ b/35
@@ -1,11 +1,40 @@
 Issues not sorted in any particular order.

-To get fixed in 7.12.2 (planned release: mid October 2004)
+To get fixed in 7.14.0 (planned release: May/June 2005)
 ======================

-To get fixed in 7.12.3 (planned release: December 2004)
+   - Make the tests run better on more platforms.
+
+To get fixed in 7.14.1 (planned release: June 2005)
 ======================

+58 - Fix KNOWN_BUGS #19: "FTP 3rd party transfers with the multi interface
+     doesn't work"
+
 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.

-48 - MSVC Makefile improvements by Samuel D<>az Garc<72>a
+To get fixed in 7.15.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).
+
+To get fixed in 7.16.0
+======================
+
+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.
+
+60 - 
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -87,9 +87,7 @@ AC_DEFINE(HAVE_IOCTLSOCKET_CASE, 1, [use Ioctlsocket() for non-blocking sockets]
 dnl Ioctlsocket didnt compile, do test 5!
  AC_TRY_COMPILE([
 /* headers for SO_NONBLOCK test (BeOS) */
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <socket.h>
 ],[
 /* SO_NONBLOCK source code */
 long b = 1;
@@ -124,6 +122,30 @@ dnl end of non-blocking try-compile test
  fi
 ])

+dnl Check for struct sockaddr_storage. Most IPv6-enabled hosts have it, but
+dnl AIX 4.3 is one known exception.
+AC_DEFUN([TYPE_SOCKADDR_STORAGE],
+[
+   AC_CHECK_TYPE([struct sockaddr_storage],
+        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
+                  [if struct sockaddr_storage is defined]), ,
+   [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+   ])
+
+])
+
 dnl Check for socklen_t: historically on BSD it is an int, and in
 dnl POSIX 1g it is a type of its own, but some platforms use different
 dnl types for the argument to getsockopt, getpeername, etc.  So we
@@ -236,7 +258,7 @@ exit (h == NULL ? 1 : 0); }],[
 ])

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

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

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

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

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

         if test "$gccnum" -ge "296"; then
@@ -763,3 +807,72 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],

 ]) dnl end of AC_DEFUN()

+
+dnl Determine the name of the library to pass to dlopen() based on the name
+dnl that would normally be given to AC_CHECK_LIB.  The preprocessor symbol
+dnl given is set to the quoted library file name. 
+dnl The standard dynamic library file name is first generated, based on the
+dnl current system type, then a search is performed for that file on the
+dnl standard dynamic library path.  If it is a symbolic link, the destination
+dnl of the link is used as the file name, after stripping off any minor
+dnl version numbers. If a library file can't be found, a guess is made.
+dnl This macro assumes AC_PROG_LIBTOOL has been called and requires perl
+dnl to be available in the PATH, or $PERL to be set to its location.
+dnl
+dnl CURL_DLLIB_NAME(VARIABLE, library_name)
+dnl e.g. CURL_DLLIB_NAME(LDAP_NAME, ldap) on a Linux system might result
+dnl in LDAP_NAME holding the string "libldap.so.2".
+
+AC_DEFUN([CURL_DLLIB_NAME],
+[
+AC_MSG_CHECKING([name of dynamic library $2])
+dnl The shared library extension variable name changes from version to
+dnl version of libtool.  Try a few names then just set one statically.
+test -z "$shared_ext" && shared_ext="$shrext_cmds"
+test -z "$shared_ext" && shared_ext="$shrext"
+test -z "$shared_ext" && shared_ext=".so"
+
+dnl Create the library link name of the correct form for this platform
+LIBNAME_LINK_SPEC=`echo "$library_names_spec" | $SED 's/^.* //'`
+DLGUESSLIB=`name=$2 eval echo "$libname_spec"`
+DLGUESSFILE=`libname="$DLGUESSLIB" release="" major="" versuffix="" eval echo "$LIBNAME_LINK_SPEC"`
+
+dnl Synthesize a likely dynamic library name in case we can't find an actual one
+SO_NAME_SPEC="$soname_spec"
+dnl soname_spec undefined when identical to the 1st entry in library_names_spec
+test -z "$SO_NAME_SPEC" && SO_NAME_SPEC=`echo "$library_names_spec" | $SED 's/ .*$//'`
+DLGUESSSOFILE=`libname="$DLGUESSLIB" release="" major="" versuffix="" eval echo "$SO_NAME_SPEC"`
+
+if test "$cross_compiling" = yes; then
+  dnl Can't look at filesystem when cross-compiling
+  AC_DEFINE_UNQUOTED($1, "$DLGUESSSOFILE", [$2 dynamic library file])
+  AC_MSG_RESULT([$DLGUESSSOFILE (guess while cross-compiling)])
+else
+
+  DLFOUNDFILE=""
+  if test "$sys_lib_dlsearch_path_spec" ; then
+    dnl Search for the link library name and see what it points to.
+    for direc in $sys_lib_dlsearch_path_spec ; do
+      DLTRYFILE="$direc/$DLGUESSFILE"
+      dnl Find where the symbolic link for this name points
+      changequote(<<, >>)dnl
+      <<
+      DLFOUNDFILE=`${PERL:-perl} -e 'use File::Basename; (basename(readlink($ARGV[0])) =~ /^(.*[^\d]\.\d+)[\d\.]*$/ && print ${1}) || exit 1;' "$DLTRYFILE" 2>&5`
+      >>
+      changequote([, ])dnl
+      if test "$?" -eq "0"; then
+        dnl Found the file link
+        break
+      fi
+    done
+  fi
+
+  if test -z "$DLFOUNDFILE" ; then
+    dnl Couldn't find a link library, so guess at a name.
+    DLFOUNDFILE="$DLGUESSSOFILE"
+  fi
+
+  AC_DEFINE_UNQUOTED($1, "$DLFOUNDFILE", [$2 dynamic library file])
+  AC_MSG_RESULT($DLFOUNDFILE)
+fi
+])
--- a/ares/.cvsignore
+++ b/ares/.cvsignore
@@ -20,3 +20,4 @@ stamp-h1
 depcomp
 libcares.la
 missing
+ares_version.h.dist
--- a/ares/AUTHORS
+++ b/ares/AUTHORS
@@ -0,0 +1,13 @@
+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
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,52 @@
  Changelog for the c-ares project

+* May 14
+
+- Added an inet_ntop function from BIND for systems that do not have it.
+
+* April 9
+
+- Made sortlist support IPv6 (this can probably use some testing).
+
+- Made sortlist support CIDR matching for IPv4.
+
+* April 8
+
+- Added preliminary IPv6 support to ares_gethostbyname. Currently, sortlist
+  does not work with IPv6. Also provided an implementation of bitncmp from
+  BIND for systems that do not supply this function. This will be used to add
+  IPv6 support to sortlist.
+
+- Made ares_gethostbyaddr support IPv6 by specifying AF_INET6 as the family.
+  The function can lookup IPv6 addresses both from files (/etc/hosts) and
+  DNS lookups.
+
+* April 7
+
+- Tupone Alfredo fixed includes of arpa/nameser_compat.h to build fine on Mac
+  OS X.
+
+* April 5
+
+- Dominick Meglio: Provided implementations of inet_net_pton and inet_pton
+  from BIND for systems that do not include these functions.
+
+* March 11, 2005
+
+- Dominick Meglio added ares_parse_aaaa_reply.c and did various
+  adjustments. The first little steps towards IPv6 support!
+
+* November 7
+
+- Fixed the VC project and makefile to use ares_cancel and ares_version
+
+* October 24
+
+- The released ares_version.h from 1.2.1 says 1.2.0 due to a maketgz flaw.
+  This is now fixed.
+
+Version 1.2.1 (October 20, 2004)
+
 * September 29

 - Henrik Stoerner fix: got a report that Tru64 Unix (the unix from Digital
--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -12,7 +12,7 @@ MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/adig/adig.mak	\
 # 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


 VER=-version-info 0:0:0
@@ -55,3 +55,12 @@ libcares_la_SOURCES = $(CSOURCES) $(HHEADERS)
 libcares_ladir = $(includedir)
 # what headers to install on 'make install':
 libcares_la_HEADERS = ares.h ares_version.h
+
+# Make files named *.dist replace the file without .dist extension
+dist-hook:
+	find $(distdir) -name "*.dist" -exec rm {} \;
+	(distit=`find $(srcdir) -name "*.dist"`; \
+	for file in $$distit; do \
+	  strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \
+	  cp $$file $(distdir)$$strip; \
+	done)
--- a/ares/Makefile.inc
+++ b/ares/Makefile.inc
@@ -1,15 +1,17 @@
-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
-
-HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h nameser.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
+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                 \
+ares_parse_aaaa_reply.c inet_net_pton.c bitncmp.c inet_ntop.c
+
+HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h nameser.h \
+           inet_net_pton.h ares_ipv6.h bitncmp.h
+
+MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3 \
+ ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3		    \
+ ares_gethostbyname.3 ares_init.3 ares_init_options.3 ares_mkquery.3	    \
+ ares_parse_a_reply.3 ares_parse_ptr_reply.3 ares_process.3		    \
+ ares_query.3 ares_search.3 ares_send.3 ares_strerror.3 ares_timeout.3	    \
+ ares_version.3 ares_cancel.3 ares_parse_aaaa_reply.3
--- a/ares/Makefile.netware
+++ b/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 - 2005, Daniel Stenberg, <daniel@haxx.se>
 DESCR	= cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
 MTSAFE	= YES
 STACK	= 64000
@@ -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

@@ -256,6 +259,7 @@ config.h: Makefile.netware
 	@echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
 	@echo $(DL)#define PACKAGE_BUGREPORT "curl-bug@haxx.se"$(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) >> $@
@@ -297,6 +301,11 @@ config.h: Makefile.netware
 	@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 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
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -99,3 +99,50 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],

 ]) dnl end of AC_DEFUN()

+
+dnl This macro determines if the specified struct exists in the specified file
+dnl Syntax:
+dnl CARES_CHECK_STRUCT(headers, struct name, if found, [if not found])
+
+AC_DEFUN([CARES_CHECK_STRUCT], [
+  AC_MSG_CHECKING([for struct $2])
+  AC_TRY_COMPILE([$1], 
+    [
+      struct $2 struct_instance;
+    ], ac_struct="yes", ac_found="no")
+  if test "$ac_struct" = "yes" ; then
+    AC_MSG_RESULT(yes)
+    $3
+  else
+    AC_MSG_RESULT(no)
+    $4
+  fi
+])
+
+dnl This macro determines if the specified constant exists in the specified file
+dnl Syntax:
+dnl CARES_CHECK_CONSTANT(headers, constant name, if found, [if not found])
+
+AC_DEFUN([CARES_CHECK_CONSTANT], [
+  AC_MSG_CHECKING([for $2])
+  AC_EGREP_CPP(VARIABLEWASDEFINED,
+   [
+      $1
+
+      #ifdef $2
+        VARIABLEWASDEFINED
+      #else
+        NJET
+      #endif
+    ], ac_constant="yes", ac_constant="no"
+  )
+  if test "$ac_constant" = "yes" ; then
+    AC_MSG_RESULT(yes)
+    $3
+  else
+    AC_MSG_RESULT(no)
+    $4
+  fi
+])
+
+
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -37,6 +37,10 @@
  #include <netinet/in.h>
 #endif

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

 /* Server error codes (ARES_ENODATA indicates no relevant answer) */
@@ -133,11 +137,16 @@ 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
+}
+#endif

 #endif /* ARES__H */
--- a/ares/ares__get_hostent.c
+++ b/ares/ares__get_hostent.c
@@ -30,12 +30,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 +59,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 +114,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 +148,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);
--- a/ares/ares_cancel.3
+++ b/ares/ares_cancel.3
@@ -33,5 +33,7 @@ might have been stored in their arguments.
 .SH SEE ALSO
 .BR ares_init (3)
 .BR ares_destroy (3)
+.SH NOTES
+This function is not compatible with ares.
 .SH AUTHOR
 Dirk Manske
--- a/ares/ares_destroy.3
+++ b/ares/ares_destroy.3
@@ -14,14 +14,14 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_DESTROY 3 "23 July 1998"
+.TH ARES_DESTROY 3 "7 December 2004"
 .SH NAME
 ares_destroy \- Destroy a resolver channel
 .SH SYNOPSIS
 .nf
 .B #include <ares.h>
 .PP
-.B int ares_destroy(ares_channel \fIchannel\fP)
+.B void ares_destroy(ares_channel \fIchannel\fP)
 .fi
 .SH DESCRIPTION
 The
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -21,6 +21,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>
--- a/ares/ares_fds.c
+++ b/ares/ares_fds.c
@@ -26,7 +26,8 @@
 int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
 {
  struct server_state *server;
-  int i, nfds;
+  ares_socket_t nfds;
+  int i;

  /* No queries, no file descriptors. */
  if (!channel->queries)
@@ -51,5 +52,5 @@ int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
            nfds = server->tcp_socket + 1;
        }
    }
-  return nfds;
+  return (int)nfds;
 }
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -12,7 +12,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 +22,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 +33,7 @@

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

 #ifdef WATT32
 #undef WIN32
@@ -39,7 +42,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 +55,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 +82,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 +97,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 +107,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 +157,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 +180,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 (IsNT) {
-        char tmp[MAX_PATH];
-        HKEY hkeyHosts;
+  if (IS_NT()) {
+    char tmp[MAX_PATH];
+    HKEY hkeyHosts;

-        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
-                == ERROR_SUCCESS)
-        {
-                DWORD dwLength = MAX_PATH;
-                RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, 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 +217,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);
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -23,8 +23,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 +38,8 @@

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

 #ifdef WATT32
 #undef WIN32
@@ -44,7 +51,7 @@ struct host_query {
  char *name;
  ares_host_callback callback;
  void *arg;
-
+  int family;
  const char *remaining_lookups;
 };

@@ -53,13 +60,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 +78,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 +96,7 @@ void ares_gethostbyname(ares_channel channel, const char *name, int family,
    }
  hquery->channel = channel;
  hquery->name = strdup(name);
+  hquery->family = family;
  if (!hquery->name)
    {
      free(hquery);
@@ -112,13 +124,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 +154,27 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)

  if (status == ARES_SUCCESS)
    {
-      status = ares_parse_a_reply(abuf, alen, &host);
-      if (host && channel->nsort)
-        sort_addresses(host, channel->sortlist, channel->nsort);
+      if (hquery->family == AF_INET)
+        {
+          status = ares_parse_a_reply(abuf, alen, &host);
+          if (host && channel->nsort)
+            sort_addresses(host, channel->sortlist, channel->nsort);
+        }
+      else if (hquery->family == AF_INET6)
+        {
+          status = ares_parse_aaaa_reply(abuf, alen, &host);
+          if (host && channel->nsort)
+            sort6_addresses(host, channel->sortlist, channel->nsort);
+        }
      end_hquery(hquery, status, host);
    }
+  else if (status == ARES_ENODATA && hquery->family == AF_INET6)
+    {
+      /* There was no AAAA now lookup an A */
+      hquery->family = AF_INET;
+      ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
+                  hquery);
+    }      
  else if (status == ARES_EDESTRUCTION)
    end_hquery(hquery, status, NULL);
  else
@@ -162,36 +194,34 @@ static void end_hquery(struct host_query *hquery, int status,
 /* If the name looks like an IP address, fake up a host entry, end the
 * query immediately, and return true.  Otherwise return false.
 */
-static int fake_hostent(const char *name, ares_host_callback callback,
+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 +231,9 @@ static int fake_hostent(const char *name, ares_host_callback callback,
    }

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

@@ -213,7 +241,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;
@@ -221,19 +249,19 @@ static int file_lookup(const char *name, struct hostent **host)

 #ifdef WIN32
  char PATH_HOSTS[MAX_PATH];
-  if (IsNT) {
-        char tmp[MAX_PATH];
-        HKEY hkeyHosts;
+  if (IS_NT()) {
+    char tmp[MAX_PATH];
+    HKEY hkeyHosts;

-        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
-                == ERROR_SUCCESS)
-        {
-                DWORD dwLength = MAX_PATH;
-                RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, 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 +280,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 +338,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;
+}
+
--- a/ares/ares_init.3
+++ b/ares/ares_init.3
@@ -14,7 +14,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_INIT 3 "21 July 1998"
+.TH ARES_INIT 3 "7 December 2004"
 .SH NAME
 ares_init, ares_init_options \- Initialize a resolver channel
 .SH SYNOPSIS
@@ -25,31 +25,20 @@ ares_init, ares_init_options \- Initialize a resolver channel
 .B int ares_init_options(ares_channel *\fIchannel\fP,
 .B 	struct ares_options *\fIoptions\fP, int \fIoptmask\fP)
 .PP
-.B cc file.c -lares
+.B cc file.c -lcares
 .fi
 .SH DESCRIPTION
-The
-.B ares_init
-function initializes a communications channel for name service
-lookups.  If it returns successfully,
-.B ares_init
-will set the variable pointed to by
-.I channel
-to a handle used to identify the name service channel.  The caller
-should invoke
+The \fBares_init\fP function initializes a communications channel for name
+service lookups.  If it returns successfully, \fBares_init\fP will set the
+variable pointed to by \fIchannel\fP to a handle used to identify the name
+service channel.  The caller should invoke
 .BR ares_destroy (3)
 on the handle when the channel is no longer needed.
 .PP
-The
-.B ares_init_options
-function also initializes a name service channel, with additional
-options useful for applications requiring more control over name
-service configuration.  The
-.I optmask
-parameter specifies which fields in the structure pointed to by
-.I options
-are set, as follows:
-.PP
+The \fBares_init_options\fP function also initializes a name service channel,
+with additional options useful for applications requiring more control over
+name service configuration. The \fIoptmask\fP parameter specifies which fields
+in the structure pointed to by \fIoptions\fP are set, as follows:
 .TP 18
 .B ARES_OPT_FLAGS
 .B int \fIflags\fP;
@@ -127,9 +116,11 @@ If a truncated response to a UDP query is received, do not fall back
 to TCP; simply continue on with the truncated response.
 .TP 23
 .B ARES_FLAG_NORECURSE
-Do not set the "recursion desired" bit on outgoing queries, so that
-the name server being contacted will not try to fetch the answer from
-other servers if it doesn't know the answer locally.
+Do not set the "recursion desired" bit on outgoing queries, so that the name
+server being contacted will not try to fetch the answer from other servers if
+it doesn't know the answer locally. Be aware that ares will not do the
+recursion for you.  Recursion must be handled by the application calling ares
+if \fIARES_FLAG_NORECURSE\fP is set.
 .TP 23
 .B ARES_FLAG_STAYOPEN
 Do not close communciations sockets when the number of active queries
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -27,10 +27,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 +51,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 +62,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)
 {
@@ -264,7 +276,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;
@@ -305,7 +318,8 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
 {
  FIXED_INFO    *fi   = alloca (sizeof(*fi));
  DWORD          size = sizeof (*fi);
-  DWORD (WINAPI *GetNetworkParams) (FIXED_INFO*, DWORD*);  /* available only on Win-98/2000+ */
+  typedef DWORD (WINAPI* get_net_param_func) (FIXED_INFO*, DWORD*);
+  get_net_param_func GetNetworkParams;  /* available only on Win-98/2000+ */
  HMODULE        handle;
  IP_ADDR_STRING *ipAddr;
  int            i, count = 0;
@@ -321,7 +335,7 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
  if (!handle)
     return (0);

-  (void*)GetNetworkParams = GetProcAddress (handle, "GetNetworkParams");
+  GetNetworkParams = (get_net_param_func) GetProcAddress (handle, "GetNetworkParams");
  if (!GetNetworkParams)
     goto quit;

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

@@ -421,7 +435,7 @@ DhcpNameServer
      goto okay;
  }

-  if (IsNT)
+  if (IS_NT())
  {
    if (RegOpenKeyEx(
          HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
@@ -708,6 +722,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;
@@ -748,6 +763,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)
 {
@@ -809,39 +826,73 @@ 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
        {
@@ -855,6 +906,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,

  return ARES_SUCCESS;
 }
+#endif

 static int set_search(ares_channel channel, const char *str)
 {
@@ -936,6 +988,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;
@@ -949,21 +1002,33 @@ 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)
@@ -978,15 +1043,16 @@ static void natural_mask(struct apattern *pat)
  /* Store a host-byte-order copy of pat in a struct in_addr.  Icky,
   * but portable.
   */
-  addr.s_addr = ntohl(pat->addr.s_addr);
+  addr.s_addr = ntohl(pat->addr.addr4.s_addr);

  /* This is out of date in the CIDR world, but some people might
   * still rely on it.
   */
  if (IN_CLASSA(addr.s_addr))
-    pat->mask.s_addr = htonl(IN_CLASSA_NET);
+    pat->mask.addr.addr4.s_addr = htonl(IN_CLASSA_NET);
  else if (IN_CLASSB(addr.s_addr))
-    pat->mask.s_addr = htonl(IN_CLASSB_NET);
+    pat->mask.addr.addr4.s_addr = htonl(IN_CLASSB_NET);
  else
-    pat->mask.s_addr = htonl(IN_CLASSC_NET);
+    pat->mask.addr.addr4.s_addr = htonl(IN_CLASSC_NET);
 }
+#endif
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -0,0 +1,48 @@
+/* $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 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
+
+#endif /* ARES_IPV6_H */
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -21,6 +21,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>
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -24,6 +24,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif

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

 #if defined(WIN32) && !defined(WATT32)

-#define IsNT ((int)GetVersion()>0)
+#define IS_NT()        ((int)GetVersion() > 0)
 #define WIN_NS_9X      "System\\CurrentControlSet\\Services\\VxD\\MSTCP"
 #define WIN_NS_NT_KEY  "System\\CurrentControlSet\\Services\\Tcpip\\Parameters"
 #define NAMESERVER     "NameServer"
@@ -69,6 +69,8 @@

 #endif

+#include "ares_ipv6.h"
+
 struct send_request {
  /* Remaining data to send */
  const unsigned char *data;
@@ -124,9 +126,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 {
@@ -156,7 +172,7 @@ struct ares_channeldata {

 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);
+int ares__get_hostent(FILE *fp, int family, struct hostent **host);
 int ares__read_line(FILE *fp, char **buf, int *bufsize);

 #ifdef CURLDEBUG
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -27,6 +27,9 @@
 #include <netinet/in.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
@@ -465,8 +468,12 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)

 static int open_tcp_socket(ares_channel channel, struct server_state *server)
 {
-  ares_socket_t s;
+#if defined(WIN32)
+  u_long flags;
+#else
  int flags;
+#endif
+  ares_socket_t s;
  struct sockaddr_in sockin;

  /* Acquire a socket. */
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -21,6 +21,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>
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -21,6 +21,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>
--- a/ares/ares_strerror.3
+++ b/ares/ares_strerror.3
@@ -30,7 +30,8 @@ function gets the description of the ares library error code
 .IR code ,
 returning the result as a NUL-terminated C string.
 .SH NOTES
-This function is not compatible with ares.
+This function is not compatible with ares, it takes a different set of
+arguments.
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_version.h
+++ b/ares/ares_version.h
@@ -4,12 +4,12 @@
 #define ARES__VERSION_H

 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 2
+#define ARES_VERSION_MINOR 3
 #define ARES_VERSION_PATCH 0
 #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.0"

 const char *ares_version(int *version);

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

-libtoolize --copy --automake --force
-aclocal
-autoheader
-autoconf
-automake --add-missing
+${LIBTOOLIZE:-libtoolize} --copy --automake --force
+${ACLOCAL:-aclocal}
+${AUTOHEADER:-autoheader}
+${AUTOCONF:-autoconf}
+${AUTOMAKE:-automake} --add-missing
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -41,7 +41,11 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
    dnl Checks for standard header files, to make memdebug.h inclusions bettter
    AC_HEADER_STDC

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

    dnl set compiler "debug" options to become more picky, and remove
@@ -61,6 +65,210 @@ AC_CHECK_HEADERS(
       sys/time.h \
       sys/select.h \
       sys/socket.h \
-       )
+       winsock.h \
+       netinet/in.h \
+       arpa/nameser.h \
+       arpa/nameser_compat.h \
+       arpa/inet.h, , ,
+[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.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 check for AF_INET6
+CARES_CHECK_CONSTANT(
+  [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#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(
+  [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#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(
+  [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+  ], [in6_addr], 
+     AC_DEFINE_UNQUOTED(HAVE_STRUCT_IN6_ADDR,1,[Define to 1 if you have struct in6_addr.])
+)
+
+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_WINSOCK_H
+#include <winsock.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_WINSOCK_H
+#include <winsock.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_WINSOCK_H
+#include <winsock.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, ,
+[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+]
+)
+AC_CHECK_SIZEOF(struct in_addr, ,
+[
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+]
+)
+
+AC_CHECK_FUNCS(bitncmp)
+

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

+my ($major, $minor, $patch)=split(/\./, $version);
+
+$major += 0;
+$minor += 0;
+$patch += 0;
+
+open(VER, "<ares_version.h") ||
+    die "can't open ares_version.h";
+open(NEWV, ">ares_version.h.dist");
+while(<VER>) {
+    $_ =~ s/^\#define ARES_VERSION_MAJOR .*/\#define ARES_VERSION_MAJOR $major/;
+    $_ =~ s/^\#define ARES_VERSION_MINOR .*/\#define ARES_VERSION_MINOR $minor/;
+    $_ =~ s/^\#define ARES_VERSION_PATCH .*/\#define ARES_VERSION_PATCH $patch/;
+    $_ =~ s/^\#define ARES_VERSION_STR .*/\#define ARES_VERSION_STR \"$version\"/;
+
+    print NEWV $_;
+}
+close(VER);
+close(NEWV);
+print "ares_version.h.dist created\n";
+
 if(!-f "configure") {
    print "running buildconf\n";
    `./buildconf`;
--- a/ares/nameser.h
+++ b/ares/nameser.h
@@ -16,6 +16,8 @@

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

 /* Structure for scatter/gather I/O.  */
 struct iovec
@@ -36,8 +38,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 +138,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 */
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -1,7 +1,7 @@
 #ifndef ARES_SETUP_H
 #define ARES_SETUP_H

-/* Copyright (C) 2004 by Daniel Stenberg et al
+/* 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
@@ -45,11 +45,11 @@ typedef int ares_socket_t;
 /* 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)
@@ -69,4 +69,13 @@ int ares_strcasecmp(const char *s1, const char *s2);
 #define strcasecmp(a,b) ares_strcasecmp(a,b)
 #endif

+/* IPv6 compatibility */
+#if !defined(HAVE_AF_INET6)
+#if defined(HAVE_PF_INET6)
+#define AF_INET6 PF_INET6
+#else
+#define AF_INET6 AF_MAX+1
+#endif
+#endif
+
 #endif /* ARES_SETUP_H */
--- a/ares/vc/adig/adig.mak
+++ b/ares/vc/adig/adig.mak
@@ -185,24 +185,24 @@ SOURCE=..\..\getopt.c
 !IF  "$(CFG)" == "adig - Win32 Release"

 "areslib - Win32 Release" : 
-   cd "\ARES-1.1.1\vc\areslib"
+   cd "..\areslib"
   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
   cd "..\adig"

 "areslib - Win32 ReleaseCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
+   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 "\ARES-1.1.1\vc\areslib"
+   cd "..\areslib"
   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
   cd "..\adig"

 "areslib - Win32 DebugCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
+   cd "..\areslib"
   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
   cd "..\adig"

--- a/ares/vc/ahost/ahost.mak
+++ b/ares/vc/ahost/ahost.mak
@@ -195,24 +195,24 @@ SOURCE=..\..\ahost.c
 !IF  "$(CFG)" == "ahost - Win32 Release"

 "areslib - Win32 Release" : 
-   cd "\ARES-1.1.1\vc\areslib"
+   cd "..\areslib"
   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Release" 
   cd "..\ahost"

 "areslib - Win32 ReleaseCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
+   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 "\ARES-1.1.1\vc\areslib"
+   cd "..\areslib"
   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" 
   cd "..\ahost"

 "areslib - Win32 DebugCLEAN" : 
-   cd "\ARES-1.1.1\vc\areslib"
+   cd "..\areslib"
   $(MAKE) /$(MAKEFLAGS) /F ".\areslib.mak" CFG="areslib - Win32 Debug" RECURSE=1 CLEAN 
   cd "..\ahost"

--- a/ares/vc/areslib/areslib.dsp
+++ b/ares/vc/areslib/areslib.dsp
@@ -153,6 +153,14 @@ 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
@@ -181,6 +189,10 @@ SOURCE=..\..\ares_dns.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\ares_private.h
 # End Source File
 # Begin Source File
--- a/ares/vc/areslib/areslib.mak
+++ b/ares/vc/areslib/areslib.mak
@@ -92,6 +92,8 @@ LIB32_OBJS= \
 	"$(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" \
@@ -131,6 +133,8 @@ CLEAN :
 	-@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"
@@ -322,6 +326,18 @@ SOURCE=..\..\ares_search.c
 	$(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)"
--- a/ares/windows_port.c
+++ b/ares/windows_port.c
@@ -39,28 +39,34 @@ ares_strcasecmp(const char *a, const char *b)
 }
 #endif

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

    if (tv)
    {
        GetSystemTimeAsFileTime(&ft);
        li.LowPart  = ft.dwLowDateTime;
        li.HighPart = ft.dwHighDateTime;
-        t  = li.QuadPart;       /* In 100-nanosecond intervals */
-#if 0
-        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
-#endif
-        t /= 10;                /* In microseconds */
+        t  = li.QuadPart / 10;   /* In micro-second intervals */
+        t -= EPOCH_FILETIME;     /* Offset to the Epoch time */
        tv->tv_sec  = (long)(t / 1000000);
        tv->tv_usec = (long)(t % 1000000);
    }
-
+    (void) tz;
    return 0;
 }

--- a/30
+++ b/30
@@ -85,6 +85,14 @@ fi

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

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

 #--------------------------------------------------------------------------
 # libtool check
@@ -142,6 +150,13 @@ 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
 #
@@ -155,6 +170,10 @@ else
  exit 1
 fi

+#--------------------------------------------------------------------------
+# perl check
+#
+PERL=`findtool perl`

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

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

--- a/configure.ac
+++ b/configure.ac
--- a/curl-config.in
+++ b/curl-config.in
@@ -19,7 +19,8 @@ Available values for OPTION include:
  --ca        ca bundle install path
  --cc        compiler
  --cflags    pre-processor and compiler flags
-  --feature   newline separated list of enabled features
+  --features  newline separated list of enabled features
+  --protocols newline separated list of enabled protocols
  --help      display this help and exit
  --libs      library linking information
  --prefix    curl install prefix
@@ -45,20 +46,21 @@ while test $# -gt 0; do

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

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

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

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

+    --protocols)
+	if test "@CURL_DISABLE_HTTP@" != "1"; then
+          echo "HTTP"
+	  if test "@USE_SSLEAY@" = "1"; then
+            echo "HTTPS"
+          fi
+        fi
+	if test "@CURL_DISABLE_FTP@" != "1"; then
+          echo "FTP"
+	  if test "@USE_SSLEAY@" = "1"; then
+            echo "FTPS"
+          fi
+        fi
+	if test "@CURL_DISABLE_GOPHER@" != "1"; then
+          echo "GOPHER"
+        fi
+	if test "@CURL_DISABLE_FILE@" != "1"; then
+          echo "FILE"
+        fi
+	if test "@CURL_DISABLE_TELNET@" != "1"; then
+          echo "TELNET"
+        fi
+	if test "@CURL_DISABLE_LDAP@" != "1"; then
+          echo "LDAP"
+        fi
+	if test "@CURL_DISABLE_DICT@" != "1"; then
+          echo "DICT"
+        fi
+	;;
    --version)
 	echo libcurl @VERSION@
 	exit 0
@@ -123,8 +143,7 @@ while test $# -gt 0; do

    *)
        echo "unknown option: $1"
-	usage
-	exit 1
+	usage 1
 	;;
    esac
    shift
--- a/docs/BINDINGS
+++ b/docs/BINDINGS
@@ -25,10 +25,14 @@ Basic
  ScriptBasic bindings to libcurl. Writtten by Peter Verhas
  http://scriptbasic.com/

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

  Written by Jean-Philippe Barrette-LaPierre
-  http://www.sourceforge.net/projects/curlpp
+  http://rrette.com/curlpp.html

 Ch

@@ -68,14 +72,29 @@ glib/GTK+

 Java

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

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

  Written by Steve Dekorte
  http://curl.haxx.se/libcurl/lua/

+Mono
+
+  Written by Jeffrey Phillips
+  http://forge.novell.com/modules/xfmod/project/?libcurl-mono
+
+.NET
+
+  libcurl-net Written by Jeffrey Phillips
+  http://sourceforge.net/projects/libcurl-net/
+
 Object-Pascal

  Free Pascal, Delphi and Kylix binding written by Christophe Espern.
@@ -108,9 +127,14 @@ PostgreSQL

 Python

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

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

  Written Mark Hessling
@@ -128,9 +152,14 @@ Scheme

 Tcl

-  Written by Andr<64>s Garc<72>a
+  Tclcurl is written by Andr<64>s Garc<72>a
  http://personal1.iddeo.es/andresgarci/tclcurl/english/docs.html

+Visual Basic
+
+  libcurl-vb is written by Jeffrey Phillips
+  http://sourceforge.net/projects/libcurl-vb/
+
 Q

  http://q-lang.sourceforge.net/
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: August 18, 2004 (http://curl.haxx.se/docs/faq.html)
+Updated: April 13, 2005 (http://curl.haxx.se/docs/faq.html)
                                  _   _ ____  _
                              ___| | | |  _ \| |
                             / __| | | | |_) | |
@@ -42,6 +42,8 @@ FAQ
  3.14 Does curl support javascript or pac (automated proxy config)?
  3.15 Can I do recursive fetches with curl?
  3.16 What certificates do I need when I use SSL?
+  3.17 How do I list the root dir of an FTP server?
+  3.18 Can I use curl to send a POST/PUT and not wait for a response?

 4. Running Problems
  4.1 Problems connecting to SSL servers.
@@ -73,6 +75,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?
@@ -96,7 +101,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:
@@ -116,7 +121,7 @@ FAQ

    libcurl is free, thread-safe, IPv6 compatible, feature rich, well
    supported and fast.
-    
+
  curl

    A command line tool for getting or sending files using URL syntax.
@@ -295,8 +300,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!

@@ -502,9 +507,9 @@ 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
+    it. 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
@@ -520,6 +525,22 @@ FAQ
    that was signed by one of the authorities in the bundle. curl comes with a
    default CA cert bundle. You can override the default.

+  3.17 How do I list the root dir of an FTP server?
+
+  There are two ways. The way defined in the RFC is to use an encoded slash
+  in the first path part. List the "/tmp" dir like this:
+
+     curl ftp://ftp.sunet.se/%2ftmp/
+
+  or the not-quite-kosher-but-more-readable way, by simply starting the path
+  section of the URL with a slash:
+
+     curl ftp://ftp.sunet.se//tmp/
+
+  3.18 Can I use curl to send a POST/PUT and not wait for a response?
+ 
+  No.
+

 4. Running Problems

@@ -623,7 +644,10 @@ FAQ

  4.6 Can you tell me what error code 142 means?

-  All error codes that are larger than the highest documented error code means
+  All curl error codes are described at the end of the man page, in the
+  section called "EXIT CODES".
+
+  Error codes that are larger than the highest documented error code means
  that curl has exited due to a crash. This is a serious error, and we
  appreciate a detailed bug report from you that describes how we could go
  ahead and repeat this!
@@ -717,12 +741,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).
+
+    [informative link missing]

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

@@ -803,6 +835,22 @@ FAQ

  (Provided by Andrew Francis)

+  When building an application that uses the static libcurl library, you must
+  add -DCURL_STATICLIB to your CFLAGS. Otherwise the linker will look for
+  dynamic import symbols. If you get linker error like "unknown symbol
+  __imp__curl_easy_init ..." you have linked against the wrong (static)
+  library.  If you want to use the libcurl.dll and import lib, you don't need
+  any extra CFLAGS, but use one of the import libraries below. These are the
+  libraries produced by the various lib/Makefile.* files:
+
+  Target:          static lib.   import lib for libcurl*.dll.
+  -----------------------------------------------------------
+  MingW:           libcurl.a     libcurldll.a
+  MSVC (release):  libcurl.lib   libcurl_imp.lib
+  MSVC (debug):    libcurld.lib  libcurld_imp.lib
+  Borland:         libcurl.lib   libcurl_imp.lib
+
+
  5.8 libcurl.so.3: open failed: No such file or directory

  This is an error message you might get when you try to run a program linked
@@ -845,6 +893,35 @@ FAQ
    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 a WRITEFUNCTION to receive the data, or possibly set
+  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
--- a/docs/HISTORY
+++ b/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,7 @@ 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.
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -1,7 +1,7 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                             \___|\___/|_| \_\_____|

                                How To Compile
@@ -75,12 +75,22 @@ UNIX
           ./configure

     (with csh, tcsh and their clones):
-     
+
       env CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
       ./configure

-   If your SSL library was compiled with rsaref (usually for use in the United
-   States), you may also need to set:
+   If you have shared SSL libs installed in a directory where your run-time
+   linker doesn't find them (which usually causes configure failures), you can
+   provide the -R option to ld on some operating systems to set a hard-coded
+   path to the run-time linker:
+
+        LDFLAGS=-R/usr/local/ssl/lib ./configure --with-ssl
+
+   Another option to the previous trick, is to set LD_LIBRARY_PATH or edit the
+   /etc/ld.so.conf file.
+
+   If your SSL library was compiled with rsaref (this was common in the past
+   when used in the United States), you may also need to set:

     LIBS=-lRSAglue -lrsaref
     (as suggested by Doug Kaufman)
@@ -92,7 +102,7 @@ UNIX

       CC=cc ./configure
         or
-       env Cc=cc ./configure
+       env CC=cc ./configure

     To force a static library compile, disable the shared library creation
     by running configure like:
@@ -121,7 +131,7 @@ UNIX

 Win32
 =====
- 
+
   Without SSL:

      MingW32 (GCC-2.95) style
@@ -189,8 +199,8 @@ Win32
        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 
+        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
@@ -219,7 +229,7 @@ Win32
        '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. 
+        at runtime.
        Run 'nmake vc-ssl-zlib' to build with both ssl and zlib support.

      Microsoft / Borland style
@@ -231,27 +241,27 @@ Win32
      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
-      
+

        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
@@ -283,6 +293,13 @@ Win32
      - 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.
+
+
 IBM OS/2
 ========

@@ -353,9 +370,9 @@ VMS
   +----+------------+-------------+---+

   With the Ctrl-bits an application can tell if part or the whole message has
-   allready been printed from the program, DCL doesn't need to print it again.
+   already been printed from the program, DCL doesn't need to print it again.

-   Facility - basicaly the program ID. A code assigned to the program
+   Facility - basically the program ID. A code assigned to the program
   the name can be fetched from external or internal message libraries
   Errorcode - the errodes assigned by the application
   Sev. - severity: Even = error, off = non error
@@ -363,7 +380,7 @@ VMS
      1 = Success
      2 = Error
      3 = Information
-      4 = Fatal 
+      4 = Fatal
      <5-7> reserved.

   This all presents itself with:
@@ -387,7 +404,7 @@ QNX
 ===
   (This section was graciously brought to us by David Bentham)

-   As QNX is targetted for resource constrained environments, the QNX headers
+   As QNX is targeted for resource constrained environments, the QNX headers
   set conservative limits. This includes the FD_SETSIZE macro, set by default
   to 32. Socket descriptors returned within the CURL library may exceed this,
   resulting in memory faults/SIGSEGV crashes when passed into select(..)
@@ -397,44 +414,6 @@ QNX
   libcurl, by overriding CFLAGS during configure, example
   #  configure CFLAGS='-DFD_SETSIZE=64 -g -O2'

-CROSS COMPILE
-=============
-
-   (This section was graciously brought to us by Jim Duey, 23-oct-2001)
-
-   Download and unpack the cURL package.  Version should be 7.9.1 or later.
-
-   'cd' to the new directory. (ie. curl-7.9.1-pre4)
-
-   Set environment variables to point to the cross-compile toolchain and call
-   configure with any options you need.  Be sure and specify the '--host' and
-   '--build' parameters at configuration time.  The following script is an
-   example of cross-compiling for the IBM 405GP PowerPC processor using the
-   toolchain from MonteVista for Hardhat Linux.
-
-   (begin script)
-
-   #! /bin/sh
-
-   export PATH=$PATH:/opt/hardhat/devkit/ppc/405/bin
-   export CPPFLAGS="-I/opt/hardhat/devkit/ppc/405/target/usr/include"
-   export AR=ppc_405-ar
-   export AS=ppc_405-as
-   export LD=ppc_405-ld
-   export RANLIB=ppc_405-ranlib
-   export CC=ppc_405-gcc
-   export NM=ppc_405-nm
-
-   configure --target=powerpc-hardhat-linux \
-	--host=powerpc-hardhat-linux \
-	--build=i586-pc-linux-gnu \
-	--prefix=/opt/hardhat/devkit/ppc/405/target/usr/local \
-	--exec-prefix=/usr/local
-
-   (end script)
-
-   The '--prefix' parameter specifies where cURL will be installed.  If
-   'configure' completes successfully, do 'make' and 'make install' as usual.

 RISC OS
 =======
@@ -477,32 +456,108 @@ NetWare
   - either any gcc / nlmconv, or CodeWarrior 7 PDK 4 or later.
   - gnu make and awk running on the platform you compile on;
     native Win32 versions can be downloaded from:
-     http://www.gknw.com/development/prgtools/ 
-   - recent Novell LibC SDK availabable from:
+     http://www.gknw.com/development/prgtools/
+   - recent Novell LibC SDK available from:
     http://developer.novell.com/ndk/libc.htm
-   - optional zlib sources (at the moment only dynamic linking with zlib.imp); 
-     sources with NetWare Makefile can be optained from:
+   - 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/

   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 didnt work although
+   I found on some Linux systems (RH9) that OS detection didnlt 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...; dont know yet why they fail when build with
+   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 libcares into curl.
+   WITH_ARES=1; I've not tested yet including libares into curl.
   Any help in testing appreciated!
-   Buils automatically created 4 times a day from current CVS are here:
+   Builds automatically created 4 times a day from current CVS are here:
   http://www.gknw.com/mirror/curl/autobuilds/
-   the status of these buids can be viewed at the autobuild table:
+   the status of these builds can be viewed at the autobuild table:
   http://curl.haxx.se/auto/


+CROSS COMPILE
+=============
+
+   (This section was graciously brought to us by Jim Duey, with additions by
+   Dan Fandrich)
+
+   Download and unpack the cURL package.  Version should be 7.9.1 or later.
+
+   'cd' to the new directory. (e.g. cd curl-7.12.3)
+
+   Set environment variables to point to the cross-compile toolchain and call
+   configure with any options you need.  Be sure and specify the '--host' and
+   '--build' parameters at configuration time.  The following script is an
+   example of cross-compiling for the IBM 405GP PowerPC processor using the
+   toolchain from MonteVista for Hardhat Linux.
+
+   (begin script)
+
+   #! /bin/sh
+
+   export PATH=$PATH:/opt/hardhat/devkit/ppc/405/bin
+   export CPPFLAGS="-I/opt/hardhat/devkit/ppc/405/target/usr/include"
+   export AR=ppc_405-ar
+   export AS=ppc_405-as
+   export LD=ppc_405-ld
+   export RANLIB=ppc_405-ranlib
+   export CC=ppc_405-gcc
+   export NM=ppc_405-nm
+
+   ./configure --target=powerpc-hardhat-linux \
+	--host=powerpc-hardhat-linux \
+	--build=i586-pc-linux-gnu \
+	--prefix=/opt/hardhat/devkit/ppc/405/target/usr/local \
+	--exec-prefix=/usr/local
+
+   (end script)
+
+   You may also need to provide a parameter like '--with-random=/dev/urandom'
+   to configure as it cannot detect the presence of a random number
+   generating device for a target system.  The '--prefix' parameter
+   specifies where cURL will be installed.  If 'configure' completes
+   successfully, do 'make' and 'make install' as usual.
+
+   In some cases, you may be able to simplify the above commands to as
+   little as:
+
+       ./configure --host=ARCH-OS
+
+   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:
+
+      env CFLAGS='-Os' ./configure ...
+
+   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
+   know your application is not going to need.  Besides specifying the
+   --disable-PROTOCOL flags for all the types of URLs your application
+   will not use, here are some other flags that can reduce the size of the
+   library:
+
+     --disable-ares (disables support for the ARES DNS library)
+     --disable-cookies (disables support for HTTP cookies)
+     --disable-crypto-auth (disables HTTP cryptographic authentication)
+     --disable-ipv6 (disables support for IPv6)
+     --disable-verbose (eliminates debugging strings and error code strings)
+     --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)
+
+   You may find that statically linking libcurl to your application will
+   result in a lower total size.
+
+
 PORTS
 =====
   This is a probably incomplete list of known hardware and operating systems
@@ -523,14 +578,14 @@ 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
@@ -538,16 +593,17 @@ PORTS
        - Ultrix 4.3a
        - i386 BeOS
        - i386 DOS
+        - 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
@@ -555,7 +611,7 @@ PORTS
        - m68k Linux
        - m68k OpenBSD
        - m88k dg-dgux5.4R3.00
-        - s390 Linux 
+        - s390 Linux
        - XScale/PXA250 Linux 2.4

 Useful URLs
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -3,56 +3,98 @@ 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!

-* curl version 7.12.2 fails on AIX if compiled with --enable-ares.
+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://sourceforge.net/support/tracker.php?aid=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.
+
+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.
+
+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
+  string.  From a strict FTP protocol standpoint, NUL is a valid character
+  within RFC 959 <string>, so the way to handle this correctly in curl would
+  be to use a data structure other than a plain C string, one that can handle
+  embedded NUL characters.  From a practical standpoint, most FTP servers
+  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
+  test pass, but instead makes it fail on Solaris hosts that use its native
+  iconv.
+
+13. curl version 7.12.2 fails on AIX if compiled with --enable-ares.
  The workaround is to combine --enable-ares with --disable-shared

-* When connecting to a SOCKS proxy, the (connect) timeout is not properly
+12. When connecting to a SOCKS proxy, the (connect) timeout is not properly
  acknowledged after the actual TCP connect (during the SOCKS "negotiate"
  phase). Pointed out by Lucas. Fix: need to select() and timeout properly.

-* Using configure --disable-[protocol] may cause 'make test' to fail for
+11. Using configure --disable-[protocol] may cause 'make test' to fail for
  tests using the disabled protocol(s).

-* To get HTTP Negotiate authentication to work fine, you need to provide a
+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

-* If you use a very large amount of file descriptors (more than FD_SETSIZE)
-  and then use libcurl, it might crash on its use of select() which then
-  stores data out of bounds. Bug report #948950.
-
-* --limit-rate using -d or -F does not work. This is because the limit logic
+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.

-* Doing resumed upload over HTTP does not work with '-C -', because curl
+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
  manually for HTTP PUT resume to work, and then '-C [index]'.

-* CURLOPT_USERPWD and CURLOPT_PROXYUSERPWD have no way of providing user names
+7. CURLOPT_USERPWD and CURLOPT_PROXYUSERPWD have no way of providing user names
  that contain a colon. This can't be fixed easily in a backwards compatible
  way without adding new options (and then, they should most probably allow
  setting user name and password separately).

-* libcurl ignores empty path parts in FTP URLs, whereas RFC1738 states that
+6. libcurl ignores empty path parts in FTP URLs, whereas RFC1738 states that
  such parts should be sent to the server as 'CWD ' (without an argument).
  The only exception to this rule, is that we knowingly break this if the
  empty part is first in the path, as then we use the double slashes to
  indicate that the user wants to reach the root dir (this exception SHALL
  remain even when this bug is fixed).

-* libcurl doesn't treat the content-length of compressed data properly, as
+5. libcurl doesn't treat the content-length of compressed data properly, as
  it seems HTTP servers send the *uncompressed* length in that header and
-  libcurl thinks of it as the *compressed* lenght. Some explanations are here:
+  libcurl thinks of it as the *compressed* length. Some explanations are here:
  http://curl.haxx.se/mail/lib-2003-06/0146.html

-* 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

-* GOPHER transfers seem broken
-
-* If a HTTP server responds to a HEAD request and includes a body (thus
+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
  immediately made to the same server again, the connection will be re-used
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -32,7 +32,15 @@ OpenSSL http://www.openssl.org/source/license.html
        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).
+        more and more common). If OpenSSL's licensing is a problem for you,
+        consider using GnuTLS instead.
+
+GnuTLS  http://www.gnutls.org/
+
+        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.

 c-ares  http://daniel.haxx.se/projects/c-ares/license.html

@@ -84,3 +92,5 @@ OpenLDAP http://www.openldap.org/software/release/license.html
 [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
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -170,8 +170,8 @@ UPLOADING

        curl -T - http://www.upload.com/myfile

-  Note that the http server must've been configured to accept PUT before this
-  can be done successfully.
+  Note that the http server must have been configured to accept PUT before
+  this can be done successfully.

  For other ways to do http data upload, see the POST section below.

@@ -299,6 +299,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
@@ -370,7 +377,7 @@ COOKIES
        curl -b headers www.example.com

  While saving headers to a file is a working way to store cookies, it is
-  however error-prone and not the prefered way to do this. Instead, make curl
+  however error-prone and not the preferred way to do this. Instead, make curl
  save the incoming cookies using the well-known netscape cookie format like
  this:

@@ -388,7 +395,7 @@ COOKIES
  file contents.  In the above command, curl will parse the header and store
  the cookies received from www.example.com.  curl will send to the server the
  stored cookies which match the request as it follows the location.  The
-  file "empty.txt" may be a non-existant file.
+  file "empty.txt" may be a nonexistent file.

  Alas, to both read and write cookies from a netscape cookie file, you can
  set both -b and -c to use the same file:
@@ -417,7 +424,7 @@ PROGRESS METER
   Upload        - the average transfer speed of the upload
   Time Total    - expected time to complete the operation
   Time Current  - time passed since the invoke
-   Time Left     - expected time left to completetion
+   Time Left     - expected time left to completion
   Curr.Speed    - the average transfer speed the last 5 seconds (the first
                   5 seconds of a transfer is based on less time of course.)

@@ -437,14 +444,14 @@ SPEED LIMIT
        curl -Y 3000 -y 60 www.far-away-site.com

  This can very well be used in combination with the overall time limit, so
-  that the above operatioin must be completed in whole within 30 minutes:
+  that the above operation must be completed in whole within 30 minutes:

        curl -m 1800 -Y 3000 -y 60 www.far-away-site.com

  Forcing curl not to transfer data faster than a given rate is also possible,
  which might be useful if you're using a limited bandwidth connection and you
  don't want your transfer to use all of it (sometimes referred to as
-  "bandwith throttle").
+  "bandwidth throttle").

  Make curl transfer data no faster than 10 kilobytes per second:

@@ -590,7 +597,7 @@ HTTPS

  Secure HTTP requires SSL libraries to be installed and used when curl is
  built. If that is done, curl is capable of retrieving and posting documents
-  using the HTTPS procotol.
+  using the HTTPS protocol.

  Example:

@@ -765,7 +772,7 @@ NETRC
  to specify name and password for commonly visited ftp sites in a file so
  that you don't have to type them in each time you visit those sites. You
  realize this is a big security risk if someone else gets hold of your
-  passwords, so therefor most unix programs won't read this file unless it is
+  passwords, so therefore most unix programs won't read this file unless it is
  only readable by yourself (curl doesn't care though).

  Curl supports .netrc files if told so (using the -n/--netrc and
@@ -830,22 +837,22 @@ TELNET
  to track when the login prompt is received and send the username and
  password accordingly.

-PERSISTANT CONNECTIONS
+PERSISTENT CONNECTIONS

  Specifying multiple files on a single command line will make curl transfer
  all of them, one after the other in the specified order.

-  libcurl will attempt to use persistant connections for the transfers so that
+  libcurl will attempt to use persistent connections for the transfers so that
  the second transfer to the same host can use the same connection that was
  already initiated and was left open in the previous transfer. This greatly
  decreases connection time for all but the first transfer and it makes a far
  better use of the network.

-  Note that curl cannot use persistant connections for transfers that are used
+  Note that curl cannot use persistent connections for transfers that are used
  in subsequence curl invokes. Try to stuff as many URLs as possible on the
  same command line if they are using the same host, as that'll make the
-  transfers faster. If you use a http proxy for file transfers, practicly
-  all transfers will be persistant.
+  transfers faster. If you use a http proxy for file transfers, practically
+  all transfers will be persistent.

 MAILING LISTS

--- a/docs/THANKS
+++ b/docs/THANKS
@@ -1,100 +1,94 @@
- 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>
+ If you have contributed but are missing here, please let us know!
+
+Alan Pinstein, Albert Chin-A-Young, Albert Choy, Aleksandar Milivojevic, Alex
+aka WindEagle, Alex Neblett, Alex Suykov, Alexander Kourakos, Alexander
+Krasnostavsky, Alexander Zhuravlev, Alexis Carvalho, Andi Jahja, Andreas Damm,
+Andreas Olsson, Andreas Rieke, Andrew Francis, Andrew Fuller, Andr<64>s Garc<72>a,
+Andy Cedilnik, Andy Serpa, Angus Mackay, Antoine Calando, Anton Kalmykov,
+Arkadiusz Miskiewicz, Augustus Saunders, Avery Fay, Ben Greear, Benjamin
+Gerard, Bertrand Demiddelaer, Bjorn Reese, Bj<42>rn Stenberg, Bob Schader, Brad
+Burdick, Brent Beardsley, Brian Akins, Brian R Duffy, Bruce Mitchener, Bryan
+Henderson, Bryan Henderson , Bryan Kemp, Caolan McNamara, Casey O'Donnell,
+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 at touchtunes, Daniel Stenberg, 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 LeBlanc, David Odin, David Phillips, David Shaw, David Tarendash, David
+Thiel, Detlef Schmier, Diego Casorran, Dimitris Sarris, Dinar, Dirk
+Eddelbuettel, Dirk Manske, Dolbneff A.V, Domenico Andreoli, Dominick Meglio,
+Doug Kaufman, Doug Porter, Douglas E. Wegscheid, Douglas R. Horner, Dustin
+Boswell, Dylan Ellicott, Dylan Salisbury, Early Ehlinger, Edin Kadribasic,
+Ellis Pritchard, Emiliano Ida, Enrico Scholz, Enrik Berkhan, Eric Lavigne,
+Eric Melville, Eric Rautman, Eric Thelin, Eric Vergnaud, Eric Young, Erick
+Nuwendam, Erwan Legrand, Erwin Authried, 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, 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<>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, Ilguiz
+Latypov, Ingo Ralf Blum, Ingo Wilken, Jacky Lam, Jacob Meuser, James Bursa,
+James Clancy, James Cone, James Gallagher, James Griffiths, James MacMillan,
+Jamie Lokier, Jamie Wilkinson, Jason S. Priebe, Jean-Claude Chauve, Jean-Louis
+Lemaire, Jean-Marc Ranger, Jean-Philippe Barrette-LaPierre, Jeff Lawson, Jeff
+Phillips, Jeffrey Pohlmeyer, Jeremy Friesner, Jesper Jensen, Jesse Noller, Jim
+Drash, Joe Halpin, Joel Chen, Johan Anderson, Johan Nilsson, John Crow, John
+Janssen, John Lask, John McGowan, 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<>rg Mueller-Tolk, J<>rn Hartroth, Kai Sommerfeld,
+Kai-Uwe Rommel, Kang-Jin Lee, Karol Pietrzak, Keith MacDonald, Keith McGuigan,
+Ken Hirsch, Ken Rastatter, Kevin Fisk, 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, Mark
+Butler, 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
+Mealling, Michal Bonino, Mihai Ionescu, 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, Niels van Tongeren, Nikita
+Schmidt, nk, Nodak Sodak, Oren Tirosh, P R Schaffner, Patrick Bihan-Faou,
+Patrick Smith, Paul Harrington, Paul Marquis, Paul Moore, Paul Nolan, Pavel
+Cenek, Pavel Orehov, Pawel A. Gajda, Pedro Neves, Pete Su, Peter Bray, Peter
+Forret, Peter Pentchev, Peter Sylvester, Peter Todd, Peter Verhas, Peter
+Wullinger, Phil Karn, Philip Gladstone, Philippe Hameau, Philippe Raoult,
+Pierre, Puneet Pawaia, 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 Cooper, Richard Gorton, Richard
+Prescott, Rick Jones, Rick Richardson, Rob Stanzel, Robert D. Young, Robert
+Olson, Robert Weaver, Robin Kay, Rodney Simmons, 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,
+Sebastien Willemijns, Sergio Ballestrero, Seshubabu Pasam, Shard, Shawn
+Poulson, Siddhartha Prakash Jain, Simon Dick, Simon Liu, Spiridonoff A.V,
+Stadler Stephan, 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, swalkaus at yahoo.com,
+S<EFBFBD>bastien Willemijns, T. Bharath, T. Yamada, Thomas Schwinge, Thomas Tonino,
+Tim Baker, Tim Bartley, Tim Costello, Tim Sneddon, Toby Peterson, 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, Ulrich Zadow,
+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, Yarram Sunil, Zvi Har'El
--- a/docs/TODO
+++ b/docs/TODO
@@ -15,10 +15,10 @@ TODO
 LIBCURL

 * Introduce an interface to libcurl that allows applications to easier get to
-   know what cookies that are received. Pushing interface that calls a
-   callback on each received cookie? Querying interface that asks about
-   existing cookies? We probably need both. Enable applications to modify
-   existing cookies as well. http://curl.haxx.se/dev/COOKIES
+   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.
@@ -26,7 +26,7 @@ TODO

 * 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
@@ -35,9 +35,16 @@ TODO

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

 LIBCURL - multi interface

+ * Add a curl_multi_fdset() alternative. 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
@@ -57,24 +64,17 @@ TODO

 FTP

- * "PASV IP override" - When an FTPS host is behind a NAT firewall, passive
-   mode fails. The PASV response from the host ["227 PASV Entering passive
-   mode (_ip_address_, _port_)."] contains the private network IP address of
-   the host, which since it is encrypted, cannot be modified by the firewall
-   to the public IP address. What is needed is a cURL option to override the
-   IP address passed by the host "227 PASV" response. Requested by Ed
-   Hingsbergen
+ * 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.

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

- * Optimize the way libcurl uses CWD on each new request over a persistent
-   connection (on FTP) even if it doesn't have to.
-
 * 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
-   part is to figure out if the server did the right thing or not.
+   (impossible?) part is to figure out if the server did the right thing or
+   not.

 * Support the most common FTP proxies, Philip Newton provided a list
   allegedly from ncftp:
@@ -101,6 +101,10 @@ TODO
   This could possibly be implemented using the multi interface to queue
   requests and the response data.

+ * When doing CONNECT to a HTTP proxy, libcurl always uses HTTP/1.0. This has
+   never been reported as causing trouble to anyone, but should be considered
+   to use the HTTP version the user has chosen.
+
 TELNET

 * Reading input (to send to the remote server) on stdin is a crappy solution
@@ -138,14 +142,12 @@ 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.

 LDAP

@@ -153,6 +155,22 @@ TODO
   lib/ldap.c source file and get moved to the main network code so that the
   multi interface and friends will work for LDAP as well.

+ 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.
+
+ * RSYNC (no RFCs for protocol nor URI/URL format).  An implementation should
+   most probably use an existing rsync library, such as librsync.
+
 CLIENT

 * "curl --sync http://example.com/feed[1-100].rss" or
@@ -215,15 +233,12 @@ TODO

 * Consider extending 'roffit' to produce decent ASCII output, and use that
   instead of (g)nroff when building src/hugehelp.c
-  
+
 TEST SUITE

 * Make the test servers able to serve multiple running test suites. Like if
   two users run 'make test' at once.

- * Make runtests.pl capable of changing port numbers for the servers. This was
-   the intention from the start, but in practise it is now hard.
-
 * If perl wasn't found by the configure script, don't attempt to run the
   tests but explain something nice why it doesn't.

@@ -250,3 +265,6 @@ TODO

   They will instead become curlx_ - alternatives. That makes the curl app
   still capable of building with them from source.
+
+ * Remove support for CURLOPT_FAILONERROR, it has gotten too kludgy and weird
+   internally. Let the app judge success or not for itself.
--- a/docs/TheArtOfHttpScripting
+++ b/docs/TheArtOfHttpScripting
@@ -1,7 +1,5 @@
-Online:  http://curl.haxx.se/docs/httpscripting.shtml
-Author:  Daniel Stenberg <daniel@haxx.se>
-Date:    November 6, 2001
-Version: 0.6
+Online:  http://curl.haxx.se/docs/httpscripting.html
+Date:    December 9, 2004

                The Art Of Scripting HTTP Requests Using Curl
                =============================================
@@ -139,11 +137,11 @@ Version: 0.6
  you need to replace that space with %20 etc. Failing to comply with this
  will most likely cause your data to be received wrongly and messed up.

- 4.3 FILE UPLOAD POST
+ 4.3 File Upload POST

-  Back in late 1995 they defined a new way to post data over HTTP. It was
-  documented in the RFC 1867, why this method sometimes is referred to as
-  a RFC1867-posting.
+  Back in late 1995 they defined an additional way to post data over HTTP. It
+  is documented in the RFC 1867, why this method sometimes is referred to as
+  RFC1867-posting.

  This method is mainly designed to better support file uploads. A form that
  allows a user to upload a file could be written like this in HTML:
@@ -160,7 +158,7 @@ Version: 0.6

        curl -F upload=@localfilename -F press=OK [URL]

- 4.4 HIDDEN FIELDS
+ 4.4 Hidden Fields

  A very common way for HTML based application to pass state information
  between pages is to add hidden fields to the forms. Hidden fields are
@@ -181,7 +179,7 @@ Version: 0.6

        curl -d "birthyear=1905&press=OK&person=daniel" [URL]

- 4.5 FIGURE OUT WHAT A POST LOOKS LIKE
+ 4.5 Figure Out What A POST Looks Like

  When you're about fill in a form and send to a server by using curl instead
  of a browser, you're of course very interested in sending a POST exactly the
@@ -204,7 +202,7 @@ Version: 0.6

        curl -T uploadfile www.uploadhttp.com/receive.cgi

-6. AUTHENTICATION
+6. Authentication

 Authentication is the ability to tell the server your username and password
 so that it can verify that you're allowed to do the request you're doing. The
@@ -229,31 +227,31 @@ Version: 0.6
        curl -U proxyuser:proxypassword curl.haxx.se

 If your proxy requires the authentication to be done using the NTLM method,
- use --proxy-ntlm.
+ use --proxy-ntlm, if it requires Digest use --proxy-digest.

 If you use any one these user+password options but leave out the password
 part, curl will prompt for the password interactively.

- Do note that when a program is run, its parameters are possible to see when
- listing the running processes of the system. Thus, other users may be able to
- watch your passwords if you pass them as plain command line options. There
- are ways to circumvent this.
+ Do note that when a program is run, its parameters might be possible to see
+ when listing the running processes of the system. Thus, other users may be
+ able to watch your passwords if you pass them as plain command line
+ options. There are ways to circumvent this.

-7. REFERER
+7. Referer

- A HTTP request may include a 'referer' field, which can be used to tell from
- which URL the client got to this particular resource. Some programs/scripts
- check the referer field of requests to verify that this wasn't arriving from
- an external site or an unknown page. While this is a stupid way to check
- something so easily forged, many scripts still do it. Using curl, you can put
- anything you want in the referer-field and thus more easily be able to fool
- the server into serving your request.
+ A HTTP request may include a 'referer' field (yes it is misspelled), which
+ can be used to tell from which URL the client got to this particular
+ resource. Some programs/scripts check the referer field of requests to verify
+ that this wasn't arriving from an external site or an unknown page. While
+ this is a stupid way to check something so easily forged, many scripts still
+ do it. Using curl, you can put anything you want in the referer-field and
+ thus more easily be able to fool the server into serving your request.

 Use curl to set the referer field with:

        curl -e http://curl.haxx.se daniel.haxx.se

-8. USER AGENT
+8. User Agent

 Very similar to the referer field, all HTTP requests may set the User-Agent
 field. It names what user agent (client) that is being used. Many
@@ -275,7 +273,7 @@ Version: 0.6

        curl -A "Mozilla/4.73 [en] (X11; U; Linux 2.2.15 i686)" [URL]

-9. REDIRECTS
+9. Redirects

 When a resource is requested from a server, the reply from the server may
 include a hint about where the browser should go next to find this page, or a
@@ -294,7 +292,7 @@ Version: 0.6
 page, you can safely use -L and -d/-F together. Curl will only use POST in
 the first request, and then revert to GET in the following operations.

-10. COOKIES
+10. Cookies

 The way the web browsers do "client side state control" is by using
 cookies. Cookies are just names with associated contents. The cookies are
@@ -366,7 +364,7 @@ Version: 0.6

        curl https://that.secure.server.com

- 11.1 CERTIFICATES
+ 11.1 Certificates

  In the HTTPS world, you use certificates to validate that you are the one
  you you claim to be, as an addition to normal passwords. Curl supports
@@ -379,11 +377,67 @@ Version: 0.6
        curl -E mycert.pem https://that.secure.server.com

  curl also tries to verify that the server is who it claims to be, by
-  verifying the server's certificate against a CA cert bundle. Failing the
-  verification will cause curl to deny the connection. You must then use -k in
-  case you want to tell curl to ignore that the server can't be verified.
+  verifying the server's certificate against a locally stored CA cert
+  bundle. Failing the verification will cause curl to deny the connection. You
+  must then use -k in case you want to tell curl to ignore that the server
+  can't be verified.

-12. REFERENCES
+  More about server certificate verification and ca cert bundles can be read
+  in the SSLCERTS document, available online here:
+
+        http://curl.haxx.se/docs/sslcerts.html
+
+12. Custom Request Elements
+
+ Doing fancy stuff, you may need to add or change elements of a single curl
+ request.
+
+ For example, you can change the POST request to a PROPFIND and send the data
+ as "Content-Type: text/xml" (instead of the default Content-Type) like this:
+
+        curl -d "<xml>" -H "Content-Type: text/xml" -X PROPFIND url.com
+
+ You can delete a default header by providing one without content. Like you
+ can ruin the request by chopping off the Host: header:
+
+        curl -H "Host:" http://mysite.com
+
+ You can add headers the same way. Your server may want a "Destination:"
+ header, and you can add it:
+
+        curl -H "Destination: http://moo.com/nowhere" http://url.com
+
+13. Debug
+
+ Many times when you run curl on a site, you'll notice that the site doesn't
+ seem to respond the same way to your curl requests as it does to your
+ browser's.
+
+ Then you need to start making your curl requests more similar to your
+ browser's requests:
+
+ * Use the --trace-ascii option to store fully detailed logs of the requests
+   for easier analyzing and better understanding
+
+ * Make sure you check for and use cookies when needed (both reading with -b
+   and writing with -c)
+
+ * Set user-agent to one like a recent popular browser does
+
+ * Set referer like it is set by the browser
+
+ * If you use POST, make sure you send all the fields and in the same order as
+   the browser does it. (See chapter 4.5 above)
+
+ A very good helper to make sure you do this right, is the LiveHTTPHeader tool
+ that lets you view all headers you send and receive with Mozilla/Firefox
+ (even when using HTTPS).
+
+ A more raw approach is to capture the HTTP traffic on the network with tools
+ such as ethereal or tcpdump and check what headers that were sent and
+ received by the browser. (HTTPS makes this technique inefficient.)
+
+14. References

 RFC 2616 is a must to read if you want in-depth understanding of the HTTP
 protocol.
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -20,7 +20,7 @@ Version Numbers and Releases
   N is pre-release number

 One of these numbers will get bumped in each new release. The numbers to the
- right of a bumped number will be reset to zero. If Z is zero, it is not
+ right of a bumped number will be reset to zero. If Z is zero, it may not be
 included in the version number. The pre release number is only included in
 pre releases (they're never used in public, official, releases).

@@ -49,7 +49,7 @@ Version Numbers and Releases

 As a service to any application that might want to support new libcurl
 features while still being able to build with older versions, all releases
- have the libcurl version stored in the curl/curl.h file using a static
+ have the libcurl version stored in the curl/curlver.h file using a static
 numbering scheme that can be used for comparison. The version number is
 defined as:
        
@@ -62,3 +62,6 @@ Version Numbers and Releases
 This 6-digit hexadecimal number does not show pre-release number, and it is
 always a greater number in a more recent release. It makes comparisons with
 greater than and less than work.
+
+ This number is also available as three separate defines:
+ LIBCURL_VERSION_MAJOR, LIBCURL_VERSION_MINOR and LIBCURL_VERSION_PATCH.
--- a/docs/curl-config.1
+++ b/docs/curl-config.1
@@ -1,8 +1,27 @@
-.\" You can view this file with:
-.\" nroff -man curl-config.1
-.\" Written by Daniel Stenberg
+.\" **************************************************************************
+.\" *                                  _   _ ____  _
+.\" *  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$
+.\" **************************************************************************
 .\"
-.TH curl-config 1 "8 Oct 2002" "Curl 7.10" "curl-config manual"
+.TH curl-config 1 "25 Jan 2004" "Curl 7.13.0" "curl-config manual"
 .SH NAME
 curl-config \- Get information about a libcurl installation
 .SH SYNOPSIS
@@ -32,13 +51,20 @@ to link your application with libcurl.
 This is the prefix used when libcurl was installed. Libcurl is then installed
 in $prefix/lib and its header files are installed in $prefix/include and so
 on. The prefix is set with "configure --prefix".
+.IP "--protocols"
+Lists what particular protocols the installed libcurl was built to support. At
+the time of writing, this list may include HTTP, HTTPS, FTP, FTPS, GOPHER,
+FILE, TELNET, LDAP, DICT. Do not assume any particular order. The protocols
+will be listed using uppercase and are separated by newlines. There may be
+none, one or several protocols in the list. (Added in 7.13.0)
 .IP "--version"
 Outputs version information about the installed libcurl.
 .IP "--vernum"
 Outputs version information about the installed libcurl, in numerical mode.
 This outputs the version number, in hexadecimal, with 8 bits for each part;
 major, minor, patch. So that libcurl 7.7.4 would appear as 070704 and libcurl
-12.13.14 would appear as 0c0d0e...
+12.13.14 would appear as 0c0d0e... Note that the initial zero might be
+omitted.
 .SH "EXAMPLES"
 What linker options do I need when I link with libcurl?

--- a/docs/curl.1
+++ b/docs/curl.1
@@ -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
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH curl 1 "3 May 2004" "Curl 7.12" "Curl Manual"
+.TH curl 1 "28 Apr 2005" "Curl 7.14.0" "Curl Manual"
 .SH NAME
 curl \- transfer a URL
 .SH SYNOPSIS
@@ -91,6 +91,11 @@ network round-trip. This is used instead of setting a specific authentication
 method, which you can do with \fI--basic\fP, \fI--digest\fP, \fI--ntlm\fP, and
 \fI--negotiate\fP. (Added in 7.10.6)

+Note that using --anyauth is not recommended if you do uploads from stdin,
+since it may require data to be sent twice and then the client must be able to
+rewind. If the need should arise when uploading from stdin, the upload
+operation will fail.
+
 If this option is used several times, the following occurrences make no
 difference.
 .IP "-b/--cookie <name=data>"
@@ -115,9 +120,9 @@ using \fI-D/--dump-header\fP!
 If this option is set more than once, the last one will be the one that's
 used.
 .IP "-B/--use-ascii"
-Use ASCII transfer when getting an FTP file or LDAP info. For FTP, this can
-also be enforced by using an URL that ends with ";type=A". This option causes
-data sent to stdout to be in text mode for win32 systems.
+Enable ASCII transfer when using FTP or LDAP. For FTP, this can also be
+enforced by using an URL that ends with ";type=A". This option causes data
+sent to stdout to be in text mode for win32 systems.

 If this option is used twice, the second one will disable ASCII usage.
 .IP "--basic"
@@ -160,12 +165,12 @@ won't fail or even report an error clearly. Using -v will get a warning
 displayed, but that is the only visible feedback you get about this possibly
 lethal situation.

-If this option is used several times, the last specfied file name will be
+If this option is used several times, the last specified file name will be
 used.
 .IP "-C/--continue-at <offset>"
 Continue/Resume a previous file transfer at the given offset. The given offset
 is the exact number of bytes that will be skipped counted from the beginning
-of the source file before it is transfered to the destination.  If used with
+of the source file before it is transferred to the destination.  If used with
 uploads, the ftp server command SIZE will not be used by curl.

 Use "-C -" to tell curl to automatically find out where/how to resume the
@@ -236,7 +241,7 @@ active FTP transfers. Curl will normally always first attempt to use EPRT,
 then LPRT before using PORT, but with this option, it will use PORT right
 away. EPRT and LPRT are extensions to the original FTP protocol, may not work
 on all servers but enable more functionality in a better way than the
-traditional PORT command. (Aded in 7.10.5)
+traditional PORT command. (Added in 7.10.5)

 If this option is used several times, each occurrence will toggle this on/off.
 .IP "--disable-epsv"
@@ -262,9 +267,14 @@ If this option is used several times, the last one will be used.
 be set with the \fI-H/--header\fP flag of course.  When used with
 \fI-L/--location\fP you can append ";auto" to the referer URL to make curl
 automatically set the previous URL when it follows a Location: header. The
-";auto" string can be used alone, even if you don't set an initial referer.
+\&";auto" string can be used alone, even if you don't set an initial referer.

 If this option is used several times, the last one will be used.
+.IP "--engine <name>"
+Select the OpenSSL crypto engine to use for cipher
+operations. Use \fI--engine list\fP to print a list of build-time supported
+engines. Note that not all (or none) of the engines may be available at
+run-time.
 .IP "--environment"
 (RISC OS ONLY) Sets a range of environment variables, using the names the -w
 option supports, to easier allow extraction of useful information after having
@@ -320,6 +330,12 @@ document stating so (which often also describes why and more). This flag will
 prevent curl from outputting that and fail silently instead.

 If this option is used twice, the second will again disable silent failure.
+.IP "--ftp-account [data]"
+(FTP) When an FTP server asks for "account data" after user name and password
+has been provided, this data is sent off using the ACCT command. (Added in
+7.13.0)
+
+If this option is used twice, the second will override the previous use.
 .IP "--ftp-create-dirs"
 (FTP) When an FTP URL/operation uses a path that doesn't currently exist on
 the server, the standard behavior of curl is to fail. Using this option, curl
@@ -327,8 +343,8 @@ will instead attempt to create missing directories. (Added in 7.10.7)

 If this option is used twice, the second will again disable silent failure.
 .IP "--ftp-pasv"
-(FTP) Use PASV when transfering. PASV is the internal default behavior, but
-using this option can be used to override a previos --ftp-port option. (Added
+(FTP) Use PASV when transferring. PASV is the internal default behavior, but
+using this option can be used to override a previous --ftp-port option. (Added
 in 7.11.0)

 If this option is used twice, the second will again disable silent failure.
@@ -340,7 +356,7 @@ If this option is used twice, the second will again disable this.
 (HTTP) This lets curl emulate a filled in form in which a user has pressed the
 submit button. This causes curl to POST data using the Content-Type
 multipart/form-data according to RFC1867. This enables uploading of binary
-files etc. To force the 'content' part to be be a file, prefix the file name
+files etc. To force the 'content' part to be a file, prefix the file name
 with an @ sign. To just get the content part from a file, prefix the file name
 with the letter <. The difference between @ and < is then that @ makes a file
 get attached in the post as a file upload, while the < makes a text field and
@@ -352,7 +368,7 @@ input:

 \fBcurl\fP -F password=@/etc/passwd www.mypasswords.com

-To read the file's content from stdin insted of a file, use - where the file
+To read the file's content from stdin instead of a file, use - where the file
 name should've been. This goes for both @ and < constructs.

 You can also tell curl what Content-Type to use by using 'type=', in a manner
@@ -364,9 +380,20 @@ or

 \fBcurl\fP -F "name=daniel;type=text/foo" url.com

+You can also explicitly change the name field of an file upload part by
+setting filename=, like this:
+
+\fBcurl\fP -F "file=@localfile;filename=nameinpost" url.com
+
 See further examples and details in the MANUAL.

 This option can be used multiple times.
+.IP "--form-string <name=string>"
+(HTTP) Similar to \fI--form\fP except that the value string for the named
+parameter is used literally. Leading \&'@' and \&'<' characters, and the
+\&';type=' string in the value have no special meaning. Use this in preference
+to \fI--form\fP if there's any possibility that the string value may
+accidentally trigger the \&'@' or \&'<' features of \fI--form\fP.
 .IP "-g/--globoff"
 This option switches off the "URL globbing parser". When you set this option,
 you can specify URLs that contain the letters {}[] without having them being
@@ -420,7 +447,7 @@ time only.
 If this option is used twice, the second will again disable header only.
 .IP "-j/--junk-session-cookies"
 (HTTP) When curl is told to read cookies from a given file, this option will
-make it discard all "session cookies". This will basicly have the same effect
+make it discard all "session cookies". This will basically have the same effect
 as if a new session is started. Typical browsers always discard session
 cookies when they're closed down. (Added in 7.9.7)

@@ -448,7 +475,7 @@ If this option is used several times, the last one will be used.
 should be one of 'clear', 'safe', 'confidential' or 'private'. Should you use
 a level that is not one of these, 'private' will instead be used.

-This option requiures that the library was built with kerberos4 support. This
+This option requires that the library was built with kerberos4 support. This
 is not very common. Use \fI-V/--version\fP to see if your curl supports it.

 If this option is used several times, the last one will be used.
@@ -470,6 +497,20 @@ line. So, it could look similar to this:
 url = "http://curl.haxx.se/docs/"

 This option can be used multiple times.
+
+When curl is invoked, it always (unless \fI-q\fP is used) checks for a default
+config file and uses it if found. The default config file is checked for in
+the following places in this order:
+
+1) curl tries to find the "home dir": It first checks for the CURL_HOME and
+then the HOME environment variables. Failing that, it uses getpwuid() on
+unix-like systems (which returns the home dir given the current user in your
+system). On Windows, it then checks for the APPDATA variable, or as a last
+resort the '%USERPROFILE%\Application Data'.
+
+2) On windows, if there is no _curlrc file in the home dir, it checks for one
+in the same dir the executable curl is placed. On unix-like systems, it will
+simply try to load .curlrc from the determined home dir.
 .IP "--limit-rate <speed>"
 Specify the maximum transfer rate you want curl to use. This feature is useful
 if you have a limited pipe and you'd like your transfer not use your entire
@@ -558,12 +599,12 @@ Very similar to \fI--netrc\fP, but this option makes the .netrc usage
 \fBoptional\fP and not mandatory as the \fI--netrc\fP does.
 .IP "--negotiate"
 (HTTP) Enables GSS-Negotiate authentication. The GSS-Negotiate method was
-designed by Microsoft and is used in their web aplications. It is primarily
+designed by Microsoft and is used in their web applications. It is primarily
 meant as a support for Kerberos5 authentication but may be also used along
 with another authentication methods. For more information see IETF draft
 draft-brezak-spnego-http-04.txt. (Added in 7.10.6)

-This option requiures that the library was built with GSSAPI support. This is
+This option requires that the library was built with GSSAPI support. This is
 not very common. Use \fI-V/--version\fP to see if your version supports
 GSS-Negotiate.

@@ -587,7 +628,7 @@ authentication method instead. Such as Digest. (Added in 7.10.6)
 If you want to enable NTLM for your proxy authentication, then use
 \fI--proxy-ntlm\fP.

-This option requiures that the library was built with SSL support. Use
+This option requires that the library was built with SSL support. Use
 \fI-V/--version\fP to see if your curl supports NTLM.

 If this option is used several times, the following occurrences make no
@@ -612,11 +653,21 @@ dynamically.
 Write output to a local file named like the remote file we get. (Only the file
 part of the remote file is used, the path is cut off.)

+The remote file name to use for saving is extracted from the given URL.
+Nothing else
+
 You may use this option as many times as you have number of URLs.
 .IP "--pass <phrase>"
 (SSL) Pass phrase for the private key

 If this option is used several times, the last one will be used.
+.IP "--proxy-anyauth"
+Tells curl to pick a suitable authentication method when communicating with
+the given proxy. This will cause an extra request/response round-trip. Added
+in curl 7.13.2.
+
+If this option is used twice, the second will again disable the proxy use-any
+authentication.
 .IP "--proxy-basic"
 Tells curl to use HTTP Basic authentication when communicating with the given
 proxy. Use \fI--basic\fP for enabling HTTP Basic with a remote host. Basic is
@@ -663,13 +714,16 @@ If this option is used several times, the last one will be used. Disable the
 use of PORT with \fI--ftp-pasv\fP. Disable the attempt to use the EPRT command
 instead of PORT by using \fI--disable-eprt\fP. EPRT is really PORT++.
 .IP "-q"
-If used as the first parameter on the command line, the \fI$HOME/.curlrc\fP
-file will not be read and used as a config file.
-.IP "-Q/--quote <comand>"
+If used as the first parameter on the command line, the \fIcurlrc\fP config
+file will not be read and used. See the \fI-K/--config\fP for details on the
+default config file search path.
+.IP "-Q/--quote <command>"
 (FTP) Send an arbitrary command to the remote FTP server. Quote commands are
-sent BEFORE the transfer is taking place. To make commands take place after a
-successful transfer, prefix them with a dash '-'. You may specify any amount
-of commands to be run before and after the transfer. If the server returns
+sent BEFORE the transfer is taking place (just after the initial PWD command
+to be exact). To make commands take place after a successful transfer, prefix
+them with a dash '-'. To make commands get sent after libcurl has changed
+working directory, just before the transfer command(s), prefix the command
+with '+'. You may specify any amount of commands. If the server returns
 failure for one of the commands, the entire operation will be aborted. You
 must send syntactically correct FTP commands as RFC959 defines.

@@ -723,6 +777,37 @@ remote file, and if that is available make the local file get that same
 timestamp.

 If this option is used twice, the second time disables this again.
+.IP "--retry <num>"
+If a transient error is returned when curl tries to perform a transfer, it
+will retry this number of times before giving up. Setting the number to 0
+makes curl do no retries (which is the default). Transient error means either:
+a timeout, an FTP 5xx response code or an HTTP 5xx response code.
+
+When curl is about to retry a transfer, it will first wait one second and then
+for all forthcoming retries it will double the waiting time until it reaches
+10 minutes which then will be the delay between the rest of the retries.  By
+using \fI--retry-delay\fP you disable this exponential backoff algorithm. See
+also \fI--retry-max-time\fP to limit the total time allowed for
+retries. (Option added in 7.12.3)
+
+If this option is used multiple times, the last occurrence decide the amount.
+.IP "--retry-delay <seconds>"
+Make curl sleep this amount of time between each retry when a transfer has
+failed with a transient error (it changes the default backoff time algorithm
+between retries). This option is only interesting if \fI--retry\fP is also
+used. Setting this delay to zero will make curl use the default backoff time.
+(Option added in 7.12.3)
+
+If this option is used multiple times, the last occurrence decide the amount.
+.IP "--retry-max-time <seconds>"
+The retry timer is reset before the first transfer attempt. Retries will be
+done as usual (see \fI--retry\fP) as long as the timer hasn't reached this
+given limit. Notice that if the timer hasn't reached the limit, the request
+will be made and while performing, it may take longer than this given time
+period. To limit a single request\'s maximum time, use \fI-m/--max-time\fP.
+Set this option to zero to not timeout retries. (Option added in 7.12.3)
+
+If this option is used multiple times, the last occurrence decide the amount.
 .IP "-s/--silent"
 Silent mode. Don't show progress meter or error messages.  Makes
 Curl mute.
@@ -750,7 +835,7 @@ If this option is used several times, the last one will be used.
 Turn on the TCP_NODELAY option. See the \fIcurl_easy_setopt(3)\fP man page for
 details about this option. (Added in 7.11.2)

-If this option is used several times, each occurance toggles this on/off.
+If this option is used several times, each occurrence toggles this on/off.
 .IP "-t/--telnet-option <OPT=val>"
 Pass options to the telnet protocol. Supported options are:

@@ -800,8 +885,14 @@ to read for untrained humans.

 If this option is used several times, the last one will be used. (Added in
 7.9.7)
+.IP "--trace-time"
+Prepends a time stamp to each trace or verbose line that curl displays.
+
+If this option is used several times, each occurrence will toggle it on/off.
+(Added in 7.14.0        )
 .IP "-u/--user <user:password>"
-Specify user and password to use for server authentication.
+Specify user and password to use for server authentication. Overrides
+\fI-n/--netrc\fP and \fI--netrc-optional\fP.

 If this option is used several times, the last one will be used.
 .IP "-U/--proxy-user <user:password>"
@@ -816,11 +907,11 @@ This option may be used any number of times. To control where this URL is
 written, use the \fI-o/--output\fP or the \fI-O/--remote-name\fP options.
 .IP "-v/--verbose"
 Makes the fetching more verbose/talkative. Mostly usable for debugging. Lines
-starting with '>' means data sent by curl, '<' means data received by curl
-that is hidden in normal cases and lines starting with '*' means additional
-info provided by curl.
+starting with '>' means "header data" sent by curl, '<' means "header data"
+received by curl that is hidden in normal cases and lines starting with '*'
+means additional info provided by curl.

-Note that if you want to see HTTP headers in the output, \fI-i/--include\fP
+Note that if you only want HTTP headers in the output, \fI-i/--include\fP
 might be option you're looking for.

 If you think this option still doesn't give you enough details, consider using
@@ -848,20 +939,23 @@ HTTPS and FTPS are supported.
 .IP "libz"
 Automatic decompression of compressed files over HTTP is supported.
 .IP "NTLM"
-NTLM authenticaion is supported.
+NTLM authentication is supported.
 .IP "GSS-Negotiate"
-Negotiate authenticaion is supported.
+Negotiate authentication is supported.
 .IP "Debug"
 This curl uses a libcurl built with Debug. This enables more error-tracking
 and memory debugging etc. For curl-developers only!
 .IP "AsynchDNS"
 This curl uses asynchronous name resolves.
 .IP "SPNEGO"
-SPNEGO Negotiate authenticaion is supported.
+SPNEGO Negotiate authentication is supported.
 .IP "Largefile"
 This curl supports transfers of large files, files larger than 2GB.
 .IP "IDN"
 This curl supports IDN - international domain names.
+.IP "SSPI"
+SSPI is supported. If you use NTLM and set a blank user name, curl will
+authenticate with your current user and password.
 .RE
 .IP "-w/--write-out <format>"
 Defines what to display after a completed and successful operation. The format
@@ -890,6 +984,10 @@ to follow location: headers.
 .B http_code
 The numerical code that was found in the last retrieved HTTP(S) page.
 .TP
+.B http_connect
+The numerical code that was found in the last response (from a proxy) to a
+curl CONNECT request. (Added in 7.12.4)
+.TP
 .B time_total
 The total time, in seconds, that the full operation lasted. The time will be
 displayed with millisecond resolution.
@@ -907,9 +1005,15 @@ The time, in seconds, it took from the start until the file transfer is just
 about to begin. This includes all pre-transfer commands and negotiations that
 are specific to the particular protocol(s) involved.
 .TP
+.B time_redirect
+The time, in seconds, it took for all redirection steps include name lookup,
+connect, pretransfer and transfer before final transaction was
+started. time_redirect shows the complete execution time for multiple
+redirections. (Added in 7.12.3)
+.TP
 .B time_starttransfer
 The time, in seconds, it took from the start until the first byte is just about
-to be transfered. This includes time_pretransfer and also the time the
+to be transferred. This includes time_pretransfer and also the time the
 server needs to calculate the result.
 .TP
 .B size_download
@@ -932,6 +1036,12 @@ The average upload speed that curl measured for the complete upload.
 .TP
 .B content_type
 The Content-Type of the requested document, if there was any. (Added in 7.9.5)
+.TP
+.B num_connects
+Number of new connects made in the recent transfer. (Added in 7.12.3)
+.TP
+.B num_redirects
+Number of redirects that were followed in the request. (Added in 7.12.3)
 .RE

 If this option is used several times, the last one will be used.
@@ -944,7 +1054,7 @@ use. If there's an environment variable setting a proxy, you can set proxy to
 \&"" to override it.

 \fBNote\fP that all operations that are performed over a HTTP proxy will
-transparantly be converted to HTTP. It means that certain protocol specific
+transparently be converted to HTTP. It means that certain protocol specific
 operations might not be available. This is not the case if you can tunnel
 through the proxy, as done with the \fI-p/--proxytunnel\fP option.

@@ -1005,6 +1115,17 @@ Forces curl to use SSL version 2 when negotiating with a remote SSL server.
 .IP "-3/--sslv3"
 (HTTPS)
 Forces curl to use SSL version 3 when negotiating with a remote SSL server.
+.IP "--3p-quote"
+(FTP) Specify arbitrary commands to send to the source server. See the
+\fI-Q/--quote\fP option for details. (Added in 7.13.0)
+.IP "--3p-url"
+(FTP) Activates a FTP 3rd party transfer. Specifies the source URL to get a
+file from, while the "normal" URL will be used as target URL, the file that
+will be written/created.
+
+Note that not all FTP server allow 3rd party transfers. (Added in 7.13.0)
+.IP "--3p-user"
+(FTP) Specify user:password for the source URL transfer. (Added in 7.13.0)
 .IP "-4/--ipv4"
 If libcurl is capable of resolving an address to multiple IP versions (which
 it is if it is ipv6-capable), this option tells libcurl to resolve names to
@@ -1077,7 +1198,7 @@ FTP can't reconnect. Couldn't connect to the host we got in the 227-line.
 .IP 17
 FTP couldn't set binary. Couldn't change transfer method to binary.
 .IP 18
-Partial file. Only a part of the file was transfered.
+Partial file. Only a part of the file was transferred.
 .IP 19
 FTP couldn't download/access the given file, the RETR (or similar) command
 failed.
@@ -1186,5 +1307,5 @@ http://curl.haxx.se
 ftp://ftp.sunet.se/pub/www/utilities/curl/
 .SH "SEE ALSO"
 .BR ftp (1),
-.BR wget (1),
-.BR snarf (1)
+.BR wget (1)
+
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -9,7 +9,8 @@ EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c		\
 ftpupload.c httpput.c simplessl.c ftpgetresp.c http-post.c		\
 post-callback.c multi-app.c multi-double.c multi-single.c		\
 multi-post.c fopen.c simplepost.c makefile.dj curlx.c https.c		\
- multi-debugcallback.c fileupload.c getinfo.c ftp3rdparty.c debug.c
+ multi-debugcallback.c fileupload.c getinfo.c ftp3rdparty.c debug.c	\
+ anyauthput.c htmltitle.cc htmltidy.c opensslthreadlock.c

 all:
 	@echo "done"
--- a/docs/examples/README
+++ b/docs/examples/README
@@ -1,4 +1,8 @@
-EXAMPLES
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
+                             \___|\___/|_| \_\_____|

 This directory is for libcurl programming examples. They are meant to show
 some simple steps on how you can build your own application to take full
@@ -7,6 +11,8 @@ advantage of libcurl.
 If you end up with other small but still useful example sources, please mail
 them for submission in future packages and on the web site.

+BUILDING
+
 The Makefile.example is an example makefile that could be used to build these
 examples. Just edit the file according to your system and requirements first.

@@ -23,3 +29,36 @@ want you do reorganize them like:
 applications/experiments. Even if the examples in this directory use that site
 as an example URL at some places, it doesn't mean that the URLs work or that
 we expect you to actually torture our web site with your tests! Thanks.
+
+EXAMPLES
+
+anyauthput.c   - HTTP PUT using "any" authentication method
+curlgtk.c      - download using a GTK progress bar
+curlx.c        - getting file info from the remote cert data
+debug.c        - showing how to use the debug callback
+fileupload.c   - uploading to a file:// URL
+fopen.c        - fopen() layer that supports opening URLs and files
+ftp3rdparty.c  - FTP 3rd party transfer
+ftpget.c       - simple getting a file from FTP
+ftpgetresp.c   - get the response strings from the FTP server
+ftpupload.c    - upload a file to a FTP server
+getinfo.c      - get the Content-Type from the recent transfer
+getinmemory.c  - download a file to memory only
+htmltitle.cc   - download a HTML file and extract the <title> tag from a HTML
+                 page using libxml
+http-post.c    - HTTP POST
+httpput.c      - HTTP PUT a local file
+https.c        - simple HTTPS transfer
+multi-app.c    - a multi-interface app
+multi-debugcallback.c - a multi-interface app using the debug callback
+multi-double.c - a multi-interface app doing two simultaneous transfers
+multi-post.c   - a multi-interface app doing a multipart formpost
+multi-single.c - a multi-interface app getting a single file
+multithread.c  - an example using multi-treading transfering multiple files
+persistant.c   - request two URLs with a persistant connection
+post-callback.c - send a HTTP POST using a callback
+postit2.c      - send a HTTP multipart formpost
+sepheaders.c   - download headers to a separate file
+simple.c       - the most simple download a URL source
+simplepost.c   - HTTP POST
+simplessl.c    - HTTPS example with certificates many options set
--- a/docs/examples/adddocsref.pl
+++ b/docs/examples/adddocsref.pl
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+# pass files as argument(s)
+
+my $docroot="http://curl.haxx.se/libcurl/c";
+
+for $f (@ARGV) {
+    open(NEW, ">$f.new");
+    open(F, "<$f");
+    while(<F>) {
+        my $l = $_;
+        if($l =~ /\/* $docroot/) {
+            # just ignore preciously added refs
+        }
+        elsif($l =~ /^( *).*curl_easy_setopt\([^,]*, *([^ ,]*) *,/) {
+            my ($prefix, $anc) = ($1, $2);
+            $anc =~ s/_//g;
+            print NEW "$prefix/* $docroot/curl_easy_setopt.html#$anc */\n";
+            print NEW $l;
+        }
+        elsif($l =~ /^( *).*(curl_([^\(]*))\(/) {
+            my ($prefix, $func) = ($1, $2);
+            print NEW "$prefix/* $docroot/$func.html */\n";
+            print NEW $l;
+        }
+        else {
+            print NEW $l;
+        }
+    }
+    close(F);
+    close(NEW);
+
+    system("mv $f $f.org");
+    system("mv $f.new $f");
+}
--- a/docs/examples/anyauthput.c
+++ b/docs/examples/anyauthput.c
@@ -0,0 +1,135 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include <curl/curl.h>
+
+#if LIBCURL_VERSION_NUM < 0x070c03
+#error "upgrade your libcurl to no less than 7.12.3"
+#endif
+
+/*
+ * This example shows a HTTP PUT operation with authentiction using "any"
+ * type. It PUTs a file given as a command line argument to the URL also given
+ * on the command line.
+ *
+ * Since libcurl 7.12.3, using "any" auth and POST/PUT requires a set ioctl
+ * function.
+ *
+ * This example also uses its own read callback.
+ */
+
+/* ioctl callback function */
+static curlioerr my_ioctl(CURL *handle, curliocmd cmd, void *userp)
+{
+  int fd = (int)userp;
+
+  (void)handle; /* not used in here */
+
+  switch(cmd) {
+  case CURLIOCMD_RESTARTREAD:
+    /* mr libcurl kindly asks as to rewind the read data stream to start */
+    if(-1 == lseek(fd, 0, SEEK_SET))
+      /* couldn't rewind */
+      return CURLIOE_FAILRESTART;
+
+    break;
+
+  default: /* ignore unknown commands */
+    return CURLIOE_UNKNOWNCMD;
+  }
+  return CURLIOE_OK; /* success! */
+}
+
+/* read callback function, fread() look alike */
+size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+  size_t retcode;
+
+  int fd = (int)stream;
+
+  retcode = read(fd, ptr, size * nmemb);
+
+  fprintf(stderr, "*** We read %d bytes from file\n", retcode);
+
+  return retcode;
+}
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+  int hd ;
+  struct stat file_info;
+
+  char *file;
+  char *url;
+
+  if(argc < 3)
+    return 1;
+
+  file= argv[1];
+  url = argv[2];
+
+  /* get the file size of the local file */
+  hd = open(file, O_RDONLY) ;
+  fstat(hd, &file_info);
+
+  /* In windows, this will init the winsock stuff */
+  curl_global_init(CURL_GLOBAL_ALL);
+
+  /* get a curl handle */
+  curl = curl_easy_init();
+  if(curl) {
+    /* we want to use our own read function */
+    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
+
+    /* which file to upload */
+    curl_easy_setopt(curl, CURLOPT_READDATA, hd);
+
+    /* set the ioctl function */
+    curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, my_ioctl);
+
+    /* pass the file descriptor to the ioctl callback as well */
+    curl_easy_setopt(curl, CURLOPT_IOCTLDATA, hd);
+
+    /* enable "uploading" (which means PUT when doing HTTP) */
+    curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+
+    /* specify target URL, and note that this URL should also include a file
+       name, not only a directory (as you can do with GTP uploads) */
+    curl_easy_setopt(curl,CURLOPT_URL, url);
+
+    /* and give the size of the upload, this supports large file sizes
+       on systems that have general support for it */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, file_info.st_size);
+
+    /* tell libcurl we can use "any" auth, which lets the lib pick one, but it
+       also costs one extra round-trip and possibly sending of all the PUT
+       data twice!!! */
+    curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+
+    /* set user name and password for the authentication */
+    curl_easy_setopt(curl, CURLOPT_USERPWD, "user:password");
+
+    /* Now run off and do what you've been told! */
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  close(hd); /* close the local file */
+
+  curl_global_cleanup();
+  return 0;
+}
--- a/docs/examples/curlgtk.c
+++ b/docs/examples/curlgtk.c
@@ -42,7 +42,7 @@ int my_progress_func(GtkWidget *Bar,
  return 0;
 }

-void *curl_thread(void *ptr)
+void *my_thread(void *ptr)
 {
  CURL *curl;
  CURLcode res;
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
  gtk_container_add(GTK_CONTAINER(Frame2), Bar);
  gtk_widget_show_all(Window);

-  if (!g_thread_create(&curl_thread, argv[1], FALSE, NULL) != 0)
+  if (!g_thread_create(&my_thread, argv[1], FALSE, NULL) != 0)
    g_warning("can't create the thread");


--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -4,9 +4,9 @@
  This is a little program to demonstrate the usage of

  - an ssl initialisation callback setting a user key and trustbases
-    coming from a pkcs12 file
+  coming from a pkcs12 file
  - using an ssl application callback to find a URI in the
-    certificate presented during ssl session establishment.
+  certificate presented during ssl session establishment.

 */

@@ -95,38 +95,38 @@
 #include <openssl/ssl.h>

 static char *curlx_usage[]={
-"usage: curlx args\n",
-" -p12 arg         - tia  file ",
-" -envpass arg     - environement variable which content the tia private key password",
-" -out arg         - output file (response)- default stdout",
-" -in arg          - input file (request)- default stdin",
-" -connect arg     - URL of the server for the connection ex: www.openevidenve.org",
-" -mimetype arg    - MIME type for data in ex : application/timestamp-query or application/dvcs -default application/timestamp-query",
-" -acceptmime arg  - MIME type acceptable for the response ex : application/timestamp-response or application/dvcs -default none",
-" -accesstype arg  - an Object identifier in an AIA/SIA method, e.g. AD_DVCS or ad_timestamping",
-NULL
+  "usage: curlx args\n",
+  " -p12 arg         - tia  file ",
+  " -envpass arg     - environement variable which content the tia private key password",
+  " -out arg         - output file (response)- default stdout",
+  " -in arg          - input file (request)- default stdin",
+  " -connect arg     - URL of the server for the connection ex: www.openevidenve.org",
+  " -mimetype arg    - MIME type for data in ex : application/timestamp-query or application/dvcs -default application/timestamp-query",
+  " -acceptmime arg  - MIME type acceptable for the response ex : application/timestamp-response or application/dvcs -default none",
+  " -accesstype arg  - an Object identifier in an AIA/SIA method, e.g. AD_DVCS or ad_timestamping",
+  NULL
 };

 /*

-  ./curlx -p12 psy.p12 -envpass XX -in request -verbose -accesstype AD_DVCS
-  -mimetype application/dvcs -acceptmime application/dvcs -out response
+./curlx -p12 psy.p12 -envpass XX -in request -verbose -accesstype AD_DVCS
+-mimetype application/dvcs -acceptmime application/dvcs -out response

 */

 /* This is a context that we pass to all callbacks */

 typedef struct sslctxparm_st {
-   unsigned char * p12file ;
-   const char * pst ;
-   PKCS12 * p12 ;
-   EVP_PKEY * pkey ;
-   X509 * usercert ;
-   STACK_OF(X509) * ca ;
-   CURL * curl;
-   BIO * errorbio;
-   int accesstype ;
-   int verbose;
+  unsigned char * p12file ;
+  const char * pst ;
+  PKCS12 * p12 ;
+  EVP_PKEY * pkey ;
+  X509 * usercert ;
+  STACK_OF(X509) * ca ;
+  CURL * curl;
+  BIO * errorbio;
+  int accesstype ;
+  int verbose;

 } sslctxparm;

@@ -134,33 +134,35 @@ typedef struct sslctxparm_st {

 static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5)
 {
-        char *tmp;
-        if(!ia5 || !ia5->length) return NULL;
-        tmp = OPENSSL_malloc(ia5->length + 1);
-        memcpy(tmp, ia5->data, ia5->length);
-        tmp[ia5->length] = 0;
-        return tmp;
+  char *tmp;
+  if(!ia5 || !ia5->length)
+    return NULL;
+  tmp = OPENSSL_malloc(ia5->length + 1);
+  memcpy(tmp, ia5->data, ia5->length);
+  tmp[ia5->length] = 0;
+  return tmp;
 }

 /* A conveniance routine to get an access URI. */

 static unsigned char *my_get_ext(X509 * cert, const int type, int extensiontype) {

-        int i;
-        STACK_OF(ACCESS_DESCRIPTION) * accessinfo ;
-        accessinfo =  X509_get_ext_d2i(cert, extensiontype, NULL, NULL) ;
+  int i;
+  STACK_OF(ACCESS_DESCRIPTION) * accessinfo ;
+  accessinfo =  X509_get_ext_d2i(cert, extensiontype, NULL, NULL) ;

-        if (!sk_ACCESS_DESCRIPTION_num(accessinfo)) return NULL;
-        for (i = 0; i < sk_ACCESS_DESCRIPTION_num(accessinfo); i++) {
-                ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
-                if (OBJ_obj2nid(ad->method) == type) {
-                        if (ad->location->type == GEN_URI) {
-                                return i2s_ASN1_IA5STRING(ad->location->d.ia5);
-                        }
-                        return NULL;
-                }
-        }
-        return NULL;
+  if (!sk_ACCESS_DESCRIPTION_num(accessinfo))
+    return NULL;
+  for (i = 0; i < sk_ACCESS_DESCRIPTION_num(accessinfo); i++) {
+    ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
+    if (OBJ_obj2nid(ad->method) == type) {
+      if (ad->location->type == GEN_URI) {
+        return i2s_ASN1_IA5STRING(ad->location->d.ia5);
+      }
+      return NULL;
+    }
+  }
+  return NULL;
 }

 /* This is an application verification call back, it does not
@@ -169,312 +171,336 @@ static unsigned char *my_get_ext(X509 * cert, const int type, int extensiontype)
   the URL to be used in the POST.
 */

-static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) {
-        sslctxparm * p = (sslctxparm *) arg;
-        int ok;
+static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg)
+{
+  sslctxparm * p = (sslctxparm *) arg;
+  int ok;

-        if (p->verbose > 2) BIO_printf(p->errorbio,"entering ssl_app_verify_callback\n");
-        if ((ok= X509_verify_cert(ctx)) && ctx->cert) {
-                unsigned char * accessinfo ;
-                if (p->verbose > 1) X509_print_ex(p->errorbio,ctx->cert,0,0);
-                if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_sinfo_access)) {
-                        if (p->verbose) BIO_printf(p->errorbio,"Setting URL from SIA to: %s\n",accessinfo);
-                        curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
-                } else  if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_info_access)) {
-                        if (p->verbose) BIO_printf(p->errorbio,"Setting URL from AIA to: %s\n",accessinfo);
-                        curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
-                }
-        }
-        if (p->verbose > 2) BIO_printf(p->errorbio,"leaving ssl_app_verify_callback with %d\n",ok);
-        return(ok);
+  if (p->verbose > 2)
+    BIO_printf(p->errorbio,"entering ssl_app_verify_callback\n");
+
+  if ((ok= X509_verify_cert(ctx)) && ctx->cert) {
+    unsigned char * accessinfo ;
+    if (p->verbose > 1)
+      X509_print_ex(p->errorbio,ctx->cert,0,0);
+
+    if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_sinfo_access)) {
+      if (p->verbose)
+        BIO_printf(p->errorbio,"Setting URL from SIA to: %s\n", accessinfo);
+
+      curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
+    }
+    else if (accessinfo = my_get_ext(ctx->cert,p->accesstype,
+                                     NID_info_access)) {
+      if (p->verbose)
+        BIO_printf(p->errorbio,"Setting URL from AIA to: %s\n", accessinfo);
+
+      curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
+    }
+  }
+  if (p->verbose > 2)
+    BIO_printf(p->errorbio,"leaving ssl_app_verify_callback with %d\n", ok);
+  return(ok);
 }


 /* This is an example of an curl SSL initialisation call back. The callback sets:
-  - a private key and certificate
-  - a trusted ca certificate
-  - a preferred cipherlist
-  - an application verification callback (the function above)
+   - a private key and certificate
+   - a trusted ca certificate
+   - a preferred cipherlist
+   - an application verification callback (the function above)
 */

 static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) {

-        sslctxparm * p = (sslctxparm *) parm;
-        SSL_CTX * ctx = (SSL_CTX *) sslctx ;
+  sslctxparm * p = (sslctxparm *) parm;
+  SSL_CTX * ctx = (SSL_CTX *) sslctx ;

-        if (!SSL_CTX_use_certificate(ctx,p->usercert)) {
-                BIO_printf(p->errorbio, "SSL_CTX_use_certificate problem\n"); goto err;
-        }
-        if (!SSL_CTX_use_PrivateKey(ctx,p->pkey)) {
-                BIO_printf(p->errorbio, "SSL_CTX_use_PrivateKey\n"); goto err;
-        }
+  if (!SSL_CTX_use_certificate(ctx,p->usercert)) {
+    BIO_printf(p->errorbio, "SSL_CTX_use_certificate problem\n"); goto err;
+  }
+  if (!SSL_CTX_use_PrivateKey(ctx,p->pkey)) {
+    BIO_printf(p->errorbio, "SSL_CTX_use_PrivateKey\n"); goto err;
+  }

-        if (!SSL_CTX_check_private_key(ctx)) {
-                BIO_printf(p->errorbio, "SSL_CTX_check_private_key\n"); goto err;
-        }
+  if (!SSL_CTX_check_private_key(ctx)) {
+    BIO_printf(p->errorbio, "SSL_CTX_check_private_key\n"); goto err;
+  }

-        SSL_CTX_set_quiet_shutdown(ctx,1);
-        SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
-        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+  SSL_CTX_set_quiet_shutdown(ctx,1);
+  SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
+  SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);

-        X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,sk_X509_num(p->ca)-1));
+  X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,
+                                                    sk_X509_num(p->ca)-1));

-        SSL_CTX_set_verify_depth(ctx,2);
+  SSL_CTX_set_verify_depth(ctx,2);

-        SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL);
+  SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL);

-        SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);
+  SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);


-        return CURLE_OK ;
-err:
-        ERR_print_errors(p->errorbio);
-        return CURLE_SSL_CERTPROBLEM;
+  return CURLE_OK ;
+  err:
+  ERR_print_errors(p->errorbio);
+  return CURLE_SSL_CERTPROBLEM;

 }

 int main(int argc, char **argv) {

-        BIO* in=NULL;
-        BIO* out=NULL;
+  BIO* in=NULL;
+  BIO* out=NULL;
+
+  char * outfile = NULL;
+  char * infile = NULL ;
+
+  int tabLength=100;
+  char *binaryptr;
+  char* mimetype;
+  char* mimetypeaccept=NULL;
+  char* contenttype;
+  char** pp;
+  unsigned char* hostporturl = NULL;
+  binaryptr=(char*)malloc(tabLength);
+  BIO * p12bio ;
+  char **args = argv + 1;
+  unsigned char * serverurl;
+  sslctxparm p;
+  char *response;
+  p.verbose = 0;
+
+  CURLcode res;
+  struct curl_slist * headers=NULL;
+
+  p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+
+  curl_global_init(CURL_GLOBAL_DEFAULT);
+
+  /* we need some more for the P12 decoding */
+
+  OpenSSL_add_all_ciphers();
+  OpenSSL_add_all_digests();
+  ERR_load_crypto_strings();


-        char * outfile = NULL;
-        char * infile = NULL ;
+  int badarg=0;

-        int tabLength=100;
-        char *binaryptr;
-        char* mimetype;
-        char* mimetypeaccept=NULL;
-        char* contenttype;
-        char** pp;
-        unsigned char* hostporturl = NULL;
-        binaryptr=(char*)malloc(tabLength);
-        BIO * p12bio ;
-        char **args = argv + 1;
-        unsigned char * serverurl;
-        sslctxparm p;
-        char *response;
-        p.verbose = 0;
+  while (*args && *args[0] == '-') {
+    if (!strcmp (*args, "-in")) {
+      if (args[1]) {
+        infile=*(++args);
+      } else badarg=1;
+    } else if (!strcmp (*args, "-out")) {
+      if (args[1]) {
+        outfile=*(++args);
+      } else badarg=1;
+    } else if (!strcmp (*args, "-p12")) {
+      if (args[1]) {
+        p.p12file = *(++args);
+      } else badarg=1;
+    } else if (strcmp(*args,"-envpass") == 0) {
+      if (args[1]) {
+        p.pst = getenv(*(++args));
+      } else badarg=1;
+    } else if (strcmp(*args,"-connect") == 0) {
+      if (args[1]) {
+        hostporturl = *(++args);
+      } else badarg=1;
+    } else if (strcmp(*args,"-mimetype") == 0) {
+      if (args[1]) {
+        mimetype = *(++args);
+      } else badarg=1;
+    } else if (strcmp(*args,"-acceptmime") == 0) {
+      if (args[1]) {
+        mimetypeaccept = *(++args);
+      } else badarg=1;
+    } else if (strcmp(*args,"-accesstype") == 0) {
+      if (args[1]) {
+        if ((p.accesstype = OBJ_obj2nid(OBJ_txt2obj(*++args,0))) == 0) badarg=1;
+      } else badarg=1;
+    } else if (strcmp(*args,"-verbose") == 0) {
+      p.verbose++;
+    } else badarg=1;
+    args++;
+  }

-        CURLcode res;
-        struct curl_slist * headers=NULL;
+  if (mimetype==NULL || mimetypeaccept == NULL) badarg = 1;

-        p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
-
-        curl_global_init(CURL_GLOBAL_DEFAULT);
-
-/* we need some more for the P12 decoding */
-
-        OpenSSL_add_all_ciphers();
-        OpenSSL_add_all_digests();
-        ERR_load_crypto_strings();
-
-
-        int badarg=0;
-
-        while (*args && *args[0] == '-') {
-                if (!strcmp (*args, "-in")) {
-                        if (args[1]) {
-                                infile=*(++args);
-                        } else badarg=1;
-                } else if (!strcmp (*args, "-out")) {
-                        if (args[1]) {
-                                outfile=*(++args);
-                        } else badarg=1;
-                } else if (!strcmp (*args, "-p12")) {
-                        if (args[1]) {
-                                p.p12file = *(++args);
-                        } else badarg=1;
-                } else if (strcmp(*args,"-envpass") == 0) {
-                        if (args[1]) {
-                                p.pst = getenv(*(++args));
-                        } else badarg=1;
-                } else if (strcmp(*args,"-connect") == 0) {
-                        if (args[1]) {
-                                hostporturl = *(++args);
-                        } else badarg=1;
-                } else if (strcmp(*args,"-mimetype") == 0) {
-                        if (args[1]) {
-                                mimetype = *(++args);
-                        } else badarg=1;
-                } else if (strcmp(*args,"-acceptmime") == 0) {
-                        if (args[1]) {
-                                mimetypeaccept = *(++args);
-                        } else badarg=1;
-                } else if (strcmp(*args,"-accesstype") == 0) {
-                        if (args[1]) {
-                                if ((p.accesstype = OBJ_obj2nid(OBJ_txt2obj(*++args,0))) == 0) badarg=1;
-                        } else badarg=1;
-                } else if (strcmp(*args,"-verbose") == 0) {
-                        p.verbose++;
-                } else badarg=1;
-                args++;
-        }
-
-        if (mimetype==NULL || mimetypeaccept == NULL) badarg = 1;
-
-        if (badarg) {
-                for (pp=curlx_usage; (*pp != NULL); pp++)
-                        BIO_printf(p.errorbio,"%s\n",*pp);
-                BIO_printf(p.errorbio,"\n");
-                goto err;
-        }
+  if (badarg) {
+    for (pp=curlx_usage; (*pp != NULL); pp++)
+      BIO_printf(p.errorbio,"%s\n",*pp);
+    BIO_printf(p.errorbio,"\n");
+    goto err;
+  }



-        /* set input */
+  /* set input */

-        if ((in=BIO_new(BIO_s_file())) == NULL) {
-                BIO_printf(p.errorbio, "Error setting input bio\n");
-                goto err;
-        } else if (infile == NULL)
-                BIO_set_fp(in,stdin,BIO_NOCLOSE|BIO_FP_TEXT);
-        else if (BIO_read_filename(in,infile) <= 0) {
-                BIO_printf(p.errorbio, "Error opening input file %s\n", infile);
-                BIO_free(in);
-                goto err;
-        }
+  if ((in=BIO_new(BIO_s_file())) == NULL) {
+    BIO_printf(p.errorbio, "Error setting input bio\n");
+    goto err;
+  } else if (infile == NULL)
+    BIO_set_fp(in,stdin,BIO_NOCLOSE|BIO_FP_TEXT);
+  else if (BIO_read_filename(in,infile) <= 0) {
+    BIO_printf(p.errorbio, "Error opening input file %s\n", infile);
+    BIO_free(in);
+    goto err;
+  }

-        /* set output  */
+  /* set output  */

-        if ((out=BIO_new(BIO_s_file())) == NULL) {
-                BIO_printf(p.errorbio, "Error setting output bio.\n");
-                goto err;
-        } else if (outfile == NULL)
-                BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
-        else if (BIO_write_filename(out,outfile) <= 0) {
-                BIO_printf(p.errorbio, "Error opening output file %s\n", outfile);
-                BIO_free(out);
-                goto err;
-        }
+  if ((out=BIO_new(BIO_s_file())) == NULL) {
+    BIO_printf(p.errorbio, "Error setting output bio.\n");
+    goto err;
+  } else if (outfile == NULL)
+    BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
+  else if (BIO_write_filename(out,outfile) <= 0) {
+    BIO_printf(p.errorbio, "Error opening output file %s\n", outfile);
+    BIO_free(out);
+    goto err;
+  }


-        p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+  p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);

-        if (!(p.curl = curl_easy_init())) {
-                BIO_printf(p.errorbio, "Cannot init curl lib\n");
-                goto err;
-        }
+  if (!(p.curl = curl_easy_init())) {
+    BIO_printf(p.errorbio, "Cannot init curl lib\n");
+    goto err;
+  }



-        if (!(p12bio = BIO_new_file(p.p12file , "rb"))) {
-                BIO_printf(p.errorbio, "Error opening P12 file %s\n", p.p12file); goto err;
-        }
-        if (!(p.p12 = d2i_PKCS12_bio (p12bio, NULL))) {
-                BIO_printf(p.errorbio, "Cannot decode P12 structure %s\n", p.p12file); goto err;
-        }
+  if (!(p12bio = BIO_new_file(p.p12file , "rb"))) {
+    BIO_printf(p.errorbio, "Error opening P12 file %s\n", p.p12file); goto err;
+  }
+  if (!(p.p12 = d2i_PKCS12_bio (p12bio, NULL))) {
+    BIO_printf(p.errorbio, "Cannot decode P12 structure %s\n", p.p12file); goto err;
+  }

-        p.ca= NULL;
-        if (!(PKCS12_parse (p.p12, p.pst, &(p.pkey), &(p.usercert), &(p.ca) ) )) {
-                BIO_printf(p.errorbio,"Invalid P12 structure in %s\n", p.p12file); goto err;
-        }
+  p.ca= NULL;
+  if (!(PKCS12_parse (p.p12, p.pst, &(p.pkey), &(p.usercert), &(p.ca) ) )) {
+    BIO_printf(p.errorbio,"Invalid P12 structure in %s\n", p.p12file); goto err;
+  }

-        if (sk_X509_num(p.ca) <= 0) {
-                BIO_printf(p.errorbio,"No trustworthy CA given.%s\n", p.p12file); goto err;
-        }
+  if (sk_X509_num(p.ca) <= 0) {
+    BIO_printf(p.errorbio,"No trustworthy CA given.%s\n", p.p12file); goto err;
+  }

-        if (p.verbose > 1) X509_print_ex(p.errorbio,p.usercert,0,0);
+  if (p.verbose > 1)
+    X509_print_ex(p.errorbio,p.usercert,0,0);

-        /* determine URL to go */
+  /* determine URL to go */

-        if (hostporturl) {
-                serverurl=(char*) malloc(9+strlen(hostporturl));
-                sprintf(serverurl,"https://%s",hostporturl);
-        } else if (p.accesstype != 0) { /* see whether we can find an AIA or SIA for a given access type */
-                if (!(serverurl = my_get_ext(p.usercert,p.accesstype,NID_info_access))) {
-                        BIO_printf(p.errorbio,"no service URL in user cert cherching in others certificats\n");
-                        int j=0;
-                        int find=0;
-                        for (j=0;j<sk_X509_num(p.ca);j++) {
-                                if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_info_access))) break;
-                                if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_sinfo_access))) break;
-                        }
-                }
-        }
+  if (hostporturl) {
+    serverurl=(char*) malloc(9+strlen(hostporturl));
+    sprintf(serverurl,"https://%s",hostporturl);
+  }
+  else if (p.accesstype != 0) { /* see whether we can find an AIA or SIA for a given access type */
+    if (!(serverurl = my_get_ext(p.usercert,p.accesstype,NID_info_access))) {
+      BIO_printf(p.errorbio,"no service URL in user cert "
+                 "cherching in others certificats\n");
+      int j=0;
+      int find=0;
+      for (j=0;j<sk_X509_num(p.ca);j++) {
+        if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,
+                                    NID_info_access)))
+          break;
+        if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,
+                                    NID_sinfo_access)))
+          break;
+      }
+    }
+  }

-        if (!serverurl) {
-               BIO_printf(p.errorbio, "no service URL in certificats, check '-accesstype (AD_DVCS | ad_timestamping)' or use '-connect'\n"); goto err;
-        }
+  if (!serverurl) {
+    BIO_printf(p.errorbio, "no service URL in certificats,"
+               " check '-accesstype (AD_DVCS | ad_timestamping)'"
+               " or use '-connect'\n");
+    goto err;
+  }

-        if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
-        curl_easy_setopt(p.curl, CURLOPT_URL, serverurl);
+  if (p.verbose)
+    BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);

-        /* Now specify the POST binary data */
+  curl_easy_setopt(p.curl, CURLOPT_URL, serverurl);

-        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
-        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
+  /* Now specify the POST binary data */

-        /* pass our list of custom made headers */
+  curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
+  curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);

-        contenttype=(char*) malloc(15+strlen(mimetype));
-        sprintf(contenttype,"Content-type: %s",mimetype);
-        headers = curl_slist_append(headers,contenttype);
-        curl_easy_setopt(p.curl, CURLOPT_HTTPHEADER, headers);
+  /* pass our list of custom made headers */

-        if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
+  contenttype=(char*) malloc(15+strlen(mimetype));
+  sprintf(contenttype,"Content-type: %s",mimetype);
+  headers = curl_slist_append(headers,contenttype);
+  curl_easy_setopt(p.curl, CURLOPT_HTTPHEADER, headers);

-        {
-                FILE *outfp;
-                BIO_get_fp(out,&outfp);
-                curl_easy_setopt(p.curl, CURLOPT_FILE,outfp);
-        }
+  if (p.verbose)
+    BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);

-        res = curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun)  ;
+  {
+    FILE *outfp;
+    BIO_get_fp(out,&outfp);
+    curl_easy_setopt(p.curl, CURLOPT_FILE,outfp);
+  }

-        if (res != CURLE_OK)
-                BIO_printf(p.errorbio,"%d %s=%d %d\n", __LINE__, "CURLOPT_SSL_CTX_FUNCTION",CURLOPT_SSL_CTX_FUNCTION,res);
+  res = curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun)  ;

-        curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_DATA, &p);
+  if (res != CURLE_OK)
+    BIO_printf(p.errorbio,"%d %s=%d %d\n", __LINE__, "CURLOPT_SSL_CTX_FUNCTION",CURLOPT_SSL_CTX_FUNCTION,res);

-        {
-                int lu; int i=0;
-                while ((lu = BIO_read (in,&binaryptr[i],tabLength-i)) >0 ) {
-                        i+=lu;
-                        if (i== tabLength) {
-                                tabLength+=100;
-                                binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */
-                        }
-                }
-                tabLength = i;
-        }
-        /* Now specify the POST binary data */
+  curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_DATA, &p);

-        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
-        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
+  {
+    int lu; int i=0;
+    while ((lu = BIO_read (in,&binaryptr[i],tabLength-i)) >0 ) {
+      i+=lu;
+      if (i== tabLength) {
+        tabLength+=100;
+        binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */
+      }
+    }
+    tabLength = i;
+  }
+  /* Now specify the POST binary data */
+
+  curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
+  curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);


-    /* Perform the request, res will get the return code */
+  /* Perform the request, res will get the return code */

-        BIO_printf(p.errorbio,"%d %s %d\n", __LINE__, "curl_easy_perform", res = curl_easy_perform(p.curl));
-        {
-                int result =curl_easy_getinfo(p.curl,CURLINFO_CONTENT_TYPE,&response);
-                if( mimetypeaccept && p.verbose)
-                         if(!strcmp(mimetypeaccept,response))
-                        BIO_printf(p.errorbio,"the response has a correct mimetype : %s\n",response);
-                else
-                        BIO_printf(p.errorbio,"the reponse doesn\'t has an acceptable mime type, it is %s instead of %s\n",response,mimetypeaccept);
-        }
+  BIO_printf(p.errorbio,"%d %s %d\n", __LINE__, "curl_easy_perform",
+             res = curl_easy_perform(p.curl));
+  {
+    int result =curl_easy_getinfo(p.curl,CURLINFO_CONTENT_TYPE,&response);
+    if( mimetypeaccept && p.verbose)
+      if(!strcmp(mimetypeaccept,response))
+        BIO_printf(p.errorbio,"the response has a correct mimetype : %s\n",
+                   response);
+      else
+        BIO_printf(p.errorbio,"the reponse doesn\'t has an acceptable "
+                   "mime type, it is %s instead of %s\n",
+                   response,mimetypeaccept);
+  }

-    /*** code d'erreur si accept mime ***, egalement code return HTTP != 200 ***/
+  /*** code d'erreur si accept mime ***, egalement code return HTTP != 200 ***/

 /* free the header list*/

-    curl_slist_free_all(headers);
+  curl_slist_free_all(headers);

-    /* always cleanup */
-    curl_easy_cleanup(p.curl);
+  /* always cleanup */
+  curl_easy_cleanup(p.curl);

-    BIO_free(in);
-    BIO_free(out);
-    return (EXIT_SUCCESS);
+  BIO_free(in);
+  BIO_free(out);
+  return (EXIT_SUCCESS);

-
- err: BIO_printf(p.errorbio,"error");
-     exit(1);
+  err: BIO_printf(p.errorbio,"error");
+  exit(1);
 }
-
-
-
-
--- a/docs/examples/fopen.c
+++ b/docs/examples/fopen.c
@@ -124,7 +124,7 @@ write_callback(char *buffer,

 /* use to attempt to fill the read buffer up to requested number of bytes */
 static int
-curl_fill_buffer(URL_FILE *file,int want,int waittime)
+fill_buffer(URL_FILE *file,int want,int waittime)
 {
    fd_set fdread;
    fd_set fdwrite;
@@ -179,7 +179,7 @@ curl_fill_buffer(URL_FILE *file,int want,int waittime)

 /* use to remove want bytes from the front of a files buffer */
 static int
-curl_use_buffer(URL_FILE *file,int want)
+use_buffer(URL_FILE *file,int want)
 {
    /* sort out buffer */
    if((file->buffer_pos - want) <=0)
@@ -333,9 +333,9 @@ url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file)
    case CFTYPE_CURL:
        want = nmemb * size;

-        curl_fill_buffer(file,want,1);
+        fill_buffer(file,want,1);

-        /* check if theres data in the buffer - if not curl_fill_buffer()
+        /* check if theres data in the buffer - if not fill_buffer()
         * either errored or EOF */
        if(!file->buffer_pos)
            return 0;
@@ -347,7 +347,7 @@ url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file)
        /* xfer data to caller */
        memcpy(ptr, file->buffer, want);

-        curl_use_buffer(file,want);
+        use_buffer(file,want);

        want = want / size;     /* number of items - nb correct op - checked
                                 * with glibc code*/
@@ -377,7 +377,7 @@ url_fgets(char *ptr, int size, URL_FILE *file)
        break;

    case CFTYPE_CURL:
-        curl_fill_buffer(file,want,1);
+        fill_buffer(file,want,1);

        /* check if theres data in the buffer - if not fill either errored or
         * EOF */
@@ -403,7 +403,7 @@ url_fgets(char *ptr, int size, URL_FILE *file)
        memcpy(ptr, file->buffer, want);
        ptr[want]=0;/* allways null terminate */

-        curl_use_buffer(file,want);
+        use_buffer(file,want);

        /*printf("(fgets) return %d bytes %d left\n", want,file->buffer_pos);*/
        break;
--- a/docs/examples/ftp3rdparty.c
+++ b/docs/examples/ftp3rdparty.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
@@ -16,22 +16,20 @@

 /*
 * This is an example showing how to transfer a file between two remote hosts.
+ * 7.13.0 or later required.
 */

-
-
 int main(void)
 {
  CURL *curl;
  CURLcode res;
-  char sourceFileName[] = "/tmp/file";
-  char targetFileName[] = "/tmp/curlTargetTest.dat";
-  char sourceHost[] = "source";
-  char targetHost[] = "target";
+  char source_url[] = "ftp://remotehost.com/path/to/source";
+  char target_url[] = "ftp://aotherserver.com/path/to/dest";
+
  char sourceUserPass[] = "user:pass";
  char targetUserPass[] = "user:pass";
  char url[100];
-  
+
  struct curl_slist *source_pre_cmd = NULL;
  struct curl_slist *target_pre_cmd = NULL;
  struct curl_slist *source_post_cmd = NULL;
@@ -39,24 +37,25 @@ int main(void)
  char cmd[] = "PWD";   /* just to test */

  curl_global_init(CURL_GLOBAL_DEFAULT);
-  
+
  curl = curl_easy_init();
  if (curl) {
-    sprintf(url, "ftp://%s@%s/%s", targetUserPass, targetHost, targetFileName);
-    printf("%s\n", url);
-    curl_easy_setopt(curl, CURLOPT_URL, url);
+    /* The ordinary URL is the target when speaking 3rd party transfers */
+    curl_easy_setopt(curl, CURLOPT_URL, target_url);

-    /* Set a proxy host */
-    curl_easy_setopt(curl, CURLOPT_SOURCE_HOST, sourceHost);
+    /* Set a source URL */
+    curl_easy_setopt(curl, CURLOPT_SOURCE_URL, source_url);

-    /* Set a proxy user and password */
+    /* Set target user and password */
+    curl_easy_setopt(curl, CURLOPT_USERPWD, targetUserPass);
+
+    /* Set source user and password */
    curl_easy_setopt(curl, CURLOPT_SOURCE_USERPWD, sourceUserPass);

-    /* Set a proxy full file name */
-    curl_easy_setopt(curl, CURLOPT_SOURCE_PATH, sourceFileName);
-
-    /* Set a proxy passive host */
-    curl_easy_setopt(curl, CURLOPT_PASV_HOST, 0);   /* optional */
+#if 0
+    /* FTPPORT enables PORT on the target side, instead of PASV. */
+    curl_easy_setopt(curl, CURLOPT_FTPPORT, "");   /* optional */
+#endif

    /* build a list of commands to pass to libcurl */
    source_pre_cmd = curl_slist_append(source_pre_cmd, cmd);
@@ -77,7 +76,7 @@ int main(void)
    target_post_cmd = curl_slist_append(target_post_cmd, cmd);
    /* Set a post-quote command */
    curl_easy_setopt(curl, CURLOPT_POSTQUOTE, target_post_cmd);
-    
+
    /* Switch on full protocol/debug output */
    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);

--- a/docs/examples/ftpupload.c
+++ b/docs/examples/ftpupload.c
@@ -72,8 +72,18 @@ int main(int argc, char **argv)
    /* now specify which file to upload */
    curl_easy_setopt(curl, CURLOPT_READDATA, hd_src);

-    /* and give the size of the upload (optional) */
-    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, file_info.st_size);
+    /* NOTE: if you want this example to work on Windows with libcurl as a
+       DLL, you MUST also provide a read callback with
+       CURLOPT_READFUNCTION. Failing to do so will give you a crash since a
+       DLL may not use the variable's memory when passed in to it from an app
+       like this. */
+
+    /* Set the size of the file to upload (optional).  If you give a *_LARGE
+       option you MUST make sure that the type of the passed-in argument is a
+       curl_off_t. If you use CURLOPT_INFILESIZE (without _LARGE) you must
+       make sure that to pass in a type 'long' argument. */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE,
+                     (curl_off_t)file_info.st_size);

    /* Now run off and do what you've been told! */
    res = curl_easy_perform(curl);
--- a/docs/examples/getinfo.c
+++ b/docs/examples/getinfo.c
@@ -16,14 +16,18 @@ int main(void)
  CURL *curl;
  CURLcode res;

+  /* http://curl.haxx.se/libcurl/c/curl_easy_init.html */
  curl = curl_easy_init();
  if(curl) {
+    /* http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTURL */
    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
+    /* http://curl.haxx.se/libcurl/c/curl_easy_perform.html */
    res = curl_easy_perform(curl);

    if(CURLE_OK == res) {
      char *ct;
      /* ask for the content-type */
+      /* http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html */
      res = curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &ct);

      if((CURLE_OK == res) && ct)
@@ -31,6 +35,7 @@ int main(void)
    }

    /* always cleanup */
+    /* http://curl.haxx.se/libcurl/c/curl_easy_cleanup.html */
    curl_easy_cleanup(curl);
  }
  return 0;
--- a/docs/examples/getinmemory.c
+++ b/docs/examples/getinmemory.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
@@ -24,13 +24,23 @@ struct MemoryStruct {
  size_t size;
 };

+void *myrealloc(void *ptr, size_t size)
+{
+  /* There might be a realloc() out there that doesn't like reallocing
+     NULL pointers, so we take care of it here */
+  if(ptr)
+    return realloc(ptr, size);
+  else
+    return malloc(size);
+}
+
 size_t
 WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
 {
-  register int realsize = size * nmemb;
+  size_t realsize = size * nmemb;
  struct MemoryStruct *mem = (struct MemoryStruct *)data;
-  
-  mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
+
+  mem->memory = (char *)myrealloc(mem->memory, mem->size + realsize + 1);
  if (mem->memory) {
    memcpy(&(mem->memory[mem->size]), ptr, realsize);
    mem->size += realsize;
--- a/docs/examples/htmltidy.c
+++ b/docs/examples/htmltidy.c
@@ -0,0 +1,118 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Download a document and use libtidy to parse the HTML.
+ * Written by Jeff Pohlmeyer
+ *
+ * LibTidy => http://tidy.sourceforge.net
+ *
+ * gcc -Wall -I/usr/local/include tidycurl.c -lcurl -ltidy -o tidycurl
+ *
+ */
+
+#include <stdio.h>
+#include <tidy/tidy.h>
+#include <tidy/buffio.h>
+#include <curl/curl.h>
+
+/* curl write callback, to fill tidy's input buffer...  */
+uint write_cb(char *in, uint size, uint nmemb, TidyBuffer *out)
+{
+  uint r;
+  r = size * nmemb;
+  tidyBufAppend( out, in, r );
+  return(r);
+}
+
+/* Traverse the document tree */
+void dumpNode(TidyDoc doc, TidyNode tnod, int indent )
+{
+  TidyNode child;
+  for ( child = tidyGetChild(tnod); child; child = tidyGetNext(child) )
+  {
+    ctmbstr name = tidyNodeGetName( child );
+    if ( name )
+    {
+      /* if it has a name, then it's an HTML tag ... */
+      TidyAttr attr;
+      printf( "%*.*s%s ", indent, indent, "<", name);
+      /* walk the attribute list */
+      for ( attr=tidyAttrFirst(child); attr; attr=tidyAttrNext(attr) ) {
+        printf(tidyAttrName(attr));
+        tidyAttrValue(attr)?printf("=\"%s\" ",
+                                   tidyAttrValue(attr)):printf(" ");
+      }
+      printf( ">\n");
+    }
+    else {
+      /* if it doesn't have a name, then it's probably text, cdata, etc... */
+      TidyBuffer buf;
+      tidyBufInit(&buf);
+      tidyNodeGetText(doc, child, &buf);
+      printf("%*.*s\n", indent, indent, buf.bp?(char *)buf.bp:"");
+      tidyBufFree(&buf);
+    }
+    dumpNode( doc, child, indent + 4 ); /* recursive */
+  }
+}
+
+
+int main(int argc, char **argv )
+{
+  CURL *curl;
+  char curl_errbuf[CURL_ERROR_SIZE];
+  TidyDoc tdoc;
+  TidyBuffer docbuf = {0};
+  TidyBuffer tidy_errbuf = {0};
+  int err;
+  if ( argc == 2) {
+    curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errbuf);
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, no);
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, yes);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_cb);
+
+    tdoc = tidyCreate();
+    tidyOptSetBool(tdoc, TidyForceOutput, yes); /* try harder */
+    tidyOptSetInt(tdoc, TidyWrapLen, 4096);
+    tidySetErrorBuffer( tdoc, &tidy_errbuf );
+    tidyBufInit(&docbuf);
+
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &docbuf);
+    err=curl_easy_perform(curl);
+    if ( !err ) {
+      err = tidyParseBuffer(tdoc, &docbuf); /* parse the input */
+      if ( err >= 0 ) {
+        err = tidyCleanAndRepair(tdoc); /* fix any problems */
+        if ( err >= 0 ) {
+          err = tidyRunDiagnostics(tdoc); /* load tidy error buffer */
+          if ( err >= 0 ) {
+            dumpNode( tdoc, tidyGetRoot(tdoc), 0 ); /* walk the tree */
+            fprintf(stderr, "%s\n", tidy_errbuf.bp); /* show errors */
+          }
+        }
+      }
+    }
+    else
+      fprintf(stderr, "%s\n", curl_errbuf);
+
+    /* clean-up */
+    curl_easy_cleanup(curl);
+    tidyBufFree(&docbuf);
+    tidyBufFree(&tidy_errbuf);
+    tidyRelease(tdoc);
+    return(err);
+
+  }
+  else
+    printf( "usage: %s <url>\n", argv[0] );
+
+  return(0);
+}
--- a/docs/examples/htmltitle.cc
+++ b/docs/examples/htmltitle.cc
@@ -0,0 +1,301 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+// Get a web page, parse it with libxml.
+//
+// Written by Lars Nilsson
+//
+// GNU C++ compile command line suggestion (edit paths accordingly):
+//
+// g++ -Wall -I/opt/curl/include -I/opt/libxml/include/libxml2 htmltitle.cc \
+// -o htmltitle -L/opt/curl/lib -L/opt/libxml/lib -lcurl -lxml2
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <string>
+#include <curl/curl.h>
+#include <libxml/HTMLparser.h>
+
+//
+//  Case-insensitive string comparison
+//
+
+#ifdef _MSC_VER
+#define COMPARE(a, b) (!stricmp((a), (b)))
+#else
+#define COMPARE(a, b) (!strcasecmp((a), (b)))
+#endif
+
+//
+//  libxml callback context structure
+//
+
+struct Context
+{
+  Context(): addTitle(false) { }
+
+  bool addTitle;
+  std::string title;
+};
+
+//
+//  libcurl variables for error strings and returned data
+
+static char errorBuffer[CURL_ERROR_SIZE];
+static std::string buffer;
+
+//
+//  libcurl write callback function
+//
+
+static int writer(char *data, size_t size, size_t nmemb,
+                  std::string *writerData)
+{
+  if (writerData == NULL)
+    return 0;
+
+  writerData->append(data, size*nmemb);
+
+  return size * nmemb;
+}
+
+//
+//  libcurl connection initialization
+//
+
+static bool init(CURL *&conn, char *url)
+{
+  CURLcode code;
+
+  conn = curl_easy_init();
+
+  if (conn == NULL)
+  {
+    fprintf(stderr, "Failed to create CURL connection\n");
+
+    exit(EXIT_FAILURE);
+  }
+
+  code = curl_easy_setopt(conn, CURLOPT_ERRORBUFFER, errorBuffer);
+  if (code != CURLE_OK)
+  {
+    fprintf(stderr, "Failed to set error buffer [%d]\n", code);
+
+    return false;
+  }
+
+  code = curl_easy_setopt(conn, CURLOPT_URL, url);
+  if (code != CURLE_OK)
+  {
+    fprintf(stderr, "Failed to set URL [%s]\n", errorBuffer);
+
+    return false;
+  }
+
+  code = curl_easy_setopt(conn, CURLOPT_FOLLOWLOCATION, 1);
+  if (code != CURLE_OK)
+  {
+    fprintf(stderr, "Failed to set redirect option [%s]\n", errorBuffer);
+
+    return false;
+  }
+
+  code = curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, writer);
+  if (code != CURLE_OK)
+  {
+    fprintf(stderr, "Failed to set writer [%s]\n", errorBuffer);
+
+    return false;
+  }
+
+  code = curl_easy_setopt(conn, CURLOPT_WRITEDATA, &buffer);
+  if (code != CURLE_OK)
+  {
+    fprintf(stderr, "Failed to set write data [%s]\n", errorBuffer);
+
+    return false;
+  }
+
+  return true;
+}
+
+//
+//  libxml start element callback function
+//
+
+static void StartElement(void *voidContext,
+                         const xmlChar *name,
+                         const xmlChar **attributes)
+{
+  Context *context = (Context *)voidContext;
+
+  if (COMPARE((char *)name, "TITLE"))
+  {
+    context->title = "";
+    context->addTitle = true;
+  }
+}
+
+//
+//  libxml end element callback function
+//
+
+static void EndElement(void *voidContext,
+                       const xmlChar *name)
+{
+  Context *context = (Context *)voidContext;
+
+  if (COMPARE((char *)name, "TITLE"))
+    context->addTitle = false;
+}
+
+//
+//  Text handling helper function
+//
+
+static void handleCharacters(Context *context,
+                             const xmlChar *chars,
+                             int length)
+{
+  if (context->addTitle)
+    context->title.append((char *)chars, length);
+}
+
+//
+//  libxml PCDATA callback function
+//
+
+static void Characters(void *voidContext,
+                       const xmlChar *chars,
+                       int length)
+{
+  Context *context = (Context *)voidContext;
+
+  handleCharacters(context, chars, length);
+}
+
+//
+//  libxml CDATA callback function
+//
+
+static void cdata(void *voidContext,
+                  const xmlChar *chars,
+                  int length)
+{
+  Context *context = (Context *)voidContext;
+
+  handleCharacters(context, chars, length);
+}
+
+//
+//  libxml SAX callback structure
+//
+
+static htmlSAXHandler saxHandler =
+{
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  StartElement,
+  EndElement,
+  NULL,
+  Characters,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  cdata,
+  NULL
+};
+
+//
+//  Parse given (assumed to be) HTML text and return the title
+//
+
+static void parseHtml(const std::string &html,
+                      std::string &title)
+{
+  htmlParserCtxtPtr ctxt;
+  Context context;
+
+  ctxt = htmlCreatePushParserCtxt(&saxHandler, &context, "", 0, "",
+                                  XML_CHAR_ENCODING_NONE);
+
+  htmlParseChunk(ctxt, html.c_str(), html.size(), 0);
+  htmlParseChunk(ctxt, "", 0, 1);
+
+  htmlFreeParserCtxt(ctxt);
+
+  title = context.title;
+}
+
+int main(int argc, char *argv[])
+{
+  CURL *conn = NULL;
+  CURLcode code;
+  std::string title;
+
+  // Ensure one argument is given
+
+  if (argc != 2)
+  {
+    fprintf(stderr, "Usage: %s <url>\n", argv[0]);
+
+    exit(EXIT_FAILURE);
+  }
+
+  curl_global_init(CURL_GLOBAL_DEFAULT);
+
+  // Initialize CURL connection
+
+  if (!init(conn, argv[1]))
+  {
+    fprintf(stderr, "Connection initializion failed\n");
+
+    exit(EXIT_FAILURE);
+  }
+
+  // Retrieve content for the URL
+
+  code = curl_easy_perform(conn);
+  curl_easy_cleanup(conn);
+
+  if (code != CURLE_OK)
+  {
+    fprintf(stderr, "Failed to get '%s' [%s]\n", argv[1], errorBuffer);
+
+    exit(EXIT_FAILURE);
+  }
+
+  // Parse the (assumed) HTML code
+
+  parseHtml(buffer, title);
+
+  // Display the extracted title
+
+  printf("Title: %s\n", title.c_str());
+
+  return EXIT_SUCCESS;
+}
--- a/docs/examples/http-post.c
+++ b/docs/examples/http-post.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
--- a/docs/examples/httpput.c
+++ b/docs/examples/httpput.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
@@ -19,6 +19,9 @@
 * line argument to the URL also given on the command line.
 *
 * This example also uses its own read callback.
+ *
+ * Here's an article on how to setup a PUT handler for Apache:
+ * http://www.apacheweek.com/features/put
 */

 size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream)
@@ -39,7 +42,6 @@ int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
-  FILE *ftpfile;
  FILE * hd_src ;
  int hd ;
  struct stat file_info;
@@ -49,17 +51,17 @@ int main(int argc, char **argv)

  if(argc < 3)
    return 1;
- 
+
  file= argv[1];
  url = argv[2];
-  
+
  /* get the file size of the local file */
  hd = open(file, O_RDONLY) ;
  fstat(hd, &file_info);
  close(hd) ;

  /* get a FILE * of the same file, could also be made with
-     fdopen() from the previous descriptor, but hey this is just 
+     fdopen() from the previous descriptor, but hey this is just
     an example! */
  hd_src = fopen(file, "rb");

--- a/docs/examples/https.c
+++ b/docs/examples/https.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
--- a/docs/examples/makefile.dj
+++ b/docs/examples/makefile.dj
@@ -1,33 +1,33 @@
-#
-#  Adapted for djgpp / Watt-32 / DOS by
-#  Gisle Vanem <giva@bgnett.no>
-#
-
-include ../../packages/DOS/common.dj
-
-CFLAGS += -I../../include -DFALSE=0 -DTRUE=1
-
-LIBS = ../../lib/libcurl.a
-
-ifeq ($(USE_SSL),1)
-  LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a
-endif
-
-LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a
-
-PROGRAMS  = fopen.exe ftpget.exe ftpgetresp.exe ftpupload.exe \
-            getinmemory.exe http-post.exe httpput.exe multi-app.exe \
-            multi-double.exe multi-post.exe multi-single.exe \
-            persistant.exe post-callback.exe postit2.exe \
-            sepheaders.exe simple.exe simplessl.exe https.exe \
-            ftp3rdparty.exe getinfo.exe
-
-all: $(PROGRAMS)
-
-%.exe: %.c
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-	@echo
-
-clean:
-	rm -f $(PROGRAMS)
-
+#
+#  Adapted for djgpp / Watt-32 / DOS by
+#  Gisle Vanem <giva@bgnett.no>
+#
+
+include ../../packages/DOS/common.dj
+
+CFLAGS += -I../../include -DFALSE=0 -DTRUE=1
+
+LIBS = ../../lib/libcurl.a
+
+ifeq ($(USE_SSL),1)
+  LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a
+endif
+
+LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a
+
+PROGRAMS  = fopen.exe ftpget.exe ftpgetresp.exe ftpupload.exe \
+            getinmemory.exe http-post.exe httpput.exe multi-app.exe \
+            multi-double.exe multi-post.exe multi-single.exe \
+            persistant.exe post-callback.exe postit2.exe \
+            sepheaders.exe simple.exe simplessl.exe https.exe \
+            ftp3rdparty.exe getinfo.exe anyauthput.exe
+
+all: $(PROGRAMS)
+
+%.exe: %.c
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+	@echo
+
+clean:
+	rm -f $(PROGRAMS)
+
--- a/docs/examples/multi-post.c
+++ b/docs/examples/multi-post.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
--- a/docs/examples/multithread.c
+++ b/docs/examples/multithread.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
@@ -15,7 +15,15 @@
 #include <pthread.h>
 #include <curl/curl.h>

-/* silly list of test-URLs */
+/*
+  List of URLs to fetch.
+
+  If you intend to use a SSL-based protocol here you MUST setup the OpenSSL
+  callback functions as described here:
+
+  http://www.openssl.org/docs/crypto/threads.html#DESCRIPTION
+
+*/
 char *urls[]= {
  "http://curl.haxx.se/",
  "ftp://cool.haxx.se/",
@@ -28,17 +36,15 @@ void *pull_one_url(void *url)
  CURL *curl;

  curl = curl_easy_init();
-
  curl_easy_setopt(curl, CURLOPT_URL, url);
-  curl_easy_perform(curl);
-
+  curl_easy_perform(curl); /* ignores error */
  curl_easy_cleanup(curl);

  return NULL;
 }


-/* 
+/*
   int pthread_create(pthread_t *new_thread_ID,
   const pthread_attr_t *attr,
   void * (*start_func)(void *), void *arg);
@@ -56,7 +62,7 @@ int main(int argc, char **argv)
                           urls[i]);
    if(0 != error)
      fprintf(stderr, "Couldn't run thread number %d, errno %d\n", i, error);
-    else 
+    else
      fprintf(stderr, "Thread %d, gets %s\n", i, urls[i]);
  }

--- a/docs/examples/opensslthreadlock.c
+++ b/docs/examples/opensslthreadlock.c
@@ -0,0 +1,77 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Example source code to show one way to set the necessary OpenSSL locking
+ * callbacks if you want to do multi-threaded transfers with HTTPS/FTPS with
+ * libcurl built to use OpenSSL.
+ *
+ * This is not a complete stand-alone example.
+ *
+ * Author: Jeremy Brown
+ */
+
+#define MUTEX_TYPE       pthread_mutex_t
+#define MUTEX_SETUP(x)   pthread_mutex_init(&(x), NULL)
+#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x))
+#define MUTEX_LOCK(x)    pthread_mutex_lock(&(x))
+#define MUTEX_UNLOCK(x)  pthread_mutex_unlock(&(x))
+#define THREAD_ID        pthread_self(  )
+
+
+void handle_error(const char *file, int lineno, const char *msg){
+     fprintf(stderr, ** %s:%i %s\n, file, lineno, msg);
+     ERR_print_errors_fp(stderr);
+     /* exit(-1); */
+ }
+
+/* This array will store all of the mutexes available to OpenSSL. */
+static MUTEX_TYPE *mutex_buf= NULL;
+
+
+static void locking_function(int mode, int n, const char * file, int line)
+{
+  if (mode & CRYPTO_LOCK)
+    MUTEX_LOCK(mutex_buf[n]);
+  else
+    MUTEX_UNLOCK(mutex_buf[n]);
+}
+
+static unsigned long id_function(void)
+{
+  return ((unsigned long)THREAD_ID);
+}
+
+int thread_setup(void)
+{
+  int i;
+
+  mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks(  ) * sizeof(MUTEX_TYPE));
+  if (!mutex_buf)
+    return 0;
+  for (i = 0;  i < CRYPTO_num_locks(  );  i++)
+    MUTEX_SETUP(mutex_buf[i]);
+  CRYPTO_set_id_callback(id_function);
+  CRYPTO_set_locking_callback(locking_function);
+  return 1;
+}
+
+int thread_cleanup(void)
+{
+  int i;
+
+  if (!mutex_buf)
+    return 0;
+  CRYPTO_set_id_callback(NULL);
+  CRYPTO_set_locking_callback(NULL);
+  for (i = 0;  i < CRYPTO_num_locks(  );  i++)
+    MUTEX_CLEANUP(mutex_buf[i]);
+  free(mutex_buf);
+  mutex_buf = NULL;
+  return 1;
+}
--- a/docs/examples/persistant.c
+++ b/docs/examples/persistant.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
--- a/docs/examples/simplepost.c
+++ b/docs/examples/simplepost.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -52,7 +52,7 @@ PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.pdf			\

 CLEANFILES = $(HTMLPAGES) $(PDFPAGES)

-EXTRA_DIST = $(man_MANS) $(HTMLPAGES) index.html $(PDFPAGES)
+EXTRA_DIST = $(man_MANS) $(HTMLPAGES) index.html $(PDFPAGES) libcurl.m4

 MAN2HTML= roffit --mandir=. < $< >$@

--- a/docs/libcurl/curl_easy_getinfo.3
+++ b/docs/libcurl/curl_easy_getinfo.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_easy_getinfo 3 "20 Aug 2003" "libcurl 7.10.8" "libcurl Manual"
+.TH curl_easy_getinfo 3 "22 Dec 2004" "libcurl 7.12.3" "libcurl Manual"
 .SH NAME
 curl_easy_getinfo - extract information from a curl handle
 .SH SYNOPSIS
@@ -12,13 +12,12 @@ curl_easy_getinfo - extract information from a curl handle

 .SH DESCRIPTION
 Request internal information from the curl session with this function.  The
-third argument
-.B MUST
-be a pointer to a long, a pointer to a char * or a pointer to a double (as
-this documentation describes further down).  The data pointed-to will be
-filled in accordingly and can be relied upon only if the function returns
-CURLE_OK.  This function is intended to get used *AFTER* a performed transfer,
-all results from this function are undefined until the transfer is completed.
+third argument \fBMUST\fP be a pointer to a long, a pointer to a char *, a
+pointer to a struct curl_slist * or a pointer to a double (as this
+documentation describes further down).  The data pointed-to will be filled in
+accordingly and can be relied upon only if the function returns CURLE_OK.
+This function is intended to get used AFTER a performed transfer, all results
+from this function are undefined until the transfer is completed.

 You should not free the memory returned by this function unless it is
 explictly mentioned below.
@@ -28,7 +27,13 @@ The following information can be extracted:
 Pass a pointer to a 'char *' to receive the last used effective URL.
 .IP CURLINFO_RESPONSE_CODE
 Pass a pointer to a long to receive the last received HTTP or FTP code. This
-option was known as CURLINFO_HTTP_CODE in libcurl 7.10.7 and earlier.
+option was known as CURLINFO_HTTP_CODE in libcurl 7.10.7 and earlier. This
+will be zero if no server response code has been received. Note that a proxy's
+CONNECT response should be read with \fICURLINFO_HTTP_CONNECTCODE\fP and not
+this.
+.IP CURLINFO_HTTP_CONNECTCODE
+Pass a pointer to a long to receive the last received proxy response code to a
+CONNECT request.
 .IP CURLINFO_FILETIME
 Pass a pointer to a long to receive the remote time of the retrieved
 document. If you get -1, it can be because of many reasons (unknown, the
@@ -89,6 +94,13 @@ than one request if FOLLOWLOCATION is true.
 Pass a pointer to a long to receive the result of the certification
 verification that was requested (using the CURLOPT_SSL_VERIFYPEER option to
 \fIcurl_easy_setopt(3)\fP).
+.IP CURLINFO_SSL_ENGINES
+Pass the address of a 'struct curl_slist *' to receive a linked-list of
+OpenSSL crypto-engines supported. Note that engines are normally implemented
+in separate dynamic libraries. Hence not all the returned engines may be
+available at run-time. \fBNOTE:\fP you must call \fIcurl_slist_free_all(3)\fP
+on the list pointer once you're done with it, as libcurl will not free the
+data for you. (Added in 7.12.3)
 .IP CURLINFO_CONTENT_LENGTH_DOWNLOAD
 Pass a pointer to a double to receive the content-length of the download. This
 is the value read from the Content-Length: field.
@@ -113,6 +125,13 @@ method(s) available for your proxy authentication.  (Added in 7.10.8)
 .IP CURLINFO_OS_ERRNO
 Pass a pointer to a long to receive the errno variable from a connect failure.
 (Added in 7.12.2)
+.IP CURLINFO_NUM_CONNECTS
+Pass a pointer to a long to receive how many new connections libcurl had to
+create to achieve the previous transfer (only the successful connects are
+counted).  Combined with \fICURLINFO_REDIRECT_COUNT\fP you are able to know
+how many times libcurl successfully reused existing connection(s) or not.  See
+the Connection Options of \fIcurl_easy_setopt(3)\fP to see how libcurl tries
+to make persistent connections to save time.  (Added in 7.12.3)
 .SH RETURN VALUE
 If the operation was successful, CURLE_OK is returned. Otherwise an
 appropriate error code will be returned.
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -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
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH curl_easy_setopt 3 "12 Mar 2004" "libcurl 7.11.1" "libcurl Manual"
+.TH curl_easy_setopt 3 "12 May 2005" "libcurl 7.14.0" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - set options for a curl easy handle
 .SH SYNOPSIS
@@ -142,6 +142,18 @@ don't specify a read callback, this must be a valid FILE *.

 This option is also known with the older name \fICURLOPT_INFILE\fP, the name
 \fICURLOPT_READDATA\fP was introduced in 7.9.7.
+.IP CURLOPT_IOCTLFUNCTION
+Function pointer that should match the \fIcurl_ioctl_callback\fP prototype
+found in \fI<curl/curl.h>\fP. This function gets called by libcurl when
+something special I/O-related needs to be done that the library can't do by
+itself. For now, rewinding the read data stream is the only action it can
+request. The rewinding of the read data stream may be necessary when doing a
+HTTP PUT or POST with a multi-pass authentication method.  (Opion added in
+7.12.3)
+.IP CURLOPT_IOCTLDATA
+Pass a pointer that will be untouched by libcurl and passed as the 3rd
+argument in the ioctl callback set with \fICURLOPT_IOCTLFUNCTION\fP.  (Option
+added in 7.12.3)
 .IP CURLOPT_PROGRESSFUNCTION
 Function pointer that should match the \fIcurl_progress_callback\fP prototype
 found in \fI<curl/curl.h>\fP. This function gets called by libcurl instead of
@@ -398,7 +410,7 @@ is a more secure way to do authentication over public networks than the
 regular old-fashioned Basic method.
 .IP CURLAUTH_GSSNEGOTIATE
 HTTP GSS-Negotiate authentication. The GSS-Negotiate (also known as plain
-"Negotiate") method was designed by Microsoft and is used in their web
+\&"Negotiate") method was designed by Microsoft and is used in their web
 applications. It is primarily meant as a support for Kerberos5 authentication
 but may be also used along with another authentication methods. For more
 information see IETF draft draft-brezak-spnego-http-04.txt.
@@ -430,7 +442,7 @@ use. Note that for some methods, this will induce an extra network
 round-trip. Set the actual name and password with the
 \fICURLOPT_PROXYUSERPWD\fP option. The bitmask can be constructed by or'ing
 together the bits listed above for the \fICURLOPT_HTTPAUTH\fP option. As of
-this writing, only Basic and NTLM work. (Added in 7.10.7)
+this writing, only Basic, Digest and NTLM work. (Added in 7.10.7)
 .SH HTTP OPTIONS
 .IP CURLOPT_AUTOREFERER
 Pass a non-zero parameter to enable this. When enabled, libcurl will
@@ -479,9 +491,13 @@ application/x-www-form-urlencoded" header. (This is by far the most commonly
 used POST method).

 Use the \fICURLOPT_POSTFIELDS\fP option to specify what data to post and
-\fICURLOPT_POSTFIELDSIZE\fP to set the data size. Optionally, you can provide
-data to POST using the \fICURLOPT_READFUNCTION\fP and \fICURLOPT_READDATA\fP
-options.
+\fICURLOPT_POSTFIELDSIZE\fP to set the data size.
+
+Optionally, you can provide data to POST using the \fICURLOPT_READFUNCTION\fP
+and \fICURLOPT_READDATA\fP options but then you must make sure to not set
+\fICURLOPT_POSTFIELDS\fP to anything but NULL. When providing data with a
+callback, you must transmit it using chunked transfer-encoding or you must set
+the size of the data with the \fICURLOPT_POSTFIELDSIZE\fP option.

 You can override the default POST Content-Type: header by setting your own
 with \fICURLOPT_HTTPHEADER\fP.
@@ -518,7 +534,7 @@ the \fICURLOPT_HTTPPOST\fP option.
 If you want to post data to the server without letting libcurl do a strlen()
 to measure the data size, this option must be used. When this option is used
 you can post fully binary data, which otherwise is likely to fail. If this
-size is set to zero, the library will use strlen() to get the size.
+size is set to -1, the library will use strlen() to get the size.
 .IP CURLOPT_POSTFIELDSIZE_LARGE
 Pass a curl_off_t as parameter. Use this to set the size of the
 \fICURLOPT_POSTFIELDS\fP data to prevent libcurl from doing strlen() on the
@@ -527,11 +543,10 @@ data to figure out the size. This is the large file version of the
 .IP CURLOPT_HTTPPOST
 Tells libcurl you want a multipart/formdata HTTP POST to be made and you
 instruct what data to pass on to the server.  Pass a pointer to a linked list
-of HTTP post structs as parameter.  The linked list should be a fully valid
-list of 'struct HttpPost' structs properly filled in. The best and most
-elegant way to do this, is to use \fIcurl_formadd(3)\fP as documented. The
-data in this list must remain intact until you close this curl handle again
-with \fIcurl_easy_cleanup(3)\fP.
+of curl_httppost structs as parameter. . The easiest way to create such a
+list, is to use \fIcurl_formadd(3)\fP as documented. The data in this list
+must remain intact until you close this curl handle again with
+\fIcurl_easy_cleanup(3)\fP.

 Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
 You can disable this header with \fICURLOPT_HTTPHEADER\fP as usual.
@@ -602,9 +617,9 @@ name of your file holding cookie data to read. The cookie data may be in
 Netscape / Mozilla cookie data format or just regular HTTP-style headers
 dumped to a file.

-Given an empty or non-existing file, this option will enable cookies for this
-curl handle, making it understand and parse received cookies and then use
-matching cookies in future request.
+Given an empty or non-existing file or by passing the empty string (""), this
+option will enable cookies for this curl handle, making it understand and
+parse received cookies and then use matching cookies in future request.
 .IP CURLOPT_COOKIEJAR
 Pass a file name as char *, zero terminated. This will make libcurl write all
 internally known cookies to the specified file when \fIcurl_easy_cleanup(3)\fP
@@ -690,11 +705,15 @@ LPRT) command when doing active FTP downloads (which is enabled by
 \fICURLOPT_FTPPORT\fP). Using EPRT means that it will first attempt to use
 EPRT and then LPRT before using PORT, but if you pass FALSE (zero) to this
 option, it will not try using EPRT or LPRT, only plain PORT. (Added in 7.10.5)
+
+If the server is an IPv6 host, this option will have no effect as of 7.12.3.
 .IP CURLOPT_FTP_USE_EPSV
 Pass a long. If the value is non-zero, it tells curl to use the EPSV command
 when doing passive FTP downloads (which it always does by default). Using EPSV
 means that it will first attempt to use EPSV before using PASV, but if you
 pass FALSE (zero) to this option, it will not try using EPSV, only plain PASV.
+
+If the server is an IPv6 host, this option will have no effect as of 7.12.3.
 .IP CURLOPT_FTP_CREATE_MISSING_DIRS
 Pass a long. If the value is non-zero, curl will attempt to create any remote
 directory that it fails to CWD into. CWD is the command that changes working
@@ -723,7 +742,7 @@ Require SSL for all communication or fail with \fICURLE_FTP_SSL_FAILED\fP.
 .IP CURLOPT_FTPSSLAUTH
 Pass a long using one of the values from below, to alter how libcurl issues
 \&"AUTH TLS" or "AUTH SSL" when FTP over SSL is activated (see
-\fICURLOPT_FTP_SSL\fP).
+\fICURLOPT_FTP_SSL\fP). (Added in 7.12.2)
 .RS
 .IP CURLFTPAUTH_DEFAULT
 Allow libcurl to decide
@@ -732,6 +751,22 @@ Try "AUTH SSL" first, and only if that fails try "AUTH TLS"
 .IP CURLFTPAUTH_TLS
 Try "AUTH TLS" first, and only if that fails try "AUTH SSL"
 .RE
+.IP CURLOPT_SOURCE_URL
+When set, it enables a FTP third party transfer, using the set URL as source,
+while \fICURLOPT_URL\fP is the target.
+.IP CURLOPT_SOURCE_USERPWD
+Set "username:password" to use for the source connection when doing FTP third
+party transfers.
+.IP CURLOPT_SOURCE_QUOTE
+Exactly like \fICURLOPT_QUOTE\fP, but for the source host.
+.IP CURLOPT_SOURCE_PREQUOTE
+Exactly like \fICURLOPT_PREQUOTE\fP, but for the source host.
+.IP CURLOPT_SOURCE_POSTQUOTE
+Exactly like \fICURLOPT_POSTQUOTE\fP, but for the source host.
+.IP CURLOPT_FTP_ACCOUNT
+Pass a pointer to a zero-terminated string (or NULL to disable). When an FTP
+server asks for "account data" after user name and password has been provided,
+this data is sent off using the ACCT command. (Added in 7.13.0)
 .SH PROTOCOL OPTIONS
 .IP CURLOPT_TRANSFERTEXT
 A non-zero parameter tells the library to use ASCII mode for ftp transfers,
@@ -961,28 +996,60 @@ operations.
 \fBNOTE:\fP If the crypto device cannot be set,
 \fICURLE_SSL_ENGINE_SETFAILED\fP is returned.
 .IP CURLOPT_SSLVERSION
-Pass a long as parameter. Set what version of SSL to attempt to use, 2 or
-3. By default, the SSL library will try to solve this by itself although some
-servers make this difficult why you at times may have to use this option.
+Pass a long as parameter to control what version of SSL/TLS to attempt to use.
+The available options are:
+.RS
+.IP CURL_SSLVERSION_DEFAULT
+The default action. When libcurl built with OpenSSL, this will attempt to
+figure out the remote SSL protocol version. Unfortunately there are a lot of
+ancient and broken servers in use which cannot handle this technique and will
+fail to connect. When libcurl is built with GnuTLS, this will mean SSLv3.
+.IP CURL_SSLVERSION_TLSv1
+Force TLSv1
+.IP CURL_SSLVERSION_SSLv2
+Force SSLv2
+.IP CURL_SSLVERSION_SSLv3
+Force SSLv3
+.RE
 .IP CURLOPT_SSL_VERIFYPEER
-Pass a long that is set to a zero value to stop curl from verifying the peer's
-certificate (7.10 starting setting this option to non-zero by default).
-Alternate certificates to verify against can be specified with the
-\fICURLOPT_CAINFO\fP option or a certificate directory can be specified with
-the \fICURLOPT_CAPATH\fP option.  As of 7.10, curl installs a default bundle.
-\fICURLOPT_SSL_VERIFYHOST\fP may also need to be set to 1 or 0 if
-\fICURLOPT_SSL_VERIFYPEER\fP is disabled (it defaults to 2).
+Pass a long as parameter.
+
+This option determines whether curl verifies the authenticity of the
+peer's certificate.  A nonzero value means curl verifies; zero means it
+doesn't.  The default is nonzero, but before 7.10, it was zero.
+
+When negotiating an SSL connection, the server sends a certificate
+indicating its identity.  Curl verifies whether the certificate is
+authentic, i.e. that you can trust that the server is who the
+certificate says it is.  This trust is based on a chain of digital
+signatures, rooted in certification authority (CA) certificates you
+supply.  As of 7.10, curl installs a default bundle of CA certificates
+and you can specify alternate certificates with the
+\fICURLOPT_CAINFO\fP option or the \fICURLOPT_CAPATH\fP option.
+
+When \fICURLOPT_SSL_VERIFYPEER\fP is nonzero, and the verification
+fails to prove that the certificate is authentic, the connection
+fails.  When the option is zero, the connection succeeds regardless.
+
+Authenticating the certificate is not by itself very useful.  You
+typically want to ensure that the server, as authentically identified
+by its certificate, is the server you mean to be talking to.  Use
+\fICURLOPT_SSL_VERIFYHOST\fP to control that.
 .IP CURLOPT_CAINFO
 Pass a char * to a zero terminated string naming a file holding one or more
-certificates to verify the peer with. This only makes sense when used in
-combination with the \fICURLOPT_SSL_VERIFYPEER\fP option.
+certificates to verify the peer with.  This makes sense only when used in
+combination with the \fICURLOPT_SSL_VERIFYPEER\fP option.  If
+\fICURLOPT_SSL_VERIFYPEER\fP is zero, \fICURLOPT_CAINFO\fP need not
+even indicate an accessible file.
 .IP CURLOPT_CAPATH
-Pass a char * to a zero terminated string naming a directory holding multiple
-CA certificates to verify the peer with. The certificate directory must be
-prepared using the openssl c_rehash utility. This only makes sense when used
-in combination with the \fICURLOPT_SSL_VERIFYPEER\fP option. The
-\fICURLOPT_CAPATH\fP function apparently does not work in Windows due to some
-limitation in openssl. (Added in 7.9.8)
+Pass a char * to a zero terminated string naming a directory holding
+multiple CA certificates to verify the peer with. The certificate
+directory must be prepared using the openssl c_rehash utility. This
+makes sense only when used in combination with the
+\fICURLOPT_SSL_VERIFYPEER\fP option.  If \fICURLOPT_SSL_VERIFYPEER\fP
+is zero, \fICURLOPT_CAPATH\fP need not even indicate an accessible
+path.  The \fICURLOPT_CAPATH\fP function apparently does not work in
+Windows due to some limitation in openssl. (Added in 7.9.8)
 .IP CURLOPT_RANDOM_FILE
 Pass a char * to a zero terminated file name. The file will be used to read
 from to seed the random engine for SSL. The more random the specified file is,
@@ -991,9 +1058,34 @@ the more secure the SSL connection will become.
 Pass a char * to the zero terminated path name to the Entropy Gathering Daemon
 socket. It will be used to seed the random engine for SSL.
 .IP CURLOPT_SSL_VERIFYHOST
-Pass a long. Set if we should verify the Common name from the peer certificate
-in the SSL handshake, set 1 to check existence, 2 to ensure that it matches
-the provided hostname. This is by default set to 2. (default changed in 7.10)
+Pass a long as parameter.
+
+This option determines whether curl verifies that the server claims to be
+who you want it to be.
+
+When negotiating an SSL connection, the server sends a certificate
+indicating its identity.
+
+When \fICURLOPT_SSL_VERIFYHOST\fP is 2, that certificate must indicate
+that the server is the server to which you meant to connect, or the
+connection fails.
+
+Curl considers the server the intended one when the Common Name field
+or a Subject Alternate Name field in the certificate matches the host
+name in the URL to which you told Curl to connect.
+
+When the value is 1, the certificate must contain a Common Name field,
+but it doesn't matter what name it says.  (This is not ordinarily a
+useful setting).
+
+When the value is 0, the connection succeeds regardless of the names in
+the certificate.
+
+The default, since 7.10, is 2.
+
+The checking this option controls is of the identity that the server
+\fIclaims\fP.  The server could be lying.  To control lying, see
+\fICURLOPT_SSL_VERIFYPEER\fP.
 .IP CURLOPT_SSL_CIPHER_LIST
 Pass a char *, pointing to a zero terminated string holding the list of
 ciphers to use for the SSL connection. The list must be syntactically correct,
--- a/docs/libcurl/curl_formadd.3
+++ b/docs/libcurl/curl_formadd.3
@@ -35,28 +35,28 @@ is made for file upload, there are also a stored CONTENT-TYPE and a
 FILENAME. Below here, we'll discuss on what options you use to set these
 properties in the parts you want to add to your post.
 .SH OPTIONS
-.B CURLFORM_COPYNAME
+.IP CURLFORM_COPYNAME
 followed by string is used to set the name of this part. libcurl copies the
 given data, so your application doesn't need to keep it around after this
 function call. If the name isn't zero terminated properly, or if you'd like it
 to contain zero bytes, you need to set the length of the name with
 \fBCURLFORM_NAMELENGTH\fP.

-.B CURLFORM_PTRNAME
+.IP CURLFORM_PTRNAME
 followed by a string is used for the name of this part. libcurl will use the
 pointer and refer to the data in your application, you must make sure it
 remains until curl no longer needs it. If the name isn't zero terminated
 properly, or if you'd like it to contain zero bytes, you need to set the
 length of the name with \fBCURLFORM_NAMELENGTH\fP.

-.B CURLFORM_COPYCONTENTS
+.IP CURLFORM_COPYCONTENTS
 followed by a string is used for the contents of this part, the actual data to
 send away. libcurl copies the given data, so your application doesn't need to
 keep it around after this function call. If the data isn't zero terminated
 properly, or if you'd like it to contain zero bytes, you need to set the
 length of the name with \fBCURLFORM_CONTENTSLENGTH\fP.

-.B CURLFORM_PTRCONTENTS
+.IP CURLFORM_PTRCONTENTS
 followed by a string is used for the contents of this part, the actual data to
 send away. libcurl will use the pointer and refer to the data in your
 application, you must make sure it remains until curl no longer needs it. If
@@ -64,11 +64,14 @@ the data isn't zero terminated properly, or if you'd like it to contain zero
 bytes, you need to set the length of the name with
 \fBCURLFORM_CONTENTSLENGTH\fP.

-.B CURLFORM_FILECONTENT
+.IP CURLFORM_CONTENTSLENGTH
+followed by a long setting the length of the contents.
+
+.IP CURLFORM_FILECONTENT
 followed by a file name, makes that file read and the contents will be used in
 as data in this part.

-.B CURLFORM_FILE
+.IP CURLFORM_FILE
 followed by a file name, makes this part a file upload part. It sets the file
 name field to the actual file name used here, it gets the contents of the file
 and passes as data and sets the content-type if the given file match one of
@@ -77,32 +80,33 @@ send one or more files in one part by providing multiple \fBCURLFORM_FILE\fP
 arguments each followed by the filename (and each CURLFORM_FILE is allowed to
 have a CURLFORM_CONTENTTYPE).

-.B CURLFORM_CONTENTTYPE
+.IP CURLFORM_CONTENTTYPE
 followed by a pointer to a string with a content-type will make curl use this
 given content-type for this file upload part, possibly instead of an
 internally chosen one.

-.B CURLFORM_FILENAME
+.IP CURLFORM_FILENAME
 followed by a pointer to a string to a name, will make libcurl use the given
 name in the file upload part, instead of the actual file name given to
 \fICURLFORM_FILE\fP.

-.B BCURLFORM_BUFFER
+.IP BCURLFORM_BUFFER
 followed by a string, tells libcurl that a buffer is to be used to upload data
 instead of using a file. The given string is used as the value of the file
 name field in the content header.

-.B CURLFORM_BUFFERPTR
+.IP CURLFORM_BUFFERPTR
 followed by a pointer to a data area, tells libcurl the address of the buffer
 containing data to upload (as indicated with \fICURLFORM_BUFFER\fP). The
 buffer containing this data must not be freed until after
-\fIcurl_easy_cleanup(3)\fP is called.
+\fIcurl_easy_cleanup(3)\fP is called. You must also use
+\fICURLFORM_BUFFERLENGTH\fP to set the length of the given buffer area.

-.B CURLFORM_BUFFERLENGTH
+.IP CURLFORM_BUFFERLENGTH
 followed by a long with the size of the \fICURLFORM_BUFFERPTR\fP data area,
 tells libcurl the length of the buffer to upload.

-.B CURLFORM_ARRAY
+.IP CURLFORM_ARRAY
 Another possibility to send options to curl_formadd() is the
 \fBCURLFORM_ARRAY\fP option, that passes a struct curl_forms array pointer as
 its value. Each curl_forms structure element has a CURLformoption and a char
@@ -110,7 +114,7 @@ pointer. The final element in the array must be a CURLFORM_END. All available
 options can be used in an array, except the CURLFORM_ARRAY option itself!  The
 last argument in such an array must always be \fBCURLFORM_END\fP.

-.B CURLFORM_CONTENTHEADER
+.IP CURLFORM_CONTENTHEADER
 specifies extra headers for the form POST section.  This takes a curl_slist
 prepared in the usual way using \fBcurl_slist_append\fP and appends the list
 of headers to those libcurl automatically generates. The list must exist while
--- a/docs/libcurl/curl_getdate.3
+++ b/docs/libcurl/curl_getdate.3
@@ -9,7 +9,7 @@ curl_getdate - Convert an date string to number of seconds since January 1,
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "time_t curl_getdate(char *" datestring ", time_t *"now" );"
+.BI "time_t curl_getdate(char *" datestring ", time_t *"now " );"
 .ad
 .SH DESCRIPTION
 This function returns the number of seconds since January 1st 1970 in the UTC
@@ -41,9 +41,9 @@ general you should instead use the specific relative time compared to
 UTC. Supported formats include: -1200, MST, +0100.
 .TP
 .B day of the week items
-Specifies a day of the week. Days of the week may be spelled out in full:
-`Sunday', `Monday', etc or they may be abbreviated to their first three
-letters. This is usually not info that adds anything.
+Specifies a day of the week. Days of the week may be spelled out in full
+(using english): `Sunday', `Monday', etc or they may be abbreviated to their
+first three letters. This is usually not info that adds anything.
 .TP
 .B pure numbers
 If a decimal number of the form YYYYMMDD appears, then YYYY is read as the
@@ -83,6 +83,14 @@ only ones RFC2616 says HTTP applications may use.
 .SH RETURN VALUE
 This function returns -1 when it fails to parse the date string. Otherwise it
 returns the number of seconds as described.
+
+If the year is larger than 2037 on systems with 32 bit time_t, this function
+will return 0x7fffffff (since that is the largest possible signed 32 bit
+number).
+
+Having a 64 bit time_t is not a guarantee that dates beyond 03:14:07 UTC,
+January 19, 2038 will work fine. On systems with a 64 bit time_t but with a
+crippled mktime(), \fIcurl_getdate\fP will return -1 in this case.
 .SH REWRITE
 The former version of this function was built with yacc and was not only very
 large, it was also never quite understood and it wasn't possible to build with
--- a/docs/libcurl/curl_multi_fdset.3
+++ b/docs/libcurl/curl_multi_fdset.3
@@ -1,6 +1,6 @@
 .\" $Id$
 .\"
-.TH curl_multi_fdset 3 "15 Apr 2004" "libcurl 7.9.5" "libcurl Manual"
+.TH curl_multi_fdset 3 "25 Apr 2005" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_fdset - extracts file descriptor information from a multi handle
 .SH SYNOPSIS
@@ -15,19 +15,21 @@ CURLMcode curl_multi_fdset(CURLM *multi_handle,
 .ad
 .SH DESCRIPTION
 This function extracts file descriptor information from a given multi_handle.
-libcurl returns its fd_set sets. The application can use these to select()
-on. The \fIcurl_multi_perform(3)\fI function should be called as soon as one
-of them are ready to be read from or written to.
+libcurl returns its fd_set sets. The application can use these to select() on,
+but be sure to FD_ZERO them before calling this function as
+\fIcurl_multi_fdset(3)\fP only adds its own descriptors it doesn't zero or
+otherwise remove any other. The \fIcurl_multi_perform(3)\fP function should be
+called as soon as one of them are ready to be read from or written to.

-NOTE that once this call is made, you must not remove the sets you point to,
-as libcurl will need to be able to read them. It needs them after select()
-calls, to know if certain sockets are readable or writable.
+If no file descriptors are set by libcurl, \fImax_fd\fP will contain -1 when
+this function returns. Otherwise it will contain the higher descriptor number
+libcurl set.

 You should also be aware that when doing select(), you should consider using a
 rather small (single-digit number of seconds) timeout and call
 \fIcurl_multi_perform\fP regularly - even if no activity has been seen on the
 fd_sets - as otherwise libcurl-internal retries and timeouts may not work as
-you'd think.
+you'd think and want.
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code. See
 \fIlibcurl-errors(3)\fP
--- a/docs/libcurl/curl_multi_info_read.3
+++ b/docs/libcurl/curl_multi_info_read.3
@@ -1,6 +1,6 @@
 .\" $Id$
 .\"
-.TH curl_multi_info_read 3 "27 Feb 2002" "libcurl 7.10.3" "libcurl Manual"
+.TH curl_multi_info_read 3 "18 Dec 2004" "libcurl 7.10.3" "libcurl Manual"
 .SH NAME
 curl_multi_info_read - read multi stack informationals
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ integer pointed to with \fImsgs_in_queue\fP will contain the number of
 remaining messages after this function was called.

 The data the returned pointer points to will not survive calling
-\fIcurl_multi_cleanup(3)\fP.
+\fIcurl_multi_cleanup(3)\fP or \fIcurl_multi_remove_handle(3)\fP.

 The 'CURLMsg' struct is very simple and only contain very basic information.
 If more involved information is wanted, the particular "easy handle" in
--- a/docs/libcurl/curl_version_info.3
+++ b/docs/libcurl/curl_version_info.3
@@ -1,8 +1,6 @@
-.\" You can view this file with:
-.\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_version_info 3 "11 May 2004" "libcurl 7.12" "libcurl Manual"
+.TH curl_version_info 3 "11 Mar 2005" "libcurl 7.13.2" "libcurl Manual"
 .SH NAME
 curl_version_info - returns run-time libcurl version info
 .SH SYNOPSIS
@@ -36,7 +34,7 @@ typedef struct {
  const char *host;         /* human readable string */
  int features;             /* bitmask, see below */
  char *ssl_version;        /* human readable string */
-  long ssl_version_num;     /* number */
+  long ssl_version_num;     /* not used, always zero */
  const char *libz_version; /* human readable string */
  const char **protocols;   /* list of protocols */

@@ -73,9 +71,9 @@ supports IPv6
 .IP CURL_VERSION_KERBEROS4
 supports kerberos4 (when using FTP)
 .IP CURL_VERSION_SSL
-supports SSL (HTTPS/FTPS)
+supports SSL (HTTPS/FTPS) (Added in 7.10)
 .IP CURL_VERSION_LIBZ
-supports HTTP deflate using libz
+supports HTTP deflate using libz (Added in 7.10)
 .IP CURL_VERSION_NTLM
 supports HTTP NTLM (added in 7.10.6)
 .IP CURL_VERSION_GSSNEGOTIATE
@@ -91,10 +89,15 @@ interface. (added in 7.10.7)
 libcurl was built with support for SPNEGO authentication (Simple and Protected
 GSS-API Negotiation Mechanism, defined in RFC 2478.) (added in 7.10.8)
 .IP CURL_VERSION_LARGEFILE
-libcurl was built with support for large files.
+libcurl was built with support for large files. (Added in 7.11.1)
 .IP CURL_VERSION_IDN
 libcurl was built with support for IDNA, domain names with international
-letters.
+letters. (Added in 7.12.0)
+.IP CURL_VERSION_SSPI
+libcurl was built with support for SSPI. This is only available on Windows and
+makes libcurl use Windows-provided functions for NTLM authentication. It also
+allows libcurl to use the current user and the current user's password without
+the app having to pass them on. (Added in 7.13.2)
 .RE
 \fIssl_version\fP is an ascii string for the OpenSSL version used. If libcurl
 has no SSL support, this is NULL.
--- a/Show More
+++ b/Show More