7.13 coming up

somewhat nicer libcurl usage
htmltitle
2005-02-01 07:54:36 +00:00 · 2005-01-31 20:03:01 +00:00 · 2005-01-31 18:23:42 +00:00 · 2005-01-31 18:22:40 +00:00 · 2005-01-30 22:57:19 +00:00 · 2005-01-30 22:54:06 +00:00
646 changed files with 38966 additions and 25008 deletions
--- a/3287
+++ b/3287
--- a/CHANGES.2003
+++ b/CHANGES.2003
--- a/6
+++ b/6
@@ -15,12 +15,6 @@ Compile and build instructions follow below.
  CHANGES.0     contains ancient changes.
  CHANGES.$year contains changes for the particular year.

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

  perl/         is a subdirectory with various perl scripts
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,8 @@

 AUTOMAKE_OPTIONS = foreign

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

 bin_SCRIPTS = curl-config

@@ -54,6 +54,9 @@ test:
 test-full:
 	@(cd tests; $(MAKE) all full-test)

+test-torture:
+	@(cd tests; $(MAKE) all torture-test)
+
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -30,16 +30,83 @@ ssl:
 	make

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

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

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

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

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

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

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

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

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

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

 unix: all

--- a/45
+++ b/45
@@ -6,7 +6,7 @@

 README

-  Curl is a command line tool for transfering data specified with URL
+  Curl is a command line tool for transferring data specified with URL
  syntax. Find out how to use Curl by reading the curl.1 man page or the
  MANUAL document. Find out how to install Curl by reading the INSTALL
  document.
@@ -17,7 +17,9 @@ README

  You find answers to the most frequent questions we get in the FAQ document.

-  Study the COPYING file for distribution terms and similar.
+  Study the COPYING file for distribution terms and similar. If you distribute
+  curl binaries or other binaries that involve libcurl, you might enjoy the
+  LICENSE-MIXING document.

 CONTACT

@@ -32,42 +34,55 @@ WEB SITE

        Sweden    -- http://curl.haxx.se/
        Australia -- http://curl.planetmirror.com/
-        Estonia   -- http://curl.dope-brothers.com/
+        Austria   -- http://curl.gds.tuwien.ac.at/
+        Denmark   -- http://curl.cofman.dk/
+        Estonia   -- http://curl.wildyou.net/
+        France    -- http://curl.mirror.internet.tp/
+        Germany   -- http://curl.kgt.org/
        Germany   -- http://curl.mirror.at.stealer.net/
+        Germany   -- http://curl.netmirror.org/
        Russia    -- http://curl.tsuren.net/
+        Taiwan    -- http://curl.cs.pu.edu.tw/
        Thailand  -- http://curl.siamu.ac.th/
        US (CA)   -- http://curl.mirror.redwire.net/
+        US (CA)   -- http://curl.mirrormonster.com/
+        US (CA)   -- http://curl.signal42.com/
+        US (TX)   -- http://curl.109k.com/

 DOWNLOAD

  The official download mirror sites are:

-        Australia -- http://curl.planetmirror.com/download/
-        Estonia   -- http://curl.dope-brothers.com/download/
+        Australia -- http://curl.planetmirror.com/download.html
+        Austria   -- http://curl.gds.tuwien.ac.at/download.html
+        Estonia   -- http://curl.wildyou.net/download.html
        Germany   -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
+        Germany   -- http://curl.mirror.at.stealer.net/download.html
+        Germany   -- http://curl.netmirror.org/download.html
+        Germany   -- http://www.mirrorspace.org/curl/
        Hongkong  -- http://www.execve.net/curl/
-        Russia    -- http://curl.tsuren.net/download/
+        Russia    -- http://curl.tsuren.net/download.html
        Sweden    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
        Sweden    -- http://cool.haxx.se/curl/
-        Thailand  -- http://curl.siamu.ac.th/download/
-        US (CA)   -- http://curl.mirror.redwire.net/download/
+        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

  To download the very latest source off the CVS server do this:

-    cvs -d :pserver:cvsread@cvs.php.net:/repository login
+   cvs -d :pserver:anonymous@cool.haxx.se:/cvsroot/curl login

-  (enter "phpfi" when asked for password)
+  (just press enter when asked for password)

-    cvs -d :pserver:cvsread@cvs.php.net:/repository co curl 
+   cvs -d :pserver:anonymous@cool.haxx.se:/cvsroot/curl co curl

  (you'll get a directory named curl created, filled with the source code)

-    cvs -d :pserver:cvsread@cvs.php.net:/repository logout
-        
-  (you're off the hook!)
-
 NOTICE

  Curl contains pieces of source code that is Copyright (c) 1998, 1999
--- a/117
+++ b/117
@@ -1,89 +1,60 @@
-Curl and libcurl 7.11.1. A bugfix release.
+Curl and libcurl 7.13.0

- Public curl release number:               79
- Releases counted from the very beginning: 106
- Available command line options:           94
- Available curl_easy_setopt() options:     112
+ Public curl release number:               85
+ Releases counted from the very beginning: 112
+ Available command line options:           104
+ Available curl_easy_setopt() options:     122
+ Number of public functions in libcurl:    46
+ Amount of public web site mirrors:        15
+ Number of known libcurl bindings:         29

 This release includes the following changes:

- o CURLOPT_POSTFIELDSIZE_LARGE added to offer POSTs larger than 2GB
- o CURL_VERSION_LARGEFILE is a feature bit returned by libcurls that feature
-   large file support
- o libcurl only requires winsock 1.1 on windows now
- o when doing FTP, curl now sends QUIT before disconnecting
- o name resolves can now timeout on windows too
- o $HOME is now recognized better when looking for .netrc files
- o now re-uses the ares handle when re-using curl handles
- o SO_BINDTODEVICE is used for network interface binding
- o configure --disable-manual disables the built-in huge manual from the
-   command line tool
- o the default Accept: header used in HTTP requests changed
- o asynch dns lookups now require the c-ares library
- o curl --socks can be used to set a SOCKS5 proxy to use
- o response-headers received after a (proxy) CONNECT request are now passed
-   to the header callback just like other headers
+ o added --ftp-account and CURLOPT_FTP_ACCOUNT
+ o added CURLOPT_SOURCE_URL and CURLOPT_SOURCE_QUOTE
+ o obsoleted CURLOPT_SOURCE_HOST, CURLOPT_SOURCE_PATH, CURLOPT_SOURCE_PORT
+   and CURLOPT_PASV_HOST
+ o added --3p-url, --3p-user and --3p-quote
+ o -Q "+[command]" was added
+ o src/getpass.c license issue sorted (code was rewritten)
+ o curl -w now supports 'http_connect' for the proxy's response to CONNECT
+ o introducing "curl-config --protocols"

 This release includes the following bugfixes:

- o builds and runs on Novell NetWare
- o Windows builds now report OS as "i386-pc-win32"
- o received signals during SSL connect is handled better
- o improved PUT/POST with NTLM/Digest authentication
- o following redirects and doing NTLM/Digest (where the first connection gets
-   closed) with the multi interface work better now
- o file: progress meter and getinfo variables work now
- o CURLOPT_FRESH_CONNECT and CURLAUTH_NTLM now work when set together
- o share interface usage without (un)lock functions segfaulted
- o --limit-rate no longer cripples the --speed-limit feature
- o fixed verbose output problem with ipv6-enabled re-used connections
- o fixed the socks5 code to check version in the socks response properly
- o dns cache bug - fixed the 'inuse' counter
- o large file fix for Content-Length
- o better docs for the share interface
- o several configure fixes for mingw/msys
- o setting a Host: header is no longer affecting the Host: header used when
-   libcurl follows a Location:
- o fixed numerous compiler warnings on several operating systems and compilers
- o PUTing from stdin couldn't disable chunked transfer-encoding
- o corrected the mingw makefiles
- o improved the configure libz detection
- o fixed EPRT/PORT use when doing FTP on ipv6-enabled AIX hosts
- o *nroff commands that only support -mandoc and not -man are now supported
-   (for the built-in manual text in the command line tool)
- o fixed the unconditional #include of config.h in hugehelp.c
- o builds fine on MPE/iX
- o upload using chunked transfer-encoding now sends the last chunk properly
-   teriminated with an extra CRLF
- o Fixed the progress meter display for files >2GB
- o persistant connections over a proxy messed up the proxy name/password
- o the socks5 code segfaulted if no username/password was set
- o the *_LARGE options now take curl_off_t types as parameters and this will
-   make it possible to handle large files on windows too
- o builds with large file support even on systems without strtoll()
+ o re-sending a request when retrying on a fresh connection with multi
+   interface
+ o improved valgrind report parser in the test suite
+ o several valgrind reports
+ o CURLOPT_FTPPORT and -P work when built ipv6-enabled
+ o FTP third party transfers was much improved
+ o proxy environment variables are now ignored when built HTTP-disabled
+ o CURLOPT_PROXY can now disable HTTP proxy even when built HTTP-disabled
+ o "curl dictionary.com" no longer assumes DICT protocol
+ o re-invoke some system calls on EINTR
+ o duplicate Host: when failed connection re-use
+ o SOCKS5 version check
+ o memory problem with cleaning up multi interface
+ o SSL certificate name memory leak
+ o -d with -G to multiple URLs crashed
+ o double va_list access crash fixed
+ o minor memory leak when "version" is set in a cookie header
+ o builds fine on BeOS and NetBSD
+ o builds and runs fine on FreeBSD

 Other curl-related news since the previous public release:

- o Many platforms are being used to autobuild and autotest curl on a daily
-   basis. Please join in and test curl on your systems:
-   http://curl.haxx.se/auto/
- o the curl mailing lists moved, (re-)subscribe to the new ones from here:
-   http://curl.haxx.se/mail/
- o c-ares 1.1.0 was relased: http://daniel.haxx.se/projects/c-ares/
- o TclCurl 0.11.0 was released:
-   http://personal1.iddeo.es/andresgarci/tclcurl/english/
- o PycURL 7.11.0 was released: http://pycurl.sourceforge.net/
- o the libcurl D binding was released:
-   http://www.atari-soldiers.com/libcurl.html
- o new Estonian web site mirror: http://curl.dope-brothers.com/
+ o cURLpp 0.3.2 - https://rrette.com/curlpp.html
+ o pycURL 7.12.3 - http://pycurl.sourceforge.net/
+ o new web mirror: http://curl.mirrormonster.com/ (US, California)

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

- Gisle Vanem, Vincent Bronner, Richard Bramante, Dirk Manske, Dan Fandrich,
- Ken Hirsch, Stadler Stephan, Domenico Andreoli, Patrick Smith, Tor Arntsen,
- Andr<EFBFBD>s Garc<72>a, Tim Baker, Len Krause, Gilad, Ken Rastatter, P R Schaffner,
- Greg Hewgill, Ben Greear, Jeff Lawson, Grigory Entin, Doug Porter, David
- Byron, Andy Serpa, Joe Halpin, Christopher R. Palmer, G<>nter Knauf
+ Dan Fandrich, Peter Pentchev, Marcin Konicki, Rune Kleveland, David Shaw,
+ Werner Koch, Gisle Vanem, Alex Neblett, Kai Sommerfeld, Marty Kuhrt,
+ Hzhijun, Pavel Orehov, Bruce Mitchener, Cyrill Osterwalder, Dan Torop,
+ Martijn Koster, Alex aka WindEagle, Cody Jones, Samuel D<>az Garc<72>a,
+ Stephan Bergmann, Philippe Hameau, Ian Ford, Stephen More, Lars Nilsson

        Thanks! (and sorry if I forgot to mention someone)
--- a/73
+++ b/73
@@ -1,53 +1,36 @@
 Issues not sorted in any particular order.
-  #[num] refers to bug report numbers.
-  UNASSIGNED means that no person has publicly stated to work on the issue.
-  DELETE means the issue is subject for dismissal

-To get fixed in 7.11.1 (planned release in March 2004)
+To get fixed in 7.13.1 (planned release: April 2005)
 ======================

-To get fixed in 7.11.2 (planned release May/June 2004)
+58 - Fix KNOWN_BUGS #19: "FTP 3rd party transfers with the multi interface
+     doesn't work"
+
+59 - Figure out a fix for David Byron's SSL problems:
+     http://curl.haxx.se/mail/lib-2005-01/0240.html
+
+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.
+
+54 - Turn the FTP code into a state machine to support the multi interface
+     100% non-blocking.
+
+To get fixed in 7.14.0
 ======================

-6. 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.
-   UNASSIGNED
+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.

-10. Anton Fedorov's "dumpcert" patch UNASSIGNED
-    http://curl.haxx.se/mail/lib-2004-03/0088.html
+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).

-14. Evaluate/apply Gertjan van Wingerde's SSL patches, UNASSIGNED
-    http://curl.haxx.se/mail/lib-2004-03/0087.html
-
-23. Peter Sylvester's "Most Significant Common Name" change. Feedback welcome.
-    At least the UTF8 conversion and comparison should be done. Patch?
-    UNASSIGNED
-
-24. Make the progress meter use one digit more for the hour time fields.
-    Accomplish this by removing one of the times displayed.
-
-27. Put the version defines in their own header file, so that lib/libcurl.rc
-    can include only that to reduce problems with MSVC.
-
-28. Optimize the way libcurl uses CWD on each new request over a persistent
-    connection (on FTP) even if it doesn't have to.
-
-29. Define USE_NTRESPONSES in the NTLM code to work properly with >14 letter
-    passwords against IIS servers. Requires test cases to be updated
-    accordingly. #915609
-
-30. Digest re-negotiation is not supported, we wrongly assume a new 401
-    response to signify an authenticaion error. We need to detect the
-    difference between a 401 due to a bad Digest authorization header and a
-    401 because the server wants to re-negotiate.
-
-    Mitz Wark provided details and traces here:
-    http://curl.haxx.se/mail/lib-2004-03/0299.html
-
-To get fixed in 7.12.0
-======================
-
-25. curl_easy_strerror() curl_multi_strerror() curl_share_strerror()
-
-26. i18n of error messages
+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.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -64,7 +64,7 @@ dnl the code was bad, try a different program now, test 3
 ],[
 /* ioctlsocket source code */
 int socket;
- int flags = ioctlsocket(socket, FIONBIO, &flags);
+ unsigned long flags = ioctlsocket(socket, FIONBIO, &flags);
 ],[
 dnl ioctlsocket test was good
 nonblock="ioctlsocket"
@@ -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;
@@ -245,7 +243,8 @@ AC_DEFUN([CURL_CHECK_WORKING_GETADDRINFO],[
 #include <sys/types.h>
 #include <sys/socket.h>

-void main(void) {
+int main(void)
+{
    struct addrinfo hints, *ai;
    int error;

@@ -254,11 +253,9 @@ void main(void) {
    hints.ai_socktype = SOCK_STREAM;
    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
    if (error) {
-        exit(1);
-    }
-    else {
-        exit(0);
+        return 1;
    }
+    return 0;
 }
 ],[
  ac_cv_working_getaddrinfo="yes"
@@ -276,10 +273,72 @@ if test "$ac_cv_working_getaddrinfo" = "yes"; then
 fi
 ])

+dnl ************************************************************
+dnl check for working NI_WITHSCOPEID in getnameinfo()
+dnl
+AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID],[
+  AC_CACHE_CHECK(for working NI_WITHSCOPEID, ac_cv_working_ni_withscopeid,[
+
+ AC_RUN_IFELSE([[
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+int main()
+{
+#ifdef NI_WITHSCOPEID
+   struct sockaddr_storage ss;
+   int sslen = sizeof(ss);
+   int rc;
+   char hbuf[NI_MAXHOST];
+   int fd = socket(AF_INET6, SOCK_STREAM, 0);
+   if(fd < 0) {
+     perror("socket()");
+     return 1; /* couldn't create socket of either kind */
+   }
+
+   rc = getsockname(fd, (struct sockaddr *)&ss, &sslen);
+   if(rc) {
+     perror("getsockname()");
+     return 2;
+   }
+
+   rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf),
+                     NULL, 0,
+                     NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID);
+
+   if(rc) {
+     printf("rc = %s\n", gai_strerror(rc));
+     return 3;
+   }
+
+   return 0; /* everything works fine, use NI_WITHSCOPEID! */
+#else
+   return 4; /* we don't seem to have the definition, don't use it */
+#endif
+}
+]],
+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 end of AC_RUN_IFELSE
+
+]) dnl end of AC_CACHE_CHECK
+
+if test "$ac_cv_working_ni_withscopeid" = "yes"; then
+  AC_DEFINE(HAVE_NI_WITHSCOPEID, 1,
+            [Define if NI_WITHSCOPEID exists and works])
+fi
+
+]) dnl end of AC_DEFUN
+

 AC_DEFUN([CURL_CHECK_LOCALTIME_R],
 [
-  dnl check for a few thread-safe functions
+  dnl check for localtime_r
  AC_CHECK_FUNCS(localtime_r,[
    AC_MSG_CHECKING(whether localtime_r is declared)
    AC_EGREP_CPP(localtime_r,[
@@ -295,6 +354,112 @@ AC_DEFUN([CURL_CHECK_LOCALTIME_R],
 	AC_MSG_RESULT(no))])])
 ])

+dnl
+dnl This function checks for strerror_r(). If it isn't found at first, it
+dnl retries with _THREAD_SAFE defined, as that is what AIX seems to require
+dnl in order to find this function.
+dnl
+dnl If the function is found, it will then proceed to check how the function
+dnl actually works: glibc-style or POSIX-style.
+dnl
+dnl glibc:
+dnl      char *strerror_r(int errnum, char *buf, size_t n);
+dnl  
+dnl  What this one does is to return the error string (no surprises there),
+dnl  but it doesn't usually copy anything into buf!  The 'buf' and 'n'
+dnl  parameters are only meant as an optional working area, in case strerror_r
+dnl  needs it.  A quick test on a few systems shows that it's generally not
+dnl  touched at all.
+dnl
+dnl POSIX:
+dnl      int strerror_r(int errnum, char *buf, size_t n);
+dnl
+AC_DEFUN([CURL_CHECK_STRERROR_R],
+[
+  dnl determine of strerror_r is present
+  AC_CHECK_FUNCS(strerror_r,[
+    AC_MSG_CHECKING(whether strerror_r is declared)
+    AC_EGREP_CPP(strerror_r,[
+#include <string.h>],[
+      strerror_r="yes"
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether strerror_r with -D_THREAD_SAFE is declared)
+      AC_EGREP_CPP(strerror_r,[
+#define _THREAD_SAFE
+#include <string.h>],[
+        strerror_r="yes"
+	CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+
+  if test "x$strerror_r" = "xyes"; then
+
+    dnl check if strerror_r is properly declared in the headers
+    AC_CHECK_DECL(strerror_r, ,
+     AC_DEFINE(HAVE_NO_STRERROR_R_DECL, 1, [we have no strerror_r() proto])
+,
+[#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+])
+
+    dnl determine if this strerror_r() is glibc or POSIX
+    AC_MSG_CHECKING([for a glibc strerror_r API])
+    AC_TRY_RUN([
+#include <string.h>
+#include <errno.h>
+int
+main () {
+  char buffer[1024]; /* big enough to play with */
+  char *string =
+    strerror_r(EACCES, buffer, sizeof(buffer));
+    /* this should've returned a string */
+    if(!string || !string[0])
+      return 99;
+    return 0;
+}
+],
+    GLIBC_STRERROR_R="1"
+    AC_DEFINE(HAVE_GLIBC_STRERROR_R, 1, [we have a glibc-style strerror_r()])
+    AC_MSG_RESULT([yes]),
+    AC_MSG_RESULT([no]),
+    dnl cross-compiling!
+    AC_MSG_NOTICE([cannot determine strerror_r() style: edit lib/config.h manually!])
+    )
+
+    if test -z "$GLIBC_STRERROR_R"; then
+
+      AC_MSG_CHECKING([for a POSIX strerror_r API])
+      AC_TRY_RUN([
+#include <string.h>
+#include <errno.h>
+int
+main () {
+  char buffer[1024]; /* big enough to play with */
+  int error =
+    strerror_r(EACCES, buffer, sizeof(buffer));
+    /* This should've returned zero, and written an error string in the
+       buffer.*/
+    if(!buffer[0] || error)
+      return 99;
+    return 0;
+}
+],
+      AC_DEFINE(HAVE_POSIX_STRERROR_R, 1, [we have a POSIX-style strerror_r()])
+      AC_MSG_RESULT([yes]),
+      AC_MSG_RESULT([no]) ,
+      dnl cross-compiling!
+      AC_MSG_NOTICE([cannot determine strerror_r() style: edit lib/config.h manually!])
+    )
+
+    fi dnl if not using glibc API
+
+  fi dnl we have a strerror_r
+
+])
+
 AC_DEFUN([CURL_CHECK_INET_NTOA_R],
 [
  dnl determine if function definition for inet_ntoa_r exists.
@@ -511,10 +676,11 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
         dnl   "invalid format string conversion"
         dnl * 279 warns on static conditions in while expressions
         dnl * 981 warns on "operands are evaluated in unspecified order"
+         dnl * 1418 "external definition with no prior declaration"
         dnl * 1419 warns on "external declaration in primary source file"
         dnl   which we know and do on purpose.

-         WARN="-wd279,269,1419,981"
+         WARN="-wd279,269,981,1418,1419"

         if test "$gccnum" -gt "600"; then
            dnl icc 6.0 and older doesn't have the -Wall flag
@@ -522,15 +688,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
@@ -550,6 +721,11 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
           WARN="$WARN -Wendif-labels -Wstrict-prototypes"
         fi

+         if test "$gccnum" -ge "304"; then
+           # try -Wunreachable-code on gcc 3.4
+           WARN="$WARN -Wunreachable-code"
+         fi
+
         for flag in $CPPFLAGS; do
           case "$flag" in
            -I*)
--- a/ares/.cvsignore
+++ b/ares/.cvsignore
@@ -6,3 +6,18 @@ ahost
 config.log
 config.status
 aclocal.m4
+.deps
+Makefile.in
+config.guess
+config.h
+config.h.in
+config.sub
+libtool
+ltmain.sh
+stamp-h1
+*.lo
+.libs
+depcomp
+libcares.la
+missing
+ares_version.h.dist
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,3 +1,169 @@
+  Changelog for the c-ares project
+
+* November 7
+
+- Fixed the VC project and makefile to use ares_cancel and ares_version
+
+* October 24
+
+- The released ares_version.h from 1.2.1 says 1.2.0 due to a maketgz flaw.
+  This is now fixed.
+
+Version 1.2.1 (October 20, 2004)
+
+* September 29
+
+- Henrik Stoerner fix: got a report that Tru64 Unix (the unix from Digital
+  when they made Alpha's) uses /etc/svc.conf for the purpose fixed below for
+  other OSes. He made c-ares check for and understand it if present.
+
+- Now c-ares will use local host name lookup _before_ DNS resolving by default
+  if nothing else is told.
+
+* September 26
+
+- Henrik Stoerner: found out that c-ares does not look at the /etc/host.conf
+  file to determine the sequence in which to search /etc/hosts and DNS.  So on
+  systems where this order is defined by /etc/host.conf instead of a "lookup"
+  entry in /etc/resolv.conf, c-ares will always default to looking in DNS
+  first, and /etc/hosts second.
+
+  c-ares now looks at
+
+  1) resolv.conf (for the "lookup" line);
+  2) nsswitch.fon (for the "hosts:" line);
+  3) host.conf (for the "order" line).
+
+  First match wins.
+
+- Dominick Meglio patched: C-ares on Windows assumed that the HOSTS file is
+  located in a static location. It assumed
+  C:\Windows\System32\Drivers\Etc. This is a poor assumption to make. In fact,
+  the location of the HOSTS file can be changed via a registry setting.
+
+  There is a key called DatabasePath which specifies the path to the HOSTS
+  file:
+  http://www.microsoft.com/technet/itsolutions/network/deploy/depovg/tcpip2k.mspx
+
+  The patch will make c-ares correctly consult the registry for the location
+  of this file.
+
+* August 29
+
+- Gisle Vanem fixed the MSVC build files.
+
+* August 20
+
+- Gisle Vanem made c-ares build and work with his Watt-32 TCP/IP stack.
+
+* August 13
+
+- Harshal Pradhan made a minor syntax change in ares_init.c to make it build
+  fine with MSVC 7.1
+
+* July 24
+
+- Made the lib get built static only if --enable-debug is used.
+
+- Gisle Vanem fixed:
+
+  Basically in loops like handle_errors(), 'query->next' was assigned a local
+  variable and then query was referenced after the memory was freed by
+  next_server(). I've changed that so next_server() and end_query() returns
+  the next query. So callers should use this ret-value.
+
+  The next problem was that 'server->tcp_buffer_pos' had a random value at
+  entry to 1st recv() (luckily causing Winsock to return ENOBUFS).
+
+  I've also added a ares_writev() for Windows to streamline the code a bit
+  more.
+
+* July 20
+- Fixed a few variable return types for some system calls. Made configure
+  check for ssize_t to make it possible to use that when receiving the send()
+  error code. This is necessary to prevent compiler warnings on some systems.
+
+- Made configure create config.h, and all source files now include setup.h that
+  might include the proper config.h (or a handicrafted alternative).
+
+- Switched to 'ares_socket_t' type for sockets in ares, since Windows don't
+  use 'int' for that.
+
+- automake-ified and libool-ified c-ares. Now it builds libcares as a shared
+  lib on most platforms if wanted. (This bloated the size of the release
+  archive with another 200K!)
+
+- Makefile.am now uses Makefile.inc for the c sources, h headers and man
+  pages, to make it easier for other makefiles to use the exact same set of
+  files.
+
+- Adjusted 'maketgz' to use the new automake magic when building distribution
+  archives.
+
+- Anyone desires HTML and/or PDF versions of the man pages in the release
+  archives?
+
+* July 3
+- G<>nter Knauf made c-ares build and run on Novell Netware.
+
+* July 1
+- Gisle Vanem provided Makefile.dj to build with djgpp, added a few more djgpp
+  fixes and made ares not use 'errno' to provide further info on Windows.
+
+* June 30
+- Gisle Vanem made it build with djgpp and run fine with the Watt-32 stack.
+
+* June 10
+- Gisle Vanem's init patch for Windows:
+
+  The init_by_resolv_conf() function fetches the DNS-server(s)
+  from a series of registry branches.
+
+  This can be wrong in the case where DHCP has assigned nameservers, but the
+  user has overridden these servers with other prefered settings. Then it's
+  wrong to use the DHCPNAMESERVER setting in registry.
+
+  In the case of no global DHCP-assigned or fixed servers, but DNS server(s)
+  per adapter, one has to query the adapter branches.  But how can c-ares know
+  which adapter is valid for use? AFAICS it can't. There could be one adapter
+  that is down (e.g. a VPN adapter).
+
+  So it's better to leave this to the IP Helper API (iphlapi) available in
+  Win-98/2000 and later. My patch falls-back to the old way if not available.
+
+* June 8
+- James Bursa fixed an init issue for RISC OS.
+
+* May 11
+- Nico Stappenbelt reported that when processing domain and search lines in
+  the resolv.conf file, the first entry encountered is processed and used as
+  the search list. According to the manual pages for both Linux, Solaris and
+  Tru64, the last entry of either a domain or a search field is used.
+
+  This is now adjusted in the code
+
+Version 1.2.0 (April 13, 2004)
+
+* April 2, 2004
+- Updated various man pages to look nicer when converted to HTML on the web
+  site.
+
+* April 1, 2004
+- Dirk Manske provided a new function that is now named ares_cancel(). It is
+  used to cancel/cleanup a resolve/request made using ares functions on the
+  given ares channel. It does not destroy/kill the ares channel itself.
+
+- Dominick Meglio cleaned up the formatting in several man pages.
+
+* March 30, 2004
+- Dominick Meglio's new ares_expand_string. A helper function when decoding
+  incoming DNS packages.
+
+- Daniel Stenberg modified the Makefile.in to use a for loop for the man page
+  installation to improve overview and make it easier to add man pages.
+
+Version 1.1.0 (March 11, 2004)
+
 * March 9, 2004
 - Gisle Vanem improved build on Windows.

@@ -74,3 +240,5 @@ Version 1.0-pre1 (8 October 2003)
 - Daniel Stenberg adjusted the windows port

 - liren at vivisimo.com made the initial windows port
+
+* Imported the sources from ares 1.1.1
--- a/ares/FILES
+++ b/ares/FILES
@@ -10,6 +10,9 @@ maketgz
 aclocal.m4
 acinclude.m4
 Makefile.in
+Makefile.dj
+Makefile.m32
+Makefile.netware
 install-sh
 mkinstalldirs
 configure
@@ -21,8 +24,6 @@ vc/adig/adig.dsp
 vc/adig/adig.mak
 vc/adig/adig.plg
 vc/vc.dsw
-vc/vc.ncb
-vc/vc.opt
 vc/ahost/ahost.dep
 vc/ahost/ahost.dsp
 vc/ahost/ahost.mak
--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -0,0 +1,66 @@
+AUTOMAKE_OPTIONS = foreign
+
+lib_LTLIBRARIES = libcares.la
+
+man_MANS = $(MANPAGES)
+
+MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/adig/adig.mak	\
+ vc/adig/adig.plg vc/vc.dsw vc/ahost/ahost.dep vc/ahost/ahost.dsp	\
+ vc/ahost/ahost.mak vc/ahost/ahost.plg vc/areslib/areslib.dep		\
+ vc/areslib/areslib.dsp vc/areslib/areslib.mak vc/areslib/areslib.plg
+
+# 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)
+
+
+VER=-version-info 0:0:0
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
+# 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that age
+# must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information: 
+#
+# 1.Start with version information of 0:0:0 for each libtool library.
+#
+# 2.Update the version information only immediately before a public release of
+# your software. More frequent updates are unnecessary, and only guarantee
+# that the current interface number gets larger faster.
+#
+# 3.If the library source code has changed at all since the last update, then
+# increment revision (c:r+1:a)
+#
+# 4.If any interfaces have been added, removed, or changed since the last
+# update, increment current, and set revision to 0. (c+1:r=0:a)
+#
+# 5.If any interfaces have been added since the last public release, then
+# increment age. (c:r:a+1)
+#
+# 6.If any interfaces have been removed since the last public release, then
+# set age to 0. (c:r:a=0)
+#
+
+libcares_la_LDFLAGS = $(VER)
+
+# Makefile.inc provides the CSOURCES and HHEADERS defines
+include Makefile.inc
+
+libcares_la_SOURCES = $(CSOURCES) $(HHEADERS)
+
+# where to install the c-ares headers
+libcares_ladir = $(includedir)
+# what headers to install on 'make install':
+libcares_la_HEADERS = ares.h ares_version.h
+
+# Make files named *.dist replace the file without .dist extension
+dist-hook:
+	find $(distdir) -name "*.dist" -exec rm {} \;
+	(distit=`find $(srcdir) -name "*.dist"`; \
+	for file in $$distit; do \
+	  strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \
+	  cp $$file $(distdir)$$strip; \
+	done)
--- a/ares/Makefile.dj
+++ b/ares/Makefile.dj
@@ -0,0 +1,50 @@
+#
+# c-ares Makefile for djgpp/gcc/Watt-32.
+#   By Gisle Vanem <giva@bgnett.no> 2004.
+#
+.SUFFIXES: .exe
+
+include Makefile.inc
+
+WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
+
+CC      = gcc
+CFLAGS  = -O2 -Wall -DWATT32 -Dselect=select_s -I$(WATT32_ROOT)/inc
+LDFLAGS = -s
+EX_LIBS = $(WATT32_ROOT)/lib/libwatt.a
+
+OBJ_DIR = djgpp
+
+OBJECTS = $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
+
+all: $(OBJ_DIR) libcares.a ahost.exe adig.exe
+	@echo Welcome to c-ares.
+
+$(OBJ_DIR):
+	- mkdir $(OBJ_DIR)
+
+libcares.a: $(OBJECTS)
+	ar rs $@ $?
+
+ahost.exe: ahost.c libcares.a
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+adig.exe: adig.c libcares.a
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+clean:
+	rm -f $(OBJECTS) libcares.a
+
+vclean realclean: clean
+	rm -f ahost.exe adig.exe depend.dj
+	- rmdir $(OBJ_DIR)
+
+$(OBJ_DIR)/%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+	@echo
+
+depend:
+	$(CC) -MM $(CFLAGS) $(CSOURCES) | \
+	sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/$$(OBJ_DIR)\/\1/' > depend.dj
+
+-include depend.dj
--- a/ares/Makefile.in
+++ b/ares/Makefile.in
@@ -1,93 +0,0 @@
-# $Id$
-
-SHELL=/bin/sh
-INSTALL=@INSTALL@
-RANLIB=@RANLIB@
-VPATH=@srcdir@
-srcdir=@srcdir@
-top_srcdir=@top_srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-
-LIB=libcares.a
-CC=@CC@
-CPPFLAGS=@CPPFLAGS@
-CFLAGS=@CFLAGS@ ${WARN_CFLAGS} ${ERROR_CFLAGS}
-DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
-OBJS=	ares__close_sockets.o ares__get_hostent.o ares__read_line.o \
-	ares_destroy.o ares_expand_name.o ares_fds.o \
-	ares_free_hostent.o ares_free_string.o ares_gethostbyaddr.o \
-	ares_gethostbyname.o ares_init.o ares_mkquery.o ares_parse_a_reply.o \
-	ares_parse_ptr_reply.o ares_process.o ares_query.o ares_search.o \
-	ares_send.o ares_strerror.o ares_timeout.o ares_version.o
-
-$(LIB): ${OBJS}
-	ar cru $@ ${OBJS}
-	${RANLIB} $@
-
-all: $(LIB) demos
-
-demos: adig ahost
-
-tags:
-	etags *.[ch]
-
-adig: adig.o $(LIB)
-	${CC} ${LDFLAGS} -o $@ adig.o $(LIB) ${LIBS}
-
-ahost: ahost.o $(LIB)
-	${CC} ${LDFLAGS} -o $@ ahost.o $(LIB) ${LIBS}
-
-${OBJS}: ares.h ares_dns.h ares_private.h
-
-.c.o:
-	${CC} -c ${ALL_CFLAGS} $<
-
-check:
-
-install:
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
-	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
-	chmod u-w ${DESTDIR}${libdir}/$(LIB)
-	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
-	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
-	${INSTALL} -m 444 ${srcdir}/ares_destroy.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_expand_name.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_fds.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_free_hostent.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_free_string.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_gethostbyaddr.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_gethostbyname.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_init.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_init_options.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_mkquery.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_parse_a_reply.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_parse_ptr_reply.3 \
-		${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_process.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_query.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_search.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_send.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_strerror.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_timeout.3 ${DESTDIR}${mandir}/man3
-
-clean:
-	rm -f ${OBJS} $(LIB) adig.o adig ahost.o ahost
-
-distclean: clean
-	rm -f config.cache config.log config.status Makefile
--- a/ares/Makefile.inc
+++ b/ares/Makefile.inc
@@ -0,0 +1,15 @@
+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
--- a/ares/Makefile.m32
+++ b/ares/Makefile.m32
@@ -0,0 +1,75 @@
+#############################################################
+# $Id$
+#
+## Makefile for building libcares.a with MingW32 (GCC-3.2)
+## Use: make -f Makefile.m32 [demos]
+##
+## Quick hack by Guenter; comments to: /dev/nul
+
+CC = gcc
+AR = ar
+RANLIB = ranlib
+STRIP = strip -g
+#RM = rm -f 
+
+########################################################
+## Nothing more to do below this line!
+
+LIB=libcares.a
+CC=gcc
+#CPPFLAGS=@CPPFLAGS@
+WARN_FLAGS=-Wall
+CFLAGS=-O2
+CFLAGS+=${WARN_CFLAGS} ${ERROR_CFLAGS}
+DEFS=-DMINGW32
+LDFLAGS=-s
+LIBS=-lwsock32
+ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
+
+MANPAGES := $(patsubst %.c,%.o,$(wildcard ares_*.3))
+
+OBJS	:= $(patsubst %.c,%.o,$(wildcard ares_*.c))
+OBJS	+= windows_port.o
+
+$(LIB): ${OBJS}
+	ar cru $@ ${OBJS}
+	${RANLIB} $@
+
+all: $(LIB) demos
+
+demos: adig.exe ahost.exe
+
+tags:
+	etags *.[ch]
+
+adig.exe: adig.o $(LIB)
+	${CC} ${LDFLAGS} -o $@ adig.o $(LIB) ${LIBS}
+
+ahost.exe: ahost.o $(LIB)
+	${CC} ${LDFLAGS} -o $@ ahost.o $(LIB) ${LIBS}
+
+${OBJS}: ares.h ares_dns.h ares_private.h
+
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
+check:
+
+install:
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
+	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
+	chmod u-w ${DESTDIR}${libdir}/$(LIB)
+	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
+	(for man in $(MANPAGES); do \
+	   ${INSTALL} -m 444 ${srcdir}/$${man} ${DESTDIR}${mandir}/man3; \
+	done)
+
+clean:
+	rm -f ${OBJS} $(LIB) adig.o adig.exe ahost.o ahost.exe
+
+distclean: clean
+	rm -f config.cache config.log config.status Makefile
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -0,0 +1,317 @@
+#################################################################
+#
+## Makefile for building libares.lib (NetWare version - gnu make)
+## Use: make -f Makefile.netware
+##
+## Comments to: Guenter Knauf <eflash@gmx.net>
+#
+#################################################################
+
+# Edit the path below to point to the base of your Novell NDK.
+ifndef NDKBASE
+NDKBASE	= c:/novell
+endif
+
+ifndef INSTDIR
+INSTDIR	= ../curl-$(LIBCURL_VERSION_STR)-bin-nw
+endif
+
+# Edit the vars below to change NLM target settings.
+TARGETS = adig.nlm ahost.nlm
+LTARGET = libcares.lib
+VERSION	= $(LIBCARES_VERSION)
+COPYR	= Copyright (c) 1996 - 2004, Daniel Stenberg, <daniel@haxx.se>
+DESCR	= cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
+MTSAFE	= YES
+STACK	= 64000
+SCREEN	= none
+#EXPORTS	=
+# Comment the line below if you dont want to load protected automatically.
+#LDRING	= 3
+
+# Edit the var below to point to your lib architecture.
+ifndef LIBARCH
+LIBARCH = LIBC
+endif
+
+# must be equal to DEBUG or NDEBUG
+DB	= NDEBUG
+# DB	= DEBUG
+# DB	= CURLDEBUG
+# Optimization: -O<n> or debugging: -g
+ifeq ($(DB),NDEBUG)
+	OPT	= -O2
+	OBJDIR	= release
+else
+	OPT	= -g
+	OBJDIR	= debug
+endif
+
+# Include the version info retrieved from curlver.h
+-include $(OBJDIR)/version.inc
+
+# The following line defines your compiler.
+ifdef METROWERKS
+	CC = mwccnlm
+else
+	CC = gcc
+endif
+YACC	= bison -y
+CP	= cp -afv
+# RM	= rm -f
+# if you want to mark the target as MTSAFE you will need a tool for
+# generating the xdc data for the linker; here's a minimal tool:
+# http://www.gknw.com/development/prgtools/mkxdc.zip
+MPKXDC	= mkxdc
+
+# Global flags for all compilers
+CFLAGS	= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
+
+ifeq ($(CC),mwccnlm)
+LD	= mwldnlm
+LDFLAGS	= -nostdlib $(PRELUDE) $(OBJS) $(<:.def=.o) -o $@ -commandfile
+AR	= mwldnlm
+ARFLAGS	= -type library -w nocmdline $(OBJDIR)/*.o -o
+CFLAGS	+= -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
+CFLAGS	+= -relax_pointers
+#CFLAGS	+= -w on
+ifeq ($(LIBARCH),LIBC)
+	PRELUDE = $(SDK_LIBC)/imports/libcpre.o
+	CFLAGS += -align 4
+else
+	PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+#	CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
+	CFLAGS += -align 1
+endif
+else
+LD	= nlmconv
+LDFLAGS	= -T
+AR	= ar
+ARFLAGS	= -cq
+CFLAGS	+= -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
+CFLAGS	+= -Wall -Wno-format # -pedantic
+ifeq ($(LIBARCH),LIBC)
+	PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
+else
+	PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
+	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+endif
+endif
+
+NDK_ROOT = $(NDKBASE)/ndk
+SDK_CLIB = $(NDK_ROOT)/nwsdk
+SDK_LIBC = $(NDK_ROOT)/libc
+
+ifeq ($(LIBARCH),LIBC)
+	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
+	INCLUDES += -I$(SDK_LIBC)/include/winsock
+	CFLAGS += -D_POSIX_SOURCE
+#	CFLAGS += -D__ANSIC__
+else
+	INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+	# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
+	CFLAGS += -DNETDB_USE_INTERNET
+endif
+CFLAGS	+= -I. $(INCLUDES)
+
+ifeq ($(MTSAFE),YES)
+	XDCOPT = -n
+endif
+ifeq ($(MTSAFE),NO)
+	XDCOPT = -u
+endif
+
+ifeq ($(findstring linux,$(OSTYPE)),linux)
+DL	= '
+#-include $(NDKBASE)/nlmconv/ncpfs.inc
+endif
+
+OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard ares_*.c))
+
+.PHONY: lib nlm prebuild dist install clean
+
+lib: prebuild $(LTARGET)
+
+nlm: prebuild $(TARGETS) 
+
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h arpa/nameser.h
+
+dist: all
+	-$(RM) $(OBJS) $(OBJDIR)/*.map $(OBJDIR)/*.ncv
+	-$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.xdc $(OBJDIR)/version.inc
+
+install: $(INSTDIR) all
+	@$(CP) *.nlm $(INSTDIR)
+	@$(CP) ../CHANGES $(INSTDIR)
+	@$(CP) ../COPYING $(INSTDIR)
+	@$(CP) ../README $(INSTDIR)
+	@$(CP) ../RELEASE-NOTES $(INSTDIR)
+
+clean:
+	-$(RM) $(LTARGET) $(TARGETS) config.h
+	-$(RM) -r $(OBJDIR)
+	-$(RM) -r arpa
+
+%.lib: $(OBJS)
+	@echo Creating $@
+	@-$(RM) $@
+	@$(AR) $(ARFLAGS) $@ $^
+
+%.nlm: $(OBJDIR)/%.def $(OBJDIR)/%.o $(OBJDIR)/%.xdc $(OBJS)
+	@echo Linking $@
+	@-$(RM) $@
+	@$(LD) $(LDFLAGS) $<
+
+$(INSTDIR):
+	@mkdir $(INSTDIR)
+
+$(OBJDIR):
+	@mkdir $(OBJDIR)
+
+$(OBJDIR)/%.o: %.c
+#	@echo Compiling $<
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)/version.inc: ares_version.h $(OBJDIR)
+	@echo Creating $@
+	@awk -f ../packages/NetWare/get_ver.awk $< > $@
+
+$(OBJDIR)/%.xdc: Makefile.netware
+	@echo Creating $@
+	@$(MPKXDC) $(XDCOPT) $@
+
+$(OBJDIR)/%.def: Makefile.netware
+	@echo Creating $@
+	@echo $(DL)# DEF file for linking with $(LD)$(DL) > $@
+	@echo $(DL)# Do not edit this file - it is created by make!$(DL) >> $@
+	@echo $(DL)# All your changes will be lost!!$(DL) >> $@
+	@echo $(DL)#$(DL) >> $@
+	@echo $(DL)copyright "$(COPYR)"$(DL) >> $@
+	@echo $(DL)description "$(DESCR)"$(DL) >> $@
+	@echo $(DL)version $(VERSION)$(DL) >> $@
+ifdef NLMTYPE
+	@echo $(DL)type $(NLMTYPE)$(DL) >> $@
+endif
+ifdef STACK
+	@echo $(DL)stack $(STACK)$(DL) >> $@
+endif
+ifdef SCREEN
+	@echo $(DL)screenname "$(SCREEN)"$(DL) >> $@
+else
+	@echo $(DL)screenname "DEFAULT"$(DL) >> $@
+endif
+ifeq ($(DB),DEBUG)
+	@echo $(DL)debug$(DL) >> $@
+endif
+	@echo $(DL)threadname "$^"$(DL) >> $@
+ifdef XDCOPT
+	@echo $(DL)xdcdata $(@:.def=.xdc)$(DL) >> $@
+endif
+ifeq ($(LDRING),0)
+	@echo $(DL)flag_on 16$(DL) >> $@
+endif
+ifeq ($(LDRING),3)
+	@echo $(DL)flag_on 512$(DL) >> $@
+endif
+ifeq ($(LIBARCH),CLIB)
+	@echo $(DL)start _Prelude$(DL) >> $@
+	@echo $(DL)exit _Stop$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/clib.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/threads.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/nlmlib.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/socklib.imp$(DL) >> $@
+	@echo $(DL)module clib$(DL) >> $@
+else
+	@echo $(DL)flag_on 64$(DL) >> $@
+	@echo $(DL)pseudopreemption$(DL) >> $@
+	@echo $(DL)start _LibCPrelude$(DL) >> $@
+	@echo $(DL)exit _LibCPostlude$(DL) >> $@
+	@echo $(DL)check _LibCCheckUnload$(DL) >> $@
+	@echo $(DL)import @$(SDK_LIBC)/imports/libc.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_LIBC)/imports/netware.imp$(DL) >> $@
+	@echo $(DL)module libc$(DL) >> $@
+endif
+ifdef MODULES
+	@echo $(DL)module $(MODULES)$(DL) >> $@
+endif
+ifdef EXPORTS
+	@echo $(DL)export $(EXPORTS)$(DL) >> $@
+endif
+ifdef IMPORTS
+	@echo $(DL)import $(IMPORTS)$(DL) >> $@
+endif
+ifeq ($(LD),nlmconv)
+	@echo $(DL)input $(OBJS)$(DL) >> $@
+	@echo $(DL)input $(PRELUDE)$(DL) >> $@
+	@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
+endif
+
+config.h: Makefile.netware
+	@echo Creating $@
+	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
+	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
+	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
+	@echo $(DL)*/$(DL) >> $@
+	@echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
+	@echo $(DL)#define VERSION "$(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_ASSERT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_PTON 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
+	@echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SOCKET 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
+	@echo $(DL)#define RETSIGTYPE void$(DL) >> $@
+	@echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@
+	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
+	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
+ifdef NW_WINSOCK
+	@echo $(DL)#define HAVE_CLOSESOCKET 1$(DL) >> $@
+else
+	@echo $(DL)#define HAVE_SYS_TYPES_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SOCKET_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SOCKIO_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_NETDB_H 1$(DL) >> $@
+endif
+ifdef OLD_NOVELLSDK
+	@echo $(DL)#define socklen_t int$(DL) >> $@
+endif
+
+arpa/nameser.h: nameser.h
+	@echo Fix missing header $@
+	@-mkdir arpa
+	@$(CP) $< arpa
+
+
--- a/ares/NEWS
+++ b/ares/NEWS
@@ -1,3 +1,6 @@
+Major changes since:
+* see the CHANGES file
+
 Major changes in release 1.1.1:
 * ares should now compile as C++ code (no longer uses reserved word
  "class").
--- a/ares/README.cares
+++ b/ares/README.cares
@@ -1,19 +1,21 @@
+c-ares
+======

-This package is based on ares 1.1.1 (written by Greg Hudson). I've decided to
-put together and release my own ares archives since the ares maintainer
-doesn't want these improvements.
+This package is based on ares 1.1.1 (written by Greg Hudson). I decided to
+fork and release a separate project since the ares author didn't want the
+improvements that were vital for our use of it.

-The package is thus dubbed 'c-ares' since I (Daniel Stenberg) want this for
-use within the curl project (hence the letter C) and it makes a nice
-pun. Also, c-ares will not remain API compatible with the original ares, so
-picking a new name makes it more obvious to the public.
+This package is dubbed 'c-ares' since I (Daniel Stenberg) wanted this for use
+within the curl project (hence the letter C) and it makes a nice pun. Also,
+c-ares is not API compatible with ares: a new name makes that more obvious to
+the public.

 The full source code is available in the 'c-ares' release archives, and in the
 'ares' subdir of the curl CVS source repostitory.

 If you find bugs, correct flaws, have questions or have comments in general in
 regard to c-ares (or by all means the original ares too), get in touch with us
-on the curl-library mailing list.
+on the c-ares mailing list: http://cool.haxx.se/mailman/listinfo/c-ares

 c-ares is of course distributed under the same MIT-style license as the
 original ares.
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

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

 #ifdef WIN32
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

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

 #ifdef WIN32
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -20,20 +20,27 @@

 #include <sys/types.h>

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

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

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

 /* Server error codes (ARES_ENODATA indicates no relevant answer) */
@@ -55,6 +62,7 @@
 #define ARES_EFILE              14
 #define ARES_ENOMEM             15
 #define ARES_EDESTRUCTION       16
+#define ARES_EBADSTR            17

 /* Flag values */
 #define ARES_FLAG_USEVC         (1 << 0)
@@ -104,7 +112,7 @@ int ares_init(ares_channel *channelptr);
 int ares_init_options(ares_channel *channelptr, struct ares_options *options,
                      int optmask);
 void ares_destroy(ares_channel channel);
-
+void ares_cancel(ares_channel channel);
 void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
               ares_callback callback, void *arg);
 void ares_query(ares_channel channel, const char *name, int dnsclass,
@@ -125,6 +133,8 @@ int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
                 int rd, unsigned char **buf, int *buflen);
 int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
                     int alen, char **s, long *enclen);
+int 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_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
@@ -134,4 +144,8 @@ void ares_free_hostent(struct hostent *host);
 const char *ares_strerror(int code);
 void ares_free_errmem(char *mem);

+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* ARES__H */
--- a/ares/ares__close_sockets.c
+++ b/ares/ares__close_sockets.c
@@ -13,11 +13,13 @@
 * without express or implied warranty.
 */

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

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

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

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

-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -143,6 +142,7 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
      free(line);
      return ARES_SUCCESS;
    }
+  if(line)
    free(line);

  if (status == ARES_SUCCESS)
@@ -150,18 +150,21 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
      /* Memory allocation failure; clean up. */
      if (hostent)
        {
+          if(hostent->h_name)
            free((char *) hostent->h_name);
          if (hostent->h_aliases)
            {
              for (alias = hostent->h_aliases; *alias; alias++)
                free(*alias);
            }
+          if(hostent->h_aliases)
            free(hostent->h_aliases);
-	  if (hostent->h_addr_list)
+          if (hostent->h_addr_list && hostent->h_addr_list[0])
            free(hostent->h_addr_list[0]);
+          if(hostent->h_addr_list)
            free(hostent->h_addr_list);
-	}
          free(hostent);
+        }
      return ARES_ENOMEM;
    }

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

+#include "setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/ares/ares_cancel.3
+++ b/ares/ares_cancel.3
@@ -0,0 +1,39 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" 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_CANCEL 3 "31 March 2004"
+.SH NAME
+ares_cancel \- Cancel a resolve
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_cancel(ares_channel \fIchannel\fP)
+.fi
+.SH DESCRIPTION
+The \fBares_cancel\fP function cancels all lookups/requests made on the the
+name service channel identified by \fIchannel\fP.  \fBares_cancel\fP invokes
+the callbacks for each pending query on the channel, passing a status of
+.BR ARES_ETIMEOUT .
+These calls give the callbacks a chance to clean up any state which
+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_cancel.c
+++ b/ares/ares_cancel.c
@@ -0,0 +1,43 @@
+/* Copyright (C) 2004 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#include "setup.h"
+#include <stdlib.h>
+#include "ares.h"
+#include "ares_private.h"
+
+/*
+ * ares_cancel() cancels a ongoing request/resolve that might be going on on
+ * the given channel. It does NOT kill the channel, use ares_destroy() for
+ * that.
+ */
+void ares_cancel(ares_channel channel)
+{
+  struct query *query, *next;
+  int i;
+
+  for (query = channel->queries; query; query = next)
+  {
+    next = query->next;
+    query->callback(query->arg, ARES_ETIMEOUT, NULL, 0);
+    free(query->tcpbuf);
+    free(query->skip_server);
+    free(query);
+  }
+  channel->queries = NULL;
+  if (!(channel->flags & ARES_FLAG_STAYOPEN))
+  {
+    for (i = 0; i < channel->nservers; i++)
+      ares__close_sockets(&channel->servers[i]);
+  }
+}
--- a/ares/ares_destroy.3
+++ b/ares/ares_destroy.3
@@ -14,14 +14,14 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_DESTROY 3 "23 July 1998"
+.TH ARES_DESTROY 3 "7 December 2004"
 .SH NAME
 ares_destroy \- Destroy a resolver channel
 .SH SYNOPSIS
 .nf
 .B #include <ares.h>
 .PP
-.B int ares_destroy(ares_channel \fIchannel\fP)
+.B void ares_destroy(ares_channel \fIchannel\fP)
 .fi
 .SH DESCRIPTION
 The
@@ -36,7 +36,8 @@ status of
 These calls give the callbacks a chance to clean up any state which
 might have been stored in their arguments.
 .SH SEE ALSO
-.BR ares_init (3)
+.BR ares_init (3),
+.BR ares_cancel (3)
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_destroy.c
+++ b/ares/ares_destroy.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
--- a/ares/ares_expand_string.3
+++ b/ares/ares_expand_string.3
@@ -0,0 +1,62 @@
+.\" $Id$
+.\"
+.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\"
+.\" 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_EXPAND_NAME 3 "23 July 1998"
+.SH NAME
+ares_expand_string \- Expand a length encoded string
+.SH SYNOPSIS
+.nf
+.B #include <ares.h>
+.PP
+.B int ares_expand_string(const unsigned char *\fIencoded\fP,
+.B      const unsigned char *\fIabuf\fP, int \fIalen\fP, unsigned char **\fIs\fP,
+.B 	int *\fIenclen\fP)
+.fi
+.SH DESCRIPTION
+The
+.B ares_expand_string
+function converts a length encoded string to a NULL terminated C
+string.  The argument
+.I encoded
+gives the beginning of the encoded string, and the arguments
+.I abuf
+and
+.I alen
+give the containing message buffer (necessary for the processing of
+indirection pointers within the encoded domain name).  The result is
+placed in a NUL-terminated allocated buffer, a pointer to which is
+stored in the variable pointed to by
+.IR s .
+The length of the encoded string is stored in the variable pointed to by
+.I enclen
+so that the caller can advance past the encoded string to read
+further data in the message.
+.SH RETURN VALUES
+.B ares_expand_string
+can return any of the following values:
+.TP 15
+.B ARES_SUCCESS
+Expansion of the encoded string succeeded.
+.TP 15
+.B ARES_EBADSTR
+The encoded string was malformed and could not be expanded.
+.TP 15
+.B ARES_ENOMEM
+Memory was exhausted.
+.SH SEE ALSO
+.BR ares_free_string (3)
+.SH AUTHOR
+Dominick Meglio
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -0,0 +1,66 @@
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * 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 <netinet/in.h>
+#include <arpa/nameser.h>
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include "ares.h"
+#include "ares_private.h" /* for the memdebug */
+
+/* Simply decodes a length-encoded character string. The first byte of the
+ * input is the length of the string to be returned and the bytes thereafter
+ * are the characters of the string. The returned result will be NULL
+ * terminated.
+ */
+int ares_expand_string(const unsigned char *encoded,
+                       const unsigned char *abuf,
+                       int alen,
+                       unsigned char **s,
+                       long *enclen)
+{
+  unsigned char *q;
+  long len;
+  if (encoded == abuf+alen)
+    return ARES_EBADSTR;
+
+  len = *encoded;
+  if (encoded+len+1 > abuf+alen)
+    return ARES_EBADSTR;
+
+  encoded++;
+
+  *s = malloc(len+1);
+  if (*s == NULL)
+    return ARES_ENOMEM;
+  q = *s; 
+  strncpy((char *)q, (char *)encoded, len);
+  q[len] = '\0';
+
+  *s = q;
+
+  *enclen = len+1; 
+
+  return ARES_SUCCESS;
+}
+
--- a/ares/ares_fds.c
+++ b/ares/ares_fds.c
@@ -13,11 +13,10 @@
 * without express or implied warranty.
 */

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

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

@@ -27,7 +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)
@@ -37,13 +37,13 @@ int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
  for (i = 0; i < channel->nservers; i++)
    {
      server = &channel->servers[i];
-      if (server->udp_socket != -1)
+      if (server->udp_socket != ARES_SOCKET_BAD)
        {
          FD_SET(server->udp_socket, read_fds);
          if (server->udp_socket >= nfds)
            nfds = server->udp_socket + 1;
        }
-      if (server->tcp_socket != -1)
+      if (server->tcp_socket != ARES_SOCKET_BAD)
        {
          FD_SET(server->tcp_socket, read_fds);
          if (server->qhead)
@@ -52,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_free_hostent.3
+++ b/ares/ares_free_hostent.3
@@ -28,21 +28,16 @@ The
 .I ares_free_hostent
 function frees a
 .B struct hostent
-allocated by one of the functions
-.I ares_parse_a_reply
-or
-.IR ares_parse_ptr_reply .
+allocated by one of the functions \fIares_parse_a_reply(3)\fP or
+\fIares_parse_ptr_reply(3)\fP.
+.SH NOTES
+It is not necessary (and is not correct) to free the host structure passed to
+the callback functions for \fIares_gethostbyname(3)\fP or
+\fIares_gethostbyaddr(3)\fP. The ares library will automatically free such
+host structures when the callback returns.
 .SH SEE ALSO
 .BR ares_parse_a_reply (3),
 .BR ares_parse_ptr_reply (3)
-.SH NOTES
-It is not necessary (and is not correct) to free the host structure
-passed to the callback functions for
-.I ares_gethostbyname
-or
-.IR ares_gethostbyaddr .
-The ares library will automatically free such host structures when the
-callback returns.
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_free_hostent.c
+++ b/ares/ares_free_hostent.c
@@ -13,11 +13,10 @@
 * without express or implied warranty.
 */

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

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

--- a/ares/ares_free_string.3
+++ b/ares/ares_free_string.3
@@ -26,11 +26,10 @@ ares_free_string \- Free strings allocated by ares functions
 .SH DESCRIPTION
 The
 .I ares_free_string
-function frees a string allocated by the
-.I ares_mkquery
-function.
+function frees a string allocated by an ares function.
 .SH SEE ALSO
 .BR ares_mkquery (3)
+.BR ares_expand_string (3)
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_free_string.c
+++ b/ares/ares_free_string.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

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

--- a/ares/ares_gethostbyaddr.3
+++ b/ares/ares_gethostbyaddr.3
@@ -40,14 +40,10 @@ and
 .I addrlen
 give the address as a series of bytes, and
 .I family
-gives the type of address.  When the query is complete or has failed,
-the ares library will invoke
-.IR callback .
-Completion or failure of the query may happen immediately, or may
-happen during a later call to
-.BR ares_process (3)
-or
-.BR ares_destroy (3).
+gives the type of address.  When the query is complete or has failed, the ares
+library will invoke \fIcallback\fP.  Completion or failure of the query may
+happen immediately, or may happen during a later call to
+\fIares_process(3)\fP, \fIares_destroy(3)\fP or \fIares_cancel(3)\fP.
 .PP
 The callback argument
 .I arg
@@ -93,7 +89,8 @@ did not complete successfully,
 will be
 .BR NULL .
 .SH SEE ALSO
-.BR ares_process (3)
+.BR ares_process (3),
+.BR ares_gethostbyname (3)
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -27,9 +28,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "ares.h"
 #include "ares_private.h"

+#ifdef WATT32
+#undef WIN32
+#endif
+
 struct addr_query {
  /* Arguments passed to ares_gethostbyaddr() */
  ares_channel channel;
@@ -87,10 +93,10 @@ static void next_lookup(struct addr_query *aquery)
        {
        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;
+          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,
@@ -143,14 +149,31 @@ static int file_lookup(struct in_addr *addr, struct hostent **host)
 #ifdef WIN32

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

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

  fp = fopen(PATH_HOSTS, "r");
--- a/ares/ares_gethostbyname.3
+++ b/ares/ares_gethostbyname.3
@@ -37,14 +37,11 @@ The parameter
 .I name
 gives the hostname as a NUL-terminated C string, and
 .I family
-gives the desired type of address for the resulting host entry.  When
-the query is complete or has failed, the ares library will invoke
-.IR callback .
-Completion or failure of the query may happen immediately, or may
-happen during a later call to
-.BR ares_process (3)
-or
-.BR ares_destroy (3).
+gives the desired type of address for the resulting host entry.  When the
+query is complete or has failed, the ares library will invoke \fIcallback\fP.
+Completion or failure of the query may happen immediately, or may happen
+during a later call to \fIares_process(3)\fP, \fIares_destroy(3)\fP or
+\fIares_cancel(3)\fP.
 .PP
 The callback argument
 .I arg
@@ -96,7 +93,8 @@ did not complete successfully,
 will be
 .BR NULL .
 .SH SEE ALSO
-.BR ares_process (3)
+.BR ares_process (3),
+.BR ares_gethostbyaddr (3)
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -29,9 +30,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "ares.h"
 #include "ares_private.h"

+#ifdef WATT32
+#undef WIN32
+#endif
+
 struct host_query {
  /* Arguments passed to ares_gethostbyname() */
  ares_channel channel;
@@ -214,16 +220,32 @@ static int file_lookup(const char *name, struct hostent **host)
  int status;

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

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

  fp = fopen(PATH_HOSTS, "r");
--- 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
@@ -13,19 +13,28 @@
 * without express or implied warranty.
 */

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

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

 #include <stdio.h>
 #include <stdlib.h>
@@ -36,13 +45,18 @@
 #include "ares.h"
 #include "ares_private.h"

+#ifdef WATT32
+#undef WIN32  /* Redefined in MingW/MSVC headers */
+#endif
+
 static int init_by_options(ares_channel channel, struct ares_options *options,
                           int optmask);
 static int init_by_environment(ares_channel channel);
 static int init_by_resolv_conf(ares_channel channel);
 static int init_by_defaults(ares_channel channel);
 static int config_domain(ares_channel channel, char *str);
-static int config_lookup(ares_channel channel, const char *str);
+static int config_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,
@@ -85,6 +99,8 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  channel->nsort = -1;
  channel->lookups = NULL;
  channel->queries = NULL;
+  channel->domains = NULL;
+  channel->sortlist = NULL;

  /* Initialize configuration by each of the four sources, from highest
   * precedence to lowest.
@@ -101,14 +117,15 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
      /* Something failed; clean up memory we may have allocated. */
      if (channel->nservers != -1)
        free(channel->servers);
-      if (channel->ndomains != -1)
+      if (channel->domains)
        {
          for (i = 0; i < channel->ndomains; i++)
            free(channel->domains[i]);
          free(channel->domains);
        }
-      if (channel->nsort != -1)
+      if (channel->sortlist)
        free(channel->sortlist);
+      if(channel->lookups)
        free(channel->lookups);
      free(channel);
      return status;
@@ -122,8 +139,8 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  for (i = 0; i < channel->nservers; i++)
    {
      server = &channel->servers[i];
-      server->udp_socket = -1;
-      server->tcp_socket = -1;
+      server->udp_socket = ARES_SOCKET_BAD;
+      server->tcp_socket = ARES_SOCKET_BAD;
      server->tcp_lenbuf_pos = 0;
      server->tcp_buffer = NULL;
      server->qhead = NULL;
@@ -228,24 +245,24 @@ static int init_by_environment(ares_channel channel)

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

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

  if (RegQueryValueEx(hKey, subkey, 0, NULL, *obuf, &size) != ERROR_SUCCESS)
  {
@@ -260,41 +277,117 @@ static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
  return 1;
 }

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

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

 #ifdef WIN32

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

   On Windows 9X, the DNS server can be found in:
@@ -317,11 +410,19 @@ DhcpNameServer
  DWORD data_type;
  DWORD bytes;
  DWORD result;
-  DWORD keysize = MAX_PATH;
+  char  buf[256];

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

-  if (IsNT) 
+  if (get_iphlpapi_dns_info(buf,sizeof(buf)) > 0)
+  {
+    status = config_nameserver(&servers, &nservers, buf);
+    if (status == ARES_SUCCESS)
+      goto okay;
+  }
+
+  if (IS_NT())
  {
    if (RegOpenKeyEx(
          HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
@@ -385,15 +486,8 @@ DhcpNameServer
    RegCloseKey(mykey);
  }

-  if (status != ARES_EFILE)
-  {
-    /*
-      if (!channel->lookups) {
-      status = config_lookup(channel, "file bind");
-      }
-    */
+  if (status == ARES_SUCCESS)
    status = ARES_EOF;
-  }

 #elif defined(riscos)

@@ -401,7 +495,7 @@ DhcpNameServer
     system variable Inet$Resolvers, space separated. */

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

@@ -425,6 +519,24 @@ DhcpNameServer
    free(resolvers);
  }

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

 #endif
@@ -462,12 +615,17 @@ DhcpNameServer
  /* Handle errors. */
  if (status != ARES_EOF)
    {
-      if (servers != NULL) free(servers);
-      if (sortlist != NULL) free(sortlist);
+      if (servers != NULL)
+        free(servers);
+      if (sortlist != NULL)
+        free(sortlist);
      return status;
    }

  /* If we got any name server entries, fill them in. */
+#ifdef WIN32
+okay:
+#endif
  if (servers)
    {
      channel->servers = servers;
@@ -543,7 +701,7 @@ static int init_by_defaults(ares_channel channel)

  if (!channel->lookups)
    {
-      channel->lookups = strdup("bf");
+      channel->lookups = strdup("fb");
      if (!channel->lookups)
        return ARES_ENOMEM;
    }
@@ -563,7 +721,8 @@ static int config_domain(ares_channel channel, char *str)
  return set_search(channel, str);
 }

-static int config_lookup(ares_channel channel, const char *str)
+static int config_lookup(ares_channel channel, const char *str,
+                         const char *bindch, const char *filech)
 {
  char lookups[3], *l;
  const char *p;
@@ -576,11 +735,13 @@ static int config_lookup(ares_channel channel, const char *str)
  p = str;
  while (*p)
    {
-      if ((*p == 'b' || *p == 'f') && l < lookups + 2)
-	*l++ = *p;
-      while (*p && !isspace((unsigned char)*p))
+      if ((*p == *bindch || *p == *filech) && l < lookups + 2) {
+        if (*p == *bindch) *l++ = 'b';
+        else *l++ = 'f';
+      }
+      while (*p && !isspace((unsigned char)*p) && (*p != ','))
        p++;
-      while (isspace((unsigned char)*p))
+      while (*p && (isspace((unsigned char)*p) || (*p == ',')))
        p++;
    }
  *l = 0;
@@ -701,6 +862,14 @@ static int set_search(ares_channel channel, const char *str)
  int n;
  const char *p, *q;

+  if(channel->ndomains != -1) {
+    /* if we already have some domains present, free them first */
+    for(n=0; n < channel->ndomains; n++)
+      free(channel->domains[n]);
+    free(channel->domains);
+    channel->ndomains = -1;
+  }
+
  /* Count the domains given. */
  n = 0;
  p = str;
--- a/ares/ares_mkquery.3
+++ b/ares/ares_mkquery.3
@@ -21,11 +21,9 @@ ares_mkquery \- Compose a single-question DNS query buffer
 .nf
 .B #include <ares.h>
 .PP
-.B
-int ares_mkquery(const char *\fIname\fP, int \fIdnsclass\fP, int \fItype\fP,
-.B
-	unsigned short \fIid\fP, int \fIrd\fP, char **\fIbuf\fP,
-	int *\fIbuflen\fP)
+.B int ares_mkquery(const char *\fIname\fP, int \fIdnsclass\fP, int \fItype\fP,
+.B	unsigned short \fIid\fP, int \fIrd\fP, char **\fIbuf\fP,
+.B	int *\fIbuflen\fP)
 .fi
 .SH DESCRIPTION
 The
@@ -52,8 +50,7 @@ stored in the variable pointed to by
 and the length of which will be stored in the variable pointed to by
 .IR buflen .
 It is the caller's responsibility to free this buffer using
-.B ares_free_string
-when it is no longer needed.
+\fIares_free_string(3)\fP when it is no longer needed.
 .SH RETURN VALUES
 .B ares_mkquery
 can return any of the following values:
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
--- a/ares/ares_parse_a_reply.3
+++ b/ares/ares_parse_a_reply.3
@@ -21,9 +21,8 @@ ares_parse_a_reply \- Parse a reply to a DNS query of type A into a hostent
 .nf
 .B #include <ares.h>
 .PP
-.B
-int ares_parse_a_reply(const unsigned char *\fIabuf\fB, int \fIalen\fB,
-.B 	struct hostent **\fIhost\fB);
+.B int ares_parse_a_reply(const unsigned char *\fIabuf\fP, int \fIalen\fP,
+.B 	struct hostent **\fIhost\fP);
 .fi
 .SH DESCRIPTION
 The
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
--- a/ares/ares_parse_ptr_reply.3
+++ b/ares/ares_parse_ptr_reply.3
@@ -21,11 +21,9 @@ ares_parse_ptr_reply \- Parse a reply to a DNS query of type PTR into a hostent
 .nf
 .B #include <ares.h>
 .PP
-.B
-int ares_parse_ptr_reply(const unsigned char *\fIabuf\fB, int \fIalen\fB,
-.B
- 	const void *\fIaddr\fP, int \fIaddrlen\fP, int \fIfamily\fP,
-.B	struct hostent **\fIhost\fB);
+.B int ares_parse_ptr_reply(const unsigned char *\fIabuf\fP, int \fIalen\fP,
+.B 	const void *\fIaddr\fP, int \fIaddrlen\fP, int \fIfamily\fP,
+.B	struct hostent **\fIhost\fP);
 .fi
 .SH DESCRIPTION
 The
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
--- a/ares/ares_private.h
+++ b/ares/ares_private.h
@@ -18,30 +18,45 @@
 #include <stdio.h>
 #include <sys/types.h>

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

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

-#ifdef WIN32
+#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"
 #define DHCPNAMESERVER "DhcpNameServer"
-#define PATH_HOSTS_NT  "\\drivers\\etc\\hosts"
-#define PATH_HOSTS_9X  "\\hosts"
+#define DATABASEPATH   "DatabasePath"
+#define WIN_PATH_HOSTS  "\\hosts"
+
+#elif defined(WATT32)
+
+#define PATH_RESOLV_CONF "/dev/ENV/etc/resolv.conf"
+
+#elif defined(NETWARE)
+
+#define PATH_RESOLV_CONF "sys:/etc/resolv.cfg"
+#define PATH_HOSTS              "sys:/etc/hosts"

 #else

@@ -65,8 +80,8 @@ struct send_request {

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

  /* Mini-buffer for reading the length word */
  unsigned char tcp_lenbuf[2];
@@ -149,5 +164,9 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize);
   libcurl lowlevel code from within library is ugly and only works when
   c-ares is built and linked with a similarly debug-build libcurl, but we do
   this anyway for convenience. */
+#ifndef CURL_EXTERN
+/* ugly hack to make this compile */
+#define CURL_EXTERN
+#endif
 #include "../lib/memdebug.h"
 #endif
--- a/ares/ares_process.3
+++ b/ares/ares_process.3
@@ -35,13 +35,10 @@ The file descriptor sets pointed to by
 and
 .I write_fds
 should have file descriptors set in them according to whether the file
-descriptors specified by
-.BR ares_fds (3)
-are ready for reading and writing.  (The easiest way to determine this
-information is to invoke
+descriptors specified by \fIares_fds(3)\fP are ready for reading and writing.
+(The easiest way to determine this information is to invoke
 .B select
-with a timeout no greater than the timeout given by
-.BR ares_timeout (3)).
+with a timeout no greater than the timeout given by \fIares_timeout(3)\fP ).
 .PP
 The
 .B ares_process
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -13,28 +13,41 @@
 * without express or implied warranty.
 */

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

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

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

+#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
+#define GET_ERRNO()  WSAGetLastError()
+#else
+#define GET_ERRNO()  errno
+#endif
+
 static void write_tcp_data(ares_channel channel, fd_set *write_fds,
                           time_t now);
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now);
@@ -44,12 +57,12 @@ static void process_timeouts(ares_channel channel, time_t now);
 static void process_answer(ares_channel channel, unsigned char *abuf,
                           int alen, int whichserver, int tcp, int now);
 static void handle_error(ares_channel channel, int whichserver, time_t now);
-static void next_server(ares_channel channel, struct query *query, time_t now);
+static struct query *next_server(ares_channel channel, struct query *query, time_t now);
 static int open_tcp_socket(ares_channel channel, struct server_state *server);
 static int open_udp_socket(ares_channel channel, struct server_state *server);
 static int same_questions(const unsigned char *qbuf, int qlen,
                          const unsigned char *abuf, int alen);
-static void end_query(ares_channel channel, struct query *query, int status,
+static struct query *end_query(ares_channel channel, struct query *query, int status,
                      unsigned char *abuf, int alen);

 /* Something interesting happened on the wire, or there was a timeout.
@@ -74,13 +87,16 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
  struct server_state *server;
  struct send_request *sendreq;
  struct iovec *vec;
-  int i, n, count;
+  int i;
+  ssize_t scount;
+  int wcount;
+  size_t n;

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

@@ -89,16 +105,10 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
      for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
        n++;

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

          /* Advance the send queue by as many bytes as we sent. */
-	  while (count)
+          while (wcount)
            {
              sendreq = server->qhead;
-	      if ((size_t)count >= sendreq->len)
+              if ((size_t)wcount >= sendreq->len)
                {
-		  count -= sendreq->len;
+                  wcount -= sendreq->len;
                  server->qhead = sendreq->next;
                  if (server->qhead == NULL)
                    server->qtail = NULL;
@@ -129,28 +139,27 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
                }
              else
                {
-		  sendreq->data += count;
-		  sendreq->len -= count;
+                  sendreq->data += wcount;
+                  sendreq->len -= wcount;
                  break;
                }
            }
-#endif
        }
      else
        {
          /* Can't allocate iovecs; just send the first request. */
          sendreq = server->qhead;

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

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

          /* Advance the send queue by as many bytes as we sent. */
-	  if ((size_t)count == sendreq->len)
+          if ((size_t)scount == sendreq->len)
            {
              server->qhead = sendreq->next;
              if (server->qhead == NULL)
@@ -159,8 +168,8 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
            }
          else
            {
-	      sendreq->data += count;
-	      sendreq->len -= count;
+              sendreq->data += scount;
+              sendreq->len -= scount;
            }
        }
    }
@@ -179,7 +188,8 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
    {
      /* Make sure the server has a socket and is selected in read_fds. */
      server = &channel->servers[i];
-      if (server->tcp_socket == -1 || !FD_ISSET(server->tcp_socket, read_fds))
+      if (server->tcp_socket == ARES_SOCKET_BAD ||
+          !FD_ISSET(server->tcp_socket, read_fds))
        continue;

      if (server->tcp_lenbuf_pos != 2)
@@ -230,6 +240,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
               */
              process_answer(channel, server->tcp_buffer, server->tcp_length,
                             i, 1, now);
+          if (server->tcp_buffer)
                        free(server->tcp_buffer);
              server->tcp_buffer = NULL;
              server->tcp_lenbuf_pos = 0;
@@ -251,7 +262,8 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
      /* Make sure the server has a socket and is selected in read_fds. */
      server = &channel->servers[i];

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

      count = recv(server->udp_socket, buf, sizeof(buf), 0);
@@ -273,7 +285,7 @@ static void process_timeouts(ares_channel channel, time_t now)
      if (query->timeout != 0 && now >= query->timeout)
        {
          query->error_status = ARES_ETIMEOUT;
-	  next_server(channel, query, now);
+          next = next_server(channel, query, now);
        }
    }
 }
@@ -349,7 +361,7 @@ static void process_answer(ares_channel channel, unsigned char *abuf,

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

  /* Reset communications with this server. */
  ares__close_sockets(&channel->servers[whichserver]);
@@ -357,17 +369,19 @@ static void handle_error(ares_channel channel, int whichserver, time_t now)
  /* Tell all queries talking to this server to move on and not try
   * this server again.
   */
-  for (query = channel->queries; query; query = query->next)
+
+  for (query = channel->queries; query; query = next)
    {
+      next = query->next;
      if (query->server == whichserver)
        {
          query->skip_server[whichserver] = 1;
-	  next_server(channel, query, now);
+          next = next_server(channel, query, now);
        }
    }
 }

-static void next_server(ares_channel channel, struct query *query, time_t now)
+static struct query *next_server(ares_channel channel, struct query *query, time_t now)
 {
  /* Advance to the next server or try. */
  query->server++;
@@ -378,7 +392,7 @@ static void next_server(ares_channel channel, struct query *query, time_t now)
          if (!query->skip_server[query->server])
            {
              ares__send_query(channel, query, now);
-	      return;
+              return (query->next);
            }
        }
      query->server = 0;
@@ -387,7 +401,7 @@ static void next_server(ares_channel channel, struct query *query, time_t now)
      if (query->using_tcp)
        break;
    }
-  end_query(channel, query, query->error_status, NULL, 0);
+  return end_query(channel, query, query->error_status, NULL, 0);
 }

 void ares__send_query(ares_channel channel, struct query *query, time_t now)
@@ -401,7 +415,7 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
      /* Make sure the TCP socket for this server is set up and queue
       * a send request.
       */
-      if (server->tcp_socket == -1)
+      if (server->tcp_socket == ARES_SOCKET_BAD)
        {
          if (open_tcp_socket(channel, server) == -1)
            {
@@ -410,9 +424,12 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
              return;
            }
        }
-      sendreq = malloc(sizeof(struct send_request));
+      sendreq = calloc(sizeof(struct send_request), 1);
      if (!sendreq)
+        {
        end_query(channel, query, ARES_ENOMEM, NULL, 0);
+          return;
+        }
      sendreq->data = query->tcpbuf;
      sendreq->len = query->tcplen;
      sendreq->next = NULL;
@@ -425,7 +442,7 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
    }
  else
    {
-      if (server->udp_socket == -1)
+      if (server->udp_socket == ARES_SOCKET_BAD)
        {
          if (open_udp_socket(channel, server) == -1)
            {
@@ -448,17 +465,18 @@ 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)
 {
-  int s, flags;
+  ares_socket_t s;
+  int flags;
  struct sockaddr_in sockin;

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

  /* Set the socket non-blocking. */

-#ifdef WIN32
+#if defined(WIN32) || defined(WATT32)
  flags = 1;
  ioctlsocket(s, FIONBIO, &flags);
 #else
@@ -466,13 +484,13 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)

  if (flags == -1)
    {
-      close(s);
+      closesocket(s);
      return -1;
    }
  flags |= O_NONBLOCK;
  if (fcntl(s, F_SETFL, flags) == -1)
    {
-      close(s);
+      closesocket(s);
      return -1;
    }
 #endif
@@ -482,25 +500,28 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
  sockin.sin_family = AF_INET;
  sockin.sin_addr = server->addr;
  sockin.sin_port = channel->tcp_port;
-  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1
-      && errno != EINPROGRESS)
-    {
+  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1) {
+    int err = GET_ERRNO();
+
+    if (err != EINPROGRESS && err != EWOULDBLOCK) {
      closesocket(s);
      return -1;
    }
+  }

+  server->tcp_buffer_pos = 0;
  server->tcp_socket = s;
  return 0;
 }

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

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

  /* Connect to the server. */
@@ -597,10 +618,10 @@ static int same_questions(const unsigned char *qbuf, int qlen,
  return 1;
 }

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

  query->callback(query->arg, status, abuf, alen);
@@ -610,6 +631,10 @@ static void end_query(ares_channel channel, struct query *query, int status,
        break;
    }
  *q = query->next;
+  if (*q)
+    next = (*q)->next;
+  else
+    next = NULL;
  free(query->tcpbuf);
  free(query->skip_server);
  free(query);
@@ -622,4 +647,5 @@ static void end_query(ares_channel channel, struct query *query, int status,
      for (i = 0; i < channel->nservers; i++)
        ares__close_sockets(&channel->servers[i]);
    }
+  return (next);
 }
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
--- a/ares/ares_search.c
+++ b/ares/ares_search.c
@@ -13,12 +13,13 @@
 * without express or implied warranty.
 */

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

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

@@ -124,9 +125,14 @@ void ares_search(ares_channel channel, const char *name, int dnsclass,
          free(s);
        }
      else
+      {
+        /* failed, free the malloc()ed memory */
+        free(squery->name);
+        free(squery);
        callback(arg, status, NULL, 0);
      }
    }
+}

 static void search_callback(void *arg, int status, unsigned char *abuf,
                            int alen)
--- a/ares/ares_send.3
+++ b/ares/ares_send.3
@@ -24,8 +24,7 @@ ares_send \- Initiate a DNS query
 .B typedef void (*ares_callback)(void *\fIarg\fP, int \fIstatus\fP,
 .B	unsigned char *\fIabuf\fP, int \fIalen\fP)
 .PP
-.B
-void ares_send(ares_channel \fIchannel\fP, const unsigned char *\fIqbuf\fP,
+.B void ares_send(ares_channel \fIchannel\fP, const unsigned char *\fIqbuf\fP,
 .B 	int \fIqlen\fP, ares_callback \fIcallback\fP, void *\fIarg\fP)
 .fi
 .SH DESCRIPTION
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -13,9 +13,10 @@
 * without express or implied warranty.
 */

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

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
--- a/ares/ares_strerror.3
+++ b/ares/ares_strerror.3
@@ -30,7 +30,8 @@ function gets the description of the ares library error code
 .IR code ,
 returning the result as a NUL-terminated C string.
 .SH NOTES
-This function is not compatible with ares.
+This function is not compatible with ares, it takes a different set of
+arguments.
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br
--- a/ares/ares_strerror.c
+++ b/ares/ares_strerror.c
@@ -13,6 +13,7 @@
 * without express or implied warranty.
 */

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

@@ -35,7 +36,9 @@ const char *ares_strerror(int code)
    "Timeout while contacting DNS servers",
    "End of file",
    "Error reading file",
-    "Out of memory"
+    "Out of memory",
+    "Channel is being destroyed",
+    "Misformatted string"
  };

  assert(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext)));
--- a/ares/ares_timeout.3
+++ b/ares/ares_timeout.3
@@ -27,10 +27,8 @@ ares_fds \- Get file descriptors to select on for name service
 .SH DESCRIPTION
 The
 .B ares_timeout
-function determines the maximum time for which the caller should wait
-before invoking 
-.BR ares_process (3)
-to process timeouts.  The parameter
+function determines the maximum time for which the caller should wait before
+invoking \fIares_process(3)\fP to process timeouts.  The parameter
 .I maxtv
 specifies a existing maximum timeout, or
 .B NULL
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -13,15 +13,15 @@
 * without express or implied warranty.
 */

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

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

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

--- a/ares/ares_version.c
+++ b/ares/ares_version.c
@@ -1,5 +1,6 @@
 /* $Id$ */

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

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

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

 const char *ares_version(int *version);

--- a/ares/buildconf
+++ b/ares/buildconf
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+libtoolize --copy --automake --force
+aclocal
+autoheader
+autoconf
+automake --add-missing
--- a/ares/config.guess
+++ b/ares/config.guess
--- a/ares/config.sub
+++ b/ares/config.sub
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -1,17 +1,22 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(ares_init.c)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(c-ares, CVS)

 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_RANLIB

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

+# check for ssize_t
+AC_CHECK_TYPE(ssize_t, ,
+   AC_DEFINE(ssize_t, int, [the signed version of size_t]))
+
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(socket, socket)

@@ -30,10 +35,13 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
       ;;
  *)   AC_MSG_RESULT(yes)

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

-    CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I../include"
+    CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I$srcdir/../include"
    CFLAGS="$CFLAGS -g" 

    dnl set compiler "debug" options to become more picky, and remove
@@ -45,12 +53,14 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
       AC_MSG_RESULT(no)
 )

+AC_PROG_LIBTOOL
+
 dnl check for a few basic system headers we need
-dnl AC_CHECK_HEADERS(
-dnl        sys/types.h \
-dnl        sys/time.h \
-dnl        sys/select.h \
-dnl        sys/socket.h \
-dnl        )
+AC_CHECK_HEADERS(
+       sys/types.h \
+       sys/time.h \
+       sys/select.h \
+       sys/socket.h \
+       )

 AC_OUTPUT(Makefile)
--- a/ares/maketgz
+++ b/ares/maketgz
@@ -2,8 +2,6 @@

 $version = $ARGV[0];

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

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

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

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

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

-    $dir =~ s/^\.\///; # cut off ./ beginnings
+print "removing temporary configure.ac file\n";
+`rm configure.ac-rel`;

-    $dir =~ s/\/$//;  # off / trailers
-
-    if(!$dir) {
-        $dir = ".";
-    }
-
-    return $dir;
-}
-
-sub add {
-    my ($file)=@_;
-
-    my $dir=dirpart($file);
-
-    open(FILE, "<$file");
-    while(<FILE>) {
-        if($_ =~ /^ *\#/) {
-            next;
-        }
-        chomp;
-        push @entries, "$dir/$_";
-    }
-    close(FILE);
-}
-
-for(@files) {
-    chomp;
-    add($_);
-}
-
-sub mkalldir {
-    my ($dir) = @_;
-
-    my @parts = split("/", $dir);
-
-    #print "IN: $dir\n";
-
-    my $sub="";
-    for(@parts) {
-        #print "PART: $_\n";
-
-        $sub .= "$_";
-        if($_ eq "") {
-            next;
-        }
-        mkdir($sub, 0777);
-        #print "make $sub\n";
-        $sub .= "/";
-    }
-    
-}
-
-for(@entries) {
-    my $dir = dirpart("$name-$version/$_");
- #   print "Create $dir\n";
-    mkalldir($dir);
- #   print "Copy $_ to $dir\n";
-    `cp -p $_ $dir`;
-}
-
-# make a tarball
-`tar -cf $name-$version.tar $name-$version`;
-# gzip the tarball
-`gzip -9 $name-$version.tar`;
-# remove the dir
-`rm -rf $name-$version`;
+print "NOTE: now cvs tag this release!\n";
--- a/ares/nameser.h
+++ b/ares/nameser.h
@@ -4,13 +4,18 @@
 /* Windows-only header file provided by liren@vivisimo.com to make his Windows
   port build */

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

+#ifndef NETWARE
+
 #define MAXHOSTNAMELEN 256

 #define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK

 /* Structure for scatter/gather I/O.  */
 struct iovec
@@ -21,11 +26,16 @@ struct iovec

 #define getpid() _getpid()

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

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

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


@@ -211,16 +221,4 @@ typedef enum __ns_rcode {
 #define T_MAILA         ns_t_maila
 #define T_ANY           ns_t_any

-#ifndef __MINGW32__
-/* protos for the functions we provide in windows_port.c */
-int ares_strncasecmp(const char *s1, const char *s2, size_t n);
-int ares_strcasecmp(const char *s1, const char *s2);
-
-/* use this define magic to prevent us from adding symbol names to the library
-   that is a high-risk to collide with another libraries' attempts to do the
-   same */
-#define strncasecmp(a,b,c) ares_strncasecmp(a,b,c)
-#define strcasecmp(a,b) ares_strcasecmp(a,b)
-#endif
-
 #endif /* ARES_NAMESER_H */
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -0,0 +1,72 @@
+#ifndef ARES_SETUP_H
+#define ARES_SETUP_H
+
+/* Copyright (C) 2004 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+/* simple work-around for now, for systems without configure support */
+#define ssize_t int
+#endif
+
+/* Recent autoconf versions define these symbols in config.h. We don't want
+   them (since they collide with the libcurl ones when we build
+   --enable-debug) so we undef them again here. */
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef VERSION
+#undef PACKAGE
+
+/* now typedef our socket type */
+#if defined(WIN32) && !defined(WATT32)
+#include <winsock.h>
+typedef SOCKET ares_socket_t;
+#define ARES_SOCKET_BAD INVALID_SOCKET
+#else
+typedef int ares_socket_t;
+#define ARES_SOCKET_BAD -1
+#endif
+
+/* Assume a few thing unless they're set by configure
+ */
+#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
+#define HAVE_SYS_TIME_H  
+#endif
+
+#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
+#define HAVE_UNISTD_H 
+#endif
+
+#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
+#define HAVE_SYS_UIO_H
+#endif
+
+#if (defined(WIN32) || defined(WATT32)) && \
+   !(defined(__MINGW32__) || defined(NETWARE))
+/* protos for the functions we provide in windows_port.c */
+int ares_strncasecmp(const char *s1, const char *s2, int n);
+int ares_strcasecmp(const char *s1, const char *s2);
+
+/* use this define magic to prevent us from adding symbol names to the library
+   that is a high-risk to collide with another libraries' attempts to do the
+   same */
+#define strncasecmp(a,b,c) ares_strncasecmp(a,b,c)
+#define strcasecmp(a,b) ares_strcasecmp(a,b)
+#endif
+
+#endif /* ARES_SETUP_H */
--- a/ares/vc/areslib/areslib.dsp
+++ b/ares/vc/areslib/areslib.dsp
@@ -109,10 +109,6 @@ SOURCE=..\..\ares_fds.c
 # End Source File
 # Begin Source File

-SOURCE=..\..\ares_free_errmem.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\ares_free_hostent.c
 # End Source File
 # Begin Source File
@@ -157,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
@@ -185,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
@@ -46,7 +46,6 @@ CLEAN :
 	-@erase "$(INTDIR)\ares_destroy.obj"
 	-@erase "$(INTDIR)\ares_expand_name.obj"
 	-@erase "$(INTDIR)\ares_fds.obj"
-	-@erase "$(INTDIR)\ares_free_errmem.obj"
 	-@erase "$(INTDIR)\ares_free_hostent.obj"
 	-@erase "$(INTDIR)\ares_free_string.obj"
 	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
@@ -82,7 +81,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\ares_destroy.obj" \
 	"$(INTDIR)\ares_expand_name.obj" \
 	"$(INTDIR)\ares_fds.obj" \
-	"$(INTDIR)\ares_free_errmem.obj" \
 	"$(INTDIR)\ares_free_hostent.obj" \
 	"$(INTDIR)\ares_free_string.obj" \
 	"$(INTDIR)\ares_gethostbyaddr.obj" \
@@ -94,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" \
@@ -122,7 +122,6 @@ CLEAN :
 	-@erase "$(INTDIR)\ares_destroy.obj"
 	-@erase "$(INTDIR)\ares_expand_name.obj"
 	-@erase "$(INTDIR)\ares_fds.obj"
-	-@erase "$(INTDIR)\ares_free_errmem.obj"
 	-@erase "$(INTDIR)\ares_free_hostent.obj"
 	-@erase "$(INTDIR)\ares_free_string.obj"
 	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
@@ -134,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"
@@ -159,7 +160,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\ares_destroy.obj" \
 	"$(INTDIR)\ares_expand_name.obj" \
 	"$(INTDIR)\ares_fds.obj" \
-	"$(INTDIR)\ares_free_errmem.obj" \
 	"$(INTDIR)\ares_free_hostent.obj" \
 	"$(INTDIR)\ares_free_string.obj" \
 	"$(INTDIR)\ares_gethostbyaddr.obj" \
@@ -260,12 +260,6 @@ SOURCE=..\..\ares_fds.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)


-SOURCE=..\..\ares_free_errmem.c
-
-"$(INTDIR)\ares_free_errmem.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=..\..\ares_free_hostent.c

 "$(INTDIR)\ares_free_hostent.obj" : $(SOURCE) "$(INTDIR)"
@@ -332,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/vc/vc.ncb
+++ b/ares/vc/vc.ncb
--- a/ares/vc/vc.opt
+++ b/ares/vc/vc.opt
--- a/ares/windows_port.c
+++ b/ares/windows_port.c
@@ -1,15 +1,28 @@
+#include "setup.h"
+
+/* only do the following on windows
+ */
+#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <errno.h>
+#include <malloc.h>

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

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

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

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

    if (tv)
    {
        GetSystemTimeAsFileTime(&ft);
        li.LowPart  = ft.dwLowDateTime;
        li.HighPart = ft.dwHighDateTime;
-        t  = li.QuadPart;       /* In 100-nanosecond intervals */
-        //t -= EPOCHFILETIME;     /* Offset to the Epoch time */
-        t /= 10;                /* In microseconds */
+        t  = li.QuadPart / 10;   /* In micro-second intervals */
+        t -= EPOCH_FILETIME;     /* Offset to the Epoch time */
        tv->tv_sec  = (long)(t / 1000000);
        tv->tv_usec = (long)(t % 1000000);
    }
-
-#if 0
-    if (tz)
-    {
-        if (!tzflag)
-        {
-            _tzset();
-            tzflag++;
-        }
-        tz->tz_minuteswest = _timezone / 60;
-        tz->tz_dsttime = _daylight;
-    }
-#endif
-
+    (void) tz;
    return 0;
 }
+
+int
+ares_writev (ares_socket_t s, const struct iovec *vector, size_t count)
+{
+  char *buffer, *bp;
+  size_t i, bytes = 0;
+
+  /* Find the total number of bytes to write
+   */
+  for (i = 0; i < count; i++)
+      bytes += vector[i].iov_len;
+
+  if (bytes == 0)   /* not an error */
+     return (0);
+
+  /* Allocate a temporary buffer to hold the data
+   */
+  buffer = bp = (char*) alloca (bytes);
+  if (!buffer)
+  {
+    errno = ENOMEM;
+    return (-1);
+  }
+
+  /* Copy the data into buffer.
+   */
+  for (i = 0; i < count; ++i)
+  {
+    memcpy (bp, vector[i].iov_base, vector[i].iov_len);
+    bp += vector[i].iov_len;
+  }
+  return send (s, (const void*)buffer, bytes, 0);
+}
+#endif /* WIN32 builds only */
--- a/22
+++ b/22
@@ -67,7 +67,7 @@ echo "buildconf: autoheader version $ah_version (ok)"
 # automake 1.7 or newer
 #
 need_automake="1.7"
-am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
+am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//' -e 's/\(.*\)\(-p.*\)/\1/'`
 if test -z "$am_version"; then
  echo "buildconf: automake not found."
  echo "            You need automake version $need_automake or newer installed."
@@ -101,6 +101,10 @@ libtool=`findtool glibtool 2>/dev/null`
 if test ! -x "$libtool"; then
  libtool=`findtool libtool`
 fi
+
+# set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
+LIBTOOLIZE="${libtool}ize"
+
 lt_pversion=`$libtool --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
 if test -z "$lt_pversion"; then
  echo "buildconf: libtool not found."
@@ -157,27 +161,29 @@ fi
 # run the correct scripts now

 echo "buildconf: running libtoolize"
-${LIBTOOLIZE:-libtoolize} --copy --automake --force || die "The command '${LIBTOOLIZE:-libtoolize}  --copy --automake --force' failed"
+${LIBTOOLIZE:-libtoolize} --copy --automake --force || die "The libtool command failed"
 echo "buildconf: running aclocal"
-${ACLOCAL:-aclocal}       || die "The command '${AUTOHEADER:-aclocal}' failed"
+${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
 echo "buildconf: running autoheader"
-${AUTOHEADER:-autoheader} || die "The command '${AUTOHEADER:-autoheader}' failed"
+${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 command '${AUTOCONF:-autoconf}' failed"
+${AUTOCONF:-autoconf}     || die "The autoconf command failed"

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

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

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

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

--- a/configure.ac
+++ b/configure.ac
--- a/curl-config.in
+++ b/curl-config.in
@@ -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,19 +46,19 @@ 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"
        fi
 	if test "@KRB4_ENABLED@" = "1"; then
@@ -69,32 +70,40 @@ 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
 	;;

+    --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 +132,7 @@ while test $# -gt 0; do

    *)
        echo "unknown option: $1"
-	usage
-	exit 1
+	usage 1
 	;;
    esac
    shift
--- a/curl-style.el
+++ b/curl-style.el
@@ -2,17 +2,8 @@
 ;;;; $Id$

 ;;; The curl hacker's C conventions.
-
-;;; After loading this file and added the mode-hook you can in C
-;;; files, put something like this to use the curl style
-;;; automatically:
-;;
-;;   /* -----------------------------------------------------------------
-;;    * local variables:
-;;    * eval: (set c-file-style "curl")
-;;    * end:
-;;    */
-;;
+;;; See the sample.emacs file on how this file can be made to take
+;;; effect automatically when editing curl source files.

 (defconst curl-c-style
  '((c-basic-offset . 2)
@@ -29,6 +20,13 @@
    )
  "Curl C Programming Style")

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

 ;; Set this is in your .emacs if you want to use the c-mode-hook as
--- a/docs/BINDINGS
+++ b/docs/BINDINGS
@@ -17,22 +17,31 @@ archives, but must be downloaded and installed separately.

 Ada95

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

 Basic

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

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

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

 Cocoa

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

 D
@@ -42,27 +51,45 @@ D

 Dylan

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

 Euphoria

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

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

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

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

 Lua

-  Written by Steve Dekorte.
+  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
+
+  Written by Jeffrey Phillips
+  http://www.seasideresearch.com/downloads.html
+
 Object-Pascal

  Free Pascal, Delphi and Kylix binding written by Christophe Espern.
@@ -70,7 +97,7 @@ Object-Pascal

 O'Caml

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

 Pascal
@@ -80,40 +107,54 @@ Pascal

 Perl

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

 PHP

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

 PostgreSQL

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

 Python

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

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

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

 Ruby

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

 Scheme

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

 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
+
+Q
+
+  http://q-lang.sourceforge.net/
+
+wxWidgets
+
+  Written by Casey O'Donnell
+  http://homepage.mac.com/codonnell/wxcurldav/
--- a/docs/CONTRIBUTE
+++ b/docs/CONTRIBUTE
@@ -138,15 +138,15 @@ How To Make a Patch

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

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

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

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

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

 For unix-like operating systems:

--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: March 16, 2004 (http://curl.haxx.se/docs/faq.html)
+Updated: December 21, 2004 (http://curl.haxx.se/docs/faq.html)
                                  _   _ ____  _
                              ___| | | |  _ \| |
                             / __| | | | |_) | |
@@ -10,20 +10,20 @@ FAQ
 1. Philosophy
  1.1 What is cURL?
  1.2 What is libcurl?
-  1.3 What is cURL not?
+  1.3 What is curl not?
  1.4 When will you make curl do XXXX ?
-  1.5 Who makes cURL?
-  1.6 What do you get for making cURL?
+  1.5 Who makes curl?
+  1.6 What do you get for making curl?
  1.7 What about CURL from curl.com?
  1.8 I have a problem who do I mail?

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

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

 4. Running Problems
  4.1 Problems connecting to SSL servers.
@@ -70,6 +72,8 @@ FAQ
  5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ?
  5.6 What about Keep-Alive or persistent connections?
  5.7 Link errors when building libcurl on Windows!
+  5.8 libcurl.so.3: open failed: No such file or directory
+  5.9 How does libcurl resolve host names?

 6. License Issues
  6.1 I have a GPL program, can I use the libcurl library?
@@ -79,24 +83,50 @@ FAQ
  6.5 Can I modify curl/libcurl for my program and keep the changes secret?
  6.6 Can you please change the curl/libcurl license to XXXX?

+ 7. PHP/CURL Issues
+  7.1 What is PHP/CURL?
+  7.2 Who write PHP/CURL?
+  7.3 Can I perform multiple requests using the same handle?
+
 ==============================================================================

 1. Philosophy

  1.1 What is cURL?

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

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

-  We spell it cURL or just curl. We pronounce it with an initial k sound:
-  [kurl].
+  libcurl
+
+    A free and easy-to-use client-side URL transfer library, supporting FTP,
+    FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP.  libcurl supports
+    HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP
+    form based upload, proxies, cookies, user+password authentication, file
+    transfer resume, http proxy tunneling and more!
+
+    libcurl is highly portable, it builds and works identically on numerous
+    platforms, including Solaris, NetBSD, FreeBSD, OpenBSD, Darwin, HPUX,
+    IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, BeOs, Mac
+    OS X, Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS and more...
+
+    libcurl is free, thread-safe, IPv6 compatible, feature rich, well
+    supported and fast.
+
+  curl
+
+    A command line tool for getting or sending files using URL syntax.
+
+    Since curl uses libcurl, it supports a range of common Internet protocols,
+    currently including HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and
+    FILE.
+
+  We pronounce curl and cURL with an initial k sound: [kurl].

  NOTE: there are numerous sub-projects and related projects that also use the
  word curl in the project names in various combinations, but you should take
@@ -112,7 +142,7 @@ FAQ
  You can use libcurl for free in your application, be it open source,
  commercial or closed-source.

-  1.3 What is cURL not?
+  1.3 What is curl not?

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

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

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

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

-  cURL and libcurl are not made by any single individual. Sure, Daniel
+  curl and libcurl are not made by any single individual. Sure, Daniel
  Stenberg writes the major parts, but other persons' submissions are
  important and crucial. Anyone can contribute and post their changes and
  improvements and have them inserted in the main sources (of course on the
@@ -175,14 +205,16 @@ FAQ

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

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

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

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

  If you want to support our project with a donation or similar, one way of
  doing that would be to buy "gift certificates" at useful online shopping
@@ -223,11 +255,11 @@ FAQ

 2. Install Related Problems

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

  This may be because of several reasons.

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

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

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

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

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

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

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

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

  That is an OpenSSL binary built for Windows.

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

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

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


 3. Usage problems

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

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

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

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

  Try the -C option.

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

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

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

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

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

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

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

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

  See also item 3.14 regarding javascript.

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

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

@@ -369,7 +401,6 @@ FAQ

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

  In February 2003, there are interfaces available for the following
@@ -456,15 +487,56 @@ FAQ
  3.15 Can I do recursive fetches with curl?

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

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

+  3.16 What certificates do I need when I use SSL?
+
+  There are three different kinds of "certificates" to keep track of when we
+  talk about using SSL-based protocols (HTTPS or FTPS) using curl or libcurl.
+
+  - Client certificate. The server you communicate may require that you can
+    provide this in order to prove that you actually are who you claim to be.
+    If the server doesn't require this, you don't need a client certificate.
+
+  - Server certificate. The server you communicate with has a server
+    certificate. You can and should verify this certficate to make sure that
+    you are truly talking to the real server and not a server impersonating
+    it. The server certificate verifaction process is made by using a
+    Certificate Authority certificate ("CA cert") that was used to sign the
+    server certificate. Server certificate verification is enabled by default
+    in curl and libcurl and is often the reason for problems as explained in
+    FAQ entry 4.12 and the SSLCERTS document
+    (http://curl.haxx.se/docs/sslcerts.html). Server certificates that are
+    "self-signed" or otherwise signed by a CA that you do not have a CA cert
+    for, cannot be verified. If the verification during a connect fails, you
+    are refused access. You then need to explicitly disable the verification
+    to connect to the server.
+
+  - Certificate Authority certificate ("CA cert"). You often have several CA
+    certs in a CA cert bundle that can be used to verify a server certificate
+    that was signed by one of the authorities in the bundle. curl comes with a
+    default CA cert bundle. You can override the default.
+
+  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/
+
+
 4. Running Problems

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

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

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

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

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

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

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

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

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

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

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

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

  This problem has two sides:

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

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

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

+
 5. libcurl Issues

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

  Yes.

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

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

  (Provided by Andrew Francis)

+  When building an application that uses the static libcurl library, you must
+  add -DCURL_STATICLIB to your CFLAGS. Otherwise the linker will look for
+  dynamic import symbols. If you get linker error like "unknown symbol
+  __imp__curl_easy_init ..." you have linked against the wrong (static)
+  library.  If you want to use the libcurl.dll and import lib, you don't need
+  any extra CFLAGS, but use one of the import libraries below. These are the
+  libraries produced by the various lib/Makefile.* files:
+
+  Target:          static lib.   import lib for libcurl*.dll.
+  -----------------------------------------------------------
+  MingW:           libcurl.a     libcurldll.a
+  MSVC (release):  libcurl.lib   libcurl_imp.lib
+  MSVC (debug):    libcurld.lib  libcurld_imp.lib
+  Borland:         libcurl.lib   libcurl_imp.lib
+
+
+  5.8 libcurl.so.3: open failed: No such file or directory
+
+  This is an error message you might get when you try to run a program linked
+  with a shared version of libcurl and your run-time linker (ld.so) couldn't
+  find the shared library named libcurl.so.3.
+
+  You need to make sure that ld.so finds libcurl.so.3. You can do that
+  multiple ways, and it differs somewhat between different operating systems,
+  but they are usually:
+
+  * Add an option to the linker command line that specify the hard-coded path
+    the run-time linker should check for the lib (usually -R)
+
+  * Set an environment variable (LD_LIBRARY_PATH for example) where ld.so
+    should check for libs
+
+  * Adjust the system's config to check for libs in the directory where you've
+    put the dir (like Linux's /etc/ld.so.conf)
+
+  'man ld.so' and 'man ld' will tell you more details
+
+  5.9 How does libcurl resolve host names?
+
+  libcurl includes a number of different name resolve functions:
+
+  - The non-ipv6 resolver that can use one out of four host name resolve calls
+    (depending on what your system supports):
+
+    A - gethostbyname()
+    B - gethostbyname_r() with 3 arguments
+    C - gethostbyname_r() with 5 arguments
+    D - gethostbyname_r() with 6 arguments
+
+  - The ipv6-resolver that uses getaddrinfo()
+
+  - The c-ares based name resolver that uses the c-ares library for resolves.
+
+  - The Windows threaded resolver. It use:
+
+    A - gethostbyname() on plain ipv4 windows hosts
+    B - getaddrinfo() on ipv6-enabled windows hosts

 6. License Issues

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

-  6.1. I have a GPL program, can I use the libcurl library?
+  6.1 I have a GPL program, can I use the libcurl library?

  Yes!

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

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

  Yes!

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

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

  Yes!

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

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

  Yes!

  The LGPL license doesn't clash with other licenses.

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

  Yes!

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

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

  No.

@@ -794,3 +927,26 @@ FAQ
  we want on curl/libcurl and it does not spread to other programs or
  libraries that use it. It should be possible for everyone to use libcurl or
  curl in their projects, no matter what license they already have in use.
+
+7. PHP/CURL Issues
+
+  7.1 What is PHP/CURL?
+
+  The module for PHP that makes it possible for PHP programs to access curl-
+  functions from within PHP. We often call it PHP/CURL to differentiate from
+  curl the command line tool and libcurl the library.
+
+  7.2 Who write PHP/CURL?
+
+  PHP/CURL is a module that comes with the regular PHP package. It depends and
+  uses libcurl, so you need to have libcurl installed properly first before
+  PHP/CURL can be used. PHP/CURL is written by Sterling Hughes.
+
+  7.3 Can I perform multiple requests using the same handle?
+
+  Yes - at least in PHP version 4.3.8 and later (this has been known to not
+  work in earlier versions, but the exact version when it started to work is
+  unknown to me).
+
+  After a transfer, you just set new options in the handle and make another
+  transfer. This will make libcurl to re-use the same connection if it can.
--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -6,26 +6,33 @@

 FEATURES

-Misc
- - full URL syntax
+curl tool
+ - config file support
+ - multiple URLs in a single command line
+ - range "globbing" support: [0-13], {one,two,three}
+ - multiple file upload on a single command line
+ - custom maximum transfer rate
+ - redirectable stderr
+
+libcurl supports
+ - full URL syntax with no length limit
 - custom maximum download time
 - custom least download speed acceptable
 - custom output result after completion
- - multiple URLs
 - guesses protocol from host name unless specified
 - uses .netrc
 - progress bar/time specs while downloading
 - "standard" proxy environment variables support
- - config file support
 - compiles on win32 (reported builds on 40+ operating systems)
- - redirectable stderr
 - selectable network interface for outgoing traffic
- - IPv6 support
+ - IPv6 support on unix and Windows
 - persistant connections
 - socks5 support
 - supports user name + password in proxy environment variables
 - operations through proxy "tunnel" (using CONNECT)
- - supports transfers of large files (>2GB and >4GB)
+ - supports large files (>2GB and >4GB) both upload/download
+ - replacable memory functions (malloc, free, realloc, etc)
+ - asynchronous name resolving (*6)

 HTTP
 - HTTP/1.1 compliant (optionally uses 1.0)
@@ -35,7 +42,7 @@ HTTP
 - POST
 - multipart formpost (RFC1867-style)
 - authentication: Basic, Digest, NTLM(*1), GSS-Negotiate/Negotiate(*3) and
-   SPNEGO (*4)
+   SPNEGO (*4) to server and proxy
 - resume (both GET and PUT)
 - follow redirects
 - maximum amount of redirects to follow
@@ -80,6 +87,8 @@ FTP
 - via http-proxy
 - all operations can be tunneled through a http-proxy
 - customizable to retrieve file modification date
+ - third party transfers
+ - no dir depth limit

 FTPS (*1)
 - explicit ftps:// support that use SSL on both connections
@@ -103,6 +112,8 @@ GOPHER

 FILE
 - URL support
+ - "uploads"
+ - resume

 FOOTNOTES
 =========
@@ -112,3 +123,4 @@ FOOTNOTES
  *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
  *4 = requires FBopenssl
  *5 = requires a krb4 library, such as the MIT one or similar.
+  *6 = requires c-ares
--- a/docs/HISTORY
+++ b/docs/HISTORY
@@ -126,3 +126,16 @@ visitors to the curl.haxx.se site. Five official web mirrors.
 December 2003, full-fledged SSL for FTP is supported.

 January 2004: curl 7.11.0 introduced large file support.
+
+June 2004: curl 7.12.0 introduced IDN support. 10 official web mirrors.
+
+August 2004:
+ Curl and libcurl 7.12.1
+
+ Public curl release number:               82
+ Releases counted from the very beginning: 109
+ Available command line options:           96
+ Available curl_easy_setopt() options:     120
+ Number of public functions in libcurl:    36
+ Amount of public web site mirrors:        12
+ Number of known libcurl bindings:         26
--- a/docs/HOWTO-RELEASE
+++ b/docs/HOWTO-RELEASE
@@ -1,25 +0,0 @@
-Steps To Perform When Building a Public Release
-
-* "make distcheck"
-
-* ./maketgz
- then upload the 3 curl packages maketgz created
-
-* update these files:
-  www/_download.html
-  www/_changes.html
-  www/_newslog.html
-  www/Makefile
-
-* commit the web changes
-
-* 'cvs commit'
-
-* 'cvs tag'
-
-* write the release announcement, including:
-  - changes / bugfixes
-  - other curl-related news
-  - contributors
-
-* mail release-announcement to curl-announce and curl-users
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -79,8 +79,18 @@ UNIX
       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:
@@ -158,17 +168,9 @@ Win32
        Make the sources in the src/ drawer be a "win32 console application"
        project. Name it curl.

-        With VC++, add 'ws2_32.lib' to the link libs when you build curl!
-        Borland seems to do that itself magically. Of course you have to make
-        sure it links with the libcurl too!
-
        For VC++ 6, there's an included Makefile.vc6 that should be possible
        to use out-of-the-box.

-        Microsoft note: add /Zm200 to the compiler options to increase the
-        compiler's memory allocation limit, as the hugehelp.c won't compile
-        due to "too long puts string".
-

   With SSL:

@@ -189,28 +191,33 @@ Win32
      Microsoft command line style
      ----------------------------

+        Run the 'vcvars32.bat' file to get a proper environment. The
+        vcvars32.bat file is part of the Microsoft development environment and
+        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
+        provided that you installed Visual C/C++ 6 in the default directory.
+
+        Then run 'nmake vc' in curl's root directory.
+
+        If you want to compile with zlib support, you will need to build
+        zlib (http://www.gzip.org/zlib/) as well. Please read the zlib
+        documentation on how to compile zlib. Define the ZLIB_PATH environment
+        variable to the location of zlib.h and zlib.lib, for example:
+
+          set ZLIB_PATH=c:\zlib-1.2.1
+
+        Then run 'nmake vc-zlib' in curl's root directory.
+
+        If you want to compile with SSL support you need the OpenSSL package.
        Please read the OpenSSL documentation on how to compile and install
        the OpenSSL libraries.  The build process of OpenSSL generates the
        libeay32.dll and ssleay32.dll files in the out32dll subdirectory in
        the OpenSSL home directory.  OpenSSL static libraries (libeay32.lib,
        ssleay32.lib, RSAglue.lib) are created in the out32 subdirectory.

-        Run the 'vcvars32.bat' file to get a proper environment. The
-        vcvars32.bat file is part of the Microsoft development environment and
-        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
-        provided that you installed Visual C/C++ 6 in the default directory.
-
        Before running nmake define the OPENSSL_PATH environment variable with
        the root/base directory of OpenSSL, for example:

-          set OPENSSL_PATH=c:\openssl-0.9.7a
-
-        lib/Makefile.vc6 depends on 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.1.4
+          set OPENSSL_PATH=c:\openssl-0.9.7d

        Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
        directory.  'nmake vc-ssl' will create a libcurl static and dynamic
@@ -223,6 +230,7 @@ Win32
        links curl.exe against libcurl and OpenSSL dynamically.
        This executable requires libcurl.dll and the OpenSSL DLLs
        at runtime.
+        Run 'nmake vc-ssl-zlib' to build with both ssl and zlib support.

      Microsoft / Borland style
      -------------------------
@@ -285,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
 ========

@@ -355,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
@@ -389,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(..)
@@ -399,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
 =======
@@ -472,6 +449,115 @@ AmigaOS
   you can find a precompiled package at http://amiga.sourceforge.net/OpenSSL/


+NetWare
+=======
+
+   To compile curl.nlm / libcurl.nlm you need:
+   - 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 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 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 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...; don't know yet why they fail when build with
+   gcc though; if you want to compile with Ares support then set an env var
+   WITH_ARES=1; I've not tested yet including libares into curl.
+   Any help in testing appreciated!
+   Builds automatically created 4 times a day from current CVS are here:
+   http://www.gknw.com/mirror/curl/autobuilds/
+   the status of these builds can be viewed at the autobuild table:
+   http://curl.haxx.se/auto/
+
+
+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
@@ -507,6 +593,7 @@ 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
@@ -527,25 +614,10 @@ PORTS
        - s390 Linux
        - XScale/PXA250 Linux 2.4

-OpenSSL
-=======
-
-   You'll find OpenSSL information at:
-
-      http://www.openssl.org
-
-
-MingW32/Cygwin
-==============
-
-   You'll find MingW32 and Cygwin information at:
-
-      http://www.mingw.org
-
-OpenLDAP
-========
-
-   You'll find OpenLDAP information at:
-
-      http://www.openldap.org
+Useful URLs
+===========

+OpenSSL   http://www.openssl.org
+MingW     http://www.mingw.org
+OpenLDAP  http://www.openldap.org
+Zlib      http://www.gzip.org/zlib/
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -3,53 +3,78 @@ 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!

-* NTLM authentication with passwords longer than 14 letters fail. There is
-  a known fix for this, planned to come in curl 7.11.2
+19. FTP 3rd party transfers with the multi interface doesn't work. Test:
+  define CURL_MULTIEASY, rebuild curl, run test case 230 - 232.

-* Doing resumed upload over HTTP does not work with '-C -', because curl
+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
+
+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.
+
+11. Using configure --disable-[protocol] may cause 'make test' to fail for
+  tests using the disabled protocol(s).
+
+10. To get HTTP Negotiate authentication to work fine, you need to provide a
+  (fake) user name (this concerns both curl and the lib) because the code
+  wrongly only considers authentication if there's a user name provided.
+  Bug report #1004841. How? http://curl.haxx.se/mail/lib-2004-08/0182.html
+
+9. --limit-rate using -d or -F does not work. This is because the limit logic
+  is provided by the curl app in its read/write callbacks, and when doing
+  -d/-F the callbacks aren't used! Bug report #921395.
+
+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).

-* 1) libcurl does a POST
-  2) receives a 100-continue
-  3) sends away the POST
-  Now, if nothing else is returned from the server, libcurl MUST return
-  CURLE_GOT_NOTHING, but it seems it returns CURLE_OK as it seems to count
-  the 100-continue reply as a good enough reply.
-
-* 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

-* Downloading 0 (zero) bytes files over FTP will not create a zero byte file
-  locally, which is because libcurl doesn't call the write callback with zero
-  bytes. Explained here: http://curl.haxx.se/mail/archive-2003-04/0143.html
-
-* Using CURLOPT_FAILONERROR (-f/--fail) will make authentication to stop
-  working if you use anything but plain Basic auth.
-
-* IPv6 support on AIX 4.3.3 doesn't work due to a missing sockaddr_storage
+4. IPv6 support on AIX 4.3.3 doesn't work due to a missing sockaddr_storage
  struct. It has been reported to work on AIX 5.1 though.

-* GOPHER transfers seem broken
+3. GOPHER transfers seem broken

-* configure --disable-http is not fully supported. All other protocols seem
-  to work to disable.
-
-* 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
@@ -58,3 +83,7 @@ may have been fixed since this was written!
  and havoc is what happens.
  More details on this is found in this libcurl mailing list thread:
  http://curl.haxx.se/mail/lib-2002-08/0000.html
+
+1. LDAP support requires that not only the OpenLDAP shared libraries be
+   present at run time, but the development libraries (liblber.so and
+   libldap.so) as well (not applicable to Windows).
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -0,0 +1,86 @@
+         License Mixing with apps, libcurl and Third Party Libraries
+         ===========================================================
+
+libcurl can be built to use a fair amount of various third party libraries,
+libraries that are written and provided by other parties that are distributed
+using their own licenses. Even libcurl itself contains code that may cause
+problems to some. This document attempts to describe what licenses libcurl and
+the other libraries use and what possible dilemmas linking and mixing them all
+can lead to for end users.
+
+I am not a lawyer and this is not legal advice!
+
+One common dilemma is that GPL[1]-licensed code is not allowed to be linked
+with code licensed under the Original BSD license (with the announcement
+clause, unless there's a specified exception in the GPL-licensed module). You
+may still build your own copies that use them all, but distributing them as
+binaries would be to violate the GPL license - unless you accompany your
+license with an exception[2]. This particular problem was addressed when the
+Modified BSD license was created, which does not have the annoncement clause
+that collides with GPL.
+
+libcurl http://curl.haxx.se/docs/copyright.html
+
+        Uses an MIT (or Modified BSD)-style license that is as liberal as
+        possible.  Some of the source files that deal with KRB4 have Original
+        BSD-style announce-clause licenses. You may not distribute binaries
+        with krb4-enabled libcurl that also link with GPL-licensed code!
+
+OpenSSL http://www.openssl.org/source/license.html
+
+        Uses an Original BSD-style license with an announement clause that
+        makes it "incompatible" with GPL. You are not allowed to ship binaries
+        that link with OpenSSL that includes GPL code (unless that specific
+        GPL code includes an exception for OpenSSL - a habit that is growing
+        more and more common).
+
+c-ares  http://daniel.haxx.se/projects/c-ares/license.html
+
+        Uses an MIT license that is very liberal and imposes no restrictions
+        on any other library or part you may link with.
+
+zlib    http://www.gzip.org/zlib/zlib_license.html
+
+        Uses an MIT-style license that shouldn't collide with any other
+        library.
+
+krb4
+
+        While nothing in particular says that a Kerberos4 library must use any
+        particular license, the one I've tried and used successfully so far
+        (kth-krb4) is Original BSD-licensed with the announcement clause. Some
+        of the code in libcurl that is written to deal with Kerberos4 likewise
+        have such a license.
+
+GSSAPI
+
+        While nothing in particular says that a GSS/Kerberos5 library must use
+        any particular license, the one I've used (Heimdal) is Original BSD-
+        licensed with the announcement clause.
+
+fbopenssl
+
+        Unclear license. Based on its name, I assume that it uses the OpenSSL
+        license and thus shares the same issues as described for OpenSSL
+        above.
+
+libidn  http://www.gnu.org/licenses/lgpl.html
+
+        Uses the GNU Lesser General Public License. LGPL is a variation of GPL
+        with slightly less aggressive "copyleft". This license requires more
+        requirements to be met when distributing binaries, see the license for
+        details. Also note that if you distribute a binary that includes this
+        library, you must also include the full LGPL license text. Please
+        properly point out what parts of the distributed package that the
+        license addresses.
+
+OpenLDAP http://www.openldap.org/software/release/license.html
+
+        Uses a Modified BSD-style license. Since libcurl uses OpenLDAP as a
+        shared library only, I have not heard of anyone that ships OpenLDAP
+        linked with libcurl in an app.
+
+
+[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
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -63,6 +63,11 @@ USING PASSWORDS

        curl -u name:passwd ftp://machine.domain:port/full/path/to/file

+ FTPS
+
+   It is just like for FTP, but you may also want to specify and use
+   SSL-specific options for certificates etc.
+
 HTTP

   The HTTP URL doesn't support user and password in the URL string. Curl
@@ -75,6 +80,12 @@ USING PASSWORDS

        curl -u name:passwd http://machine.domain/full/path/to/file

+   HTTP offers many different methods of authentication and curl supports
+   several: Basic, Digest, NTLM and Negotiate. Without telling which method to
+   use, curl defaults to Basic. You can also ask curl to pick the most secure
+   ones out of the ones that the server accepts for the given URL, by using
+   --anyauth.
+
   NOTE! Since HTTP URLs don't support user and password, you can't use that
   style when using Curl via a proxy. You _must_ use the -u style fetch
   during such circumstances.
@@ -159,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.

@@ -359,7 +370,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:

@@ -377,7 +388,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:
@@ -406,7 +417,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.)

@@ -426,14 +437,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:

@@ -579,7 +590,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:

@@ -754,7 +765,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
@@ -819,28 +830,28 @@ 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

  For your convenience, we have several open mailing lists to discuss curl,
  its development and things relevant to this. Get all info at
-  http://curl.haxx.se/mail/. The lists available are:
+  http://curl.haxx.se/mail/. Some of the lists available are:

  curl-users

@@ -854,24 +865,18 @@ MAILING LISTS

  curl-announce

-    Low-traffic. Only announcements of new public versions.
+    Low-traffic. Only receives announcements of new public versions. At worst,
+    that makes something like one or two mails per month, but usually only one
+    mail every second month.

-  curl-and-PHP
+  curl-and-php

    Using the curl functions in PHP. Everything curl with a PHP angle. Or PHP
    with a curl angle.

-  curl-commits
+  curl-and-python

-    Receives notifications on all CVS commits done to the curl source module.
-    This can become quite a large amount of mails during intense development,
-    be aware. This is for us who like email...
-
-  curl-www-commits
-
-    Receives notifications on all CVS commits done to the curl www module
-    (basicly the web site).  This can become quite a large amount of mails
-    during intense changing, be aware. This is for us who like email...
+    Python hackers using curl with or without the python binding pycurl.

  Please direct curl questions, feature requests and trouble reports to one of
  these mailing lists instead of mailing any individual.
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,28 +4,20 @@

 AUTOMAKE_OPTIONS = foreign no-dependencies

-man_MANS = \
-	curl.1 \
-	curl-config.1
-
-GENHTMLPAGES = \
-	curl.html \
-	curl-config.html
+man_MANS = curl.1 curl-config.1
+GENHTMLPAGES = curl.html curl-config.html
+PDFPAGES = curl.pdf curl-config.pdf

 HTMLPAGES = $(GENHTMLPAGES) index.html

-PDFPAGES = \
-	curl.pdf \
-	curl-config.pdf
-
 SUBDIRS = examples libcurl

 CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)

 EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS	\
-	     README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS	\
-	     VERSIONS KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) \
-	     HISTORY INSTALL libcurl-the-guide $(PDFPAGES)
+ README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS	\
+ KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) HISTORY INSTALL		\
+ $(PDFPAGES) LICENSE-MIXING README.netware

 MAN2HTML= roffit < $< >$@

--- a/docs/README.netware
+++ b/docs/README.netware
@@ -0,0 +1,27 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+README.netware
+
+  Read the README file first.
+
+  Curl has been successfully compiled with gcc / nlmconv on different flavours
+  of Linux as well as with the official Metrowerks CodeWarrior compiler.
+  While not being the main development target, a continously growing share of 
+  curl users are NetWare-based, specially also consuming the lib from PHP.
+      
+  The unix-style man pages are tricky to read on windows, so therefore are all
+  those pages converted to HTML as well as pdf, and included in the release
+  archives.
+
+  The main curl.1 man page is also "built-in" in the command line tool. Use a
+  command line similar to this in order to extract a separate text file:
+
+        curl -M >manual.txt
+
+  Read the INSTALL file for instructions how to compile curl self.
+
+  
--- a/docs/SSLCERTS
+++ b/docs/SSLCERTS
@@ -1,46 +1,92 @@
                      Peer SSL Certificate Verification
                      =================================

-Since version 7.10, libcurl performs peer SSL certificate verification by
-default. This is done by installing a default CA cert bundle on 'make install'
-(or similar), that CA bundle package is used by default on operations against
-SSL servers.
+libcurl performs peer SSL certificate verification by default. This is done by
+installing a default CA cert bundle on 'make install' (or similar), that CA
+bundle package is used by default on operations against SSL servers.

-Alas, if you communicate with HTTPS servers using certificates that are signed
-by CAs present in the bundle, you will not notice any changed behavior and you
-will seamlessly get a higher security level on your SSL connections since you
-can be sure that the remote server really is the one it claims to be.
+If you communicate with HTTPS or FTPS servers using certificates that are
+signed by CAs present in the bundle, you can be sure that the remote server
+really is the one it claims to be.

 If the remote server uses a self-signed certificate, if you don't install
 curl's CA cert bundle, if the server uses a certificate signed by a CA that
-isn't included in the bundle or if the remoste host is an imposter
-impersonating your favourite site, and you want to transfer files from this
+isn't included in the bundle or if the remote host is an impostor
+impersonating your favorite site, and you want to transfer files from this
 server, do one of the following:

 1. Tell libcurl to *not* verify the peer. With libcurl you disable with with
    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);

-    With the curl command tool, you disable this with -k/--insecure.
+    With the curl command line tool, you disable this with -k/--insecure.

 2. Get a CA certificate that can verify the remote server and use the proper
    option to point out this CA cert for verification when connecting. For
    libcurl hackers: curl_easy_setopt(curl, CURLOPT_CAPATH, capath);

-    With the curl command tool: --cacert [file]
-
-Neglecting to use one of the above menthods when dealing with a server using a
-certficate that isn't signed by one of the certficates in the installed CA
-cert bundle, will cause SSL to report an error ("certificate verify failed")
-during the handshake and SSL will then refuse further communication with that
-server.
-
-This procedure has been deemed The Right Thing even though it adds this extra
-trouble for some users, since it adds security to a majority of the SSL
-connections that previously weren't really secure. It turned out many people
-were using previous versions of curl/libcurl without realizing the need for
-the CA cert options to get truly secure SSL connections.
+    With the curl command line tool: --cacert [file]

+ 3. Add the CA cert for your server to the existing default CA cert bundle.
    The default path of the CA bundle installed with the curl package is:
    /usr/local/share/curl/curl-ca-bundle.crt, which can be changed by running
    configure with the --with-ca-bundle option pointing out the path of your
    choice.
+
+    To do this, you need to get the CA cert for your server in PEM format and
+    then append that to your CA cert bundle.
+
+    If you use Internet Explorer, this is one way to get extract the CA cert
+    for a particular server:
+
+     o View the certificate by double-clicking the padlock
+     o Find out where the CA certificate is kept (Certificate>
+       Authority Information Access>URL)
+     o Get a copy of the crt file using curl
+     o Convert it from crt to PEM using the openssl tool:
+       openssl x509 -inform DES -in yourdownloaded.crt \
+       -out outcert.pem -text
+     o Append the 'outcert.pem' to the CA cert bundle or use it stand-alone
+       as described below.
+
+     (Thanks to Frankie V for this description)
+
+    If you use the 'openssl' tool, this is one way to get extract the CA cert
+    for a particular server:
+
+     o openssl s_client -connect xxxxx.com:443 |tee logfile
+     o type "QUIT", followed by the "ENTER" key
+     o The certificate will have "BEGIN CERTIFICATE" and "END CERTIFICATE"
+       markers.
+     o If you want to see the data in the certificate, you can do: "openssl
+       x509 -inform PEM -in certfile -text -out certdata" where certfile is
+       the cert you extracted from logfile. Look in certdata.
+     o If you want to trust the certificate, you can append it to your
+       cert_bundle or use it stand-alone as described. Just remember that the
+       security is no better than the way you obtained the certificate.
+
+     (Thanks to Doug Kaufman for this description)
+
+ 4. If you're using the curl command line tool, you can specify your own CA
+    cert path by setting the environment variable CURL_CA_BUNDLE to the path
+    of your choice.
+
+    If you're using the curl command line tool on Windows, curl will search
+    for a CA cert file named "curl-ca-bundle.crt" in these directories and in
+    this order:
+      1. application's directory
+      2. current working directory
+      3. Windows System directory (e.g. C:\windows\system32)
+      4. Windows Directory (e.g. C:\windows)
+      5. all directories along %PATH%
+
+ 5. Get a better/different/newer CA cert bundle! One option is to extract the
+    one a recent Mozilla browser uses, by following the instruction found
+    here:
+
+        http://curl.haxx.se/docs/caextract.html
+
+Neglecting to use one of the above methods when dealing with a server using a
+certificate that isn't signed by one of the certificates in the installed CA
+cert bundle, will cause SSL to report an error ("certificate verify failed")
+during the handshake and SSL will then refuse further communication with that
+server.
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -98,3 +98,13 @@ Gisle Vanem <gvanem@broadpark.no>
 Giuseppe Attardi <attardi@di.unipi.it>
 Tor Arntsen <tor@spacetec.no>
 David Byron <DByron@everdreamcorp.com>
+David Phillips
+Alexander Krasnostavsky
+G<EFBFBD>nter Knauf
+Bertrand Demiddelaer
+Peter Sylvester
+Alexis S. L. Carvalho
+Casey O'Donnell
+Marty Kuhrt
+James Bursa
+Greg Hewgill
--- 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.
@@ -33,11 +33,19 @@ TODO
   return informational stuff as errors, consider a new info returned by
   curl_easy_getinfo() #845941

- * Option to set the SO_KEEPALIVE socket option to make libcurl notice and
-   disconnect very long time idle connections.
+ * Use 'struct lifreq' and SIOCGLIFADDR instead of 'struct ifreq' and
+   SIOCGIFADDR on newer Solaris versions as they claim the latter is obsolete.
+
+ * 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 that returns only two arrays with file
+   desrciptors for reading and writing to allow the app to use whatever
+   function it prefers. Plus, this allows apps to avoid the FD_SETSIZE problem
+   with select().
+
 * Add curl_multi_timeout() to make libcurl's ares-functionality better.

 * Make sure we don't ever loop because of non-blocking sockets return
@@ -57,6 +65,21 @@ TODO

 FTP

+ * Make the detection of (bad) %0d and %0a codes in FTP url parts earlier in
+   the process to avoid doing a resolve and connect in vain.
+
+ * Code overhaul to make it more state-machine like and to _never_ block on
+   waiting for server responses when used with the multi interface.
+
+ * Support GSS/Kerberos 5 for ftp file transfer. This will allow user
+   authentication and file encryption.  Possible libraries and example clients
+   are available from MIT or Heimdal. Requsted by Markus Moeller.
+
+ * 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
+   (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:
   http://curl.haxx.se/mail/archive-2003-04/0126.html
@@ -70,15 +93,22 @@ TODO
 * Since USERPWD always override the user and password specified in URLs, we
   might need another way to specify user+password for anonymous ftp logins.

- HTTP
+ * The FTP code should get a way of returning errors that is known to still
+   have the control connection alive and sound. Currently, a returned error
+   from within ftp-functions does not tell if the control connection is still
+   OK to use or not. This causes libcurl to fail to re-use connections
+   slightly too often.

- * Digest and GSS-Negotiate support for HTTP proxies. They only work on
-   direct-connections to the server.
+ HTTP

 * Pipelining. Sending multiple requests before the previous one(s) are done.
   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
@@ -91,21 +121,25 @@ TODO

 SSL

- * If you really want to improve the SSL situation, you should probably have a
-   look at SSL cafile loading as well - quick traces look to me like these are
-   done on every request as well, when they should only be necessary once per
-   ssl context (or once per handle). Even better would be to support the SSL
-   CAdir option - instead of loading all of the root CA certs for every
-   request, this option allows you to only read the CA chain that is actually
-   required (into the cache)...
+ * Anton Fedorov's "dumpcert" patch:
+   http://curl.haxx.se/mail/lib-2004-03/0088.html
+
+ * Evaluate/apply Gertjan van Wingerde's SSL patches:
+   http://curl.haxx.se/mail/lib-2004-03/0087.html
+
+ * "Look at SSL cafile - quick traces look to me like these are done on every
+   request as well, when they should only be necessary once per ssl context
+   (or once per handle)". The major improvement we can rather easily do is to
+   make sure we don't create and kill a new SSL "context" for every request,
+   but instead make one for every connection and re-use that SSL context in
+   the same style connections are re-used. It will make us use slightly more
+   memory but it will libcurl do less creations and deletions of SSL contexts.

 * Add an interface to libcurl that enables "session IDs" to get
   exported/imported. Cris Bailiff said: "OpenSSL has functions which can
   serialise the current SSL state to a buffer of your choice, and
   recover/reset the state from such a buffer at a later date - this is used
-   by mod_ssl for apache to implement and SSL session ID cache". This whole
-   idea might become moot if we enable the 'data sharing' as mentioned in the
-   LIBCURL label above.
+   by mod_ssl for apache to implement and SSL session ID cache".

 * OpenSSL supports a callback for customised verification of the peer
   certificate, but this doesn't seem to be exposed in the libcurl APIs. Could
@@ -114,8 +148,12 @@ TODO

 * 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://gnutls.hellug.gr/)
+   (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

 LDAP

@@ -123,8 +161,35 @@ 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
+   "curl --sync http://example.net/{index,calendar,history}.html"
+
+   Downloads a range or set of URLs using the remote name, but only if the
+   remote file is newer than the local file. A Last-Modified HTTP date header
+   should also be used to set the mod date on the downloaded file.
+   (idea from "Brianiac")
+
+ * Globbing support for -d and -F, as in 'curl -d "name=foo[0-9]" URL'.
+   Requested by Dane Jensen and others. This is easily scripted though.
+
 * Add an option that prevents cURL from overwiting existing local files. When
   used, and there already is an existing file with the target file name
   (either -O or -o), a number should be appended (and increased if already
@@ -158,6 +223,18 @@ TODO
 * --data-encode that URL encodes the data before posting
   http://curl.haxx.se/mail/archive-2003-11/0091.html (Kevin Roth suggested)

+ * Provide a way to make options bound to a specific URL among several on the
+   command line. Possibly by letting ':' separate options between URLs,
+   similar to this:
+
+      curl --data foo --url url.com : \
+          --url url2.com : \
+          --url url3.com --data foo3
+
+   (More details: http://curl.haxx.se/mail/archive-2004-07/0133.html)
+
+   The example would do a POST-GET-POST combination on a single command line.
+
 BUILD

 * Consider extending 'roffit' to produce decent ASCII output, and use that
@@ -168,9 +245,6 @@ TODO
 * 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.

@@ -185,10 +259,10 @@ TODO
 * curl_easy_cleanup() returns void, but curl_multi_cleanup() returns a
   CURLMcode. These should be changed to be the same.

- * curl_formparse() should be removed
-
 * remove obsolete defines from curl/curl.h

+ * make several functions use size_t instead of int in their APIs
+
 * remove the following functions from the public API:
   curl_getenv
   curl_mprintf (and variations)
@@ -197,3 +271,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,24 +364,80 @@ 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
-  client-side certificates. All certificates are locked with a PIN-code, why
-  you need to enter the unlock-code before the certificate can be used by
-  curl. The PIN-code can be specified on the command line or if not, entered
-  interactively when curl queries for it. Use a certificate with curl on a
-  HTTPS server like:
+  client-side certificates. All certificates are locked with a pass phrase,
+  which you need to enter before the certificate can be used by curl. The pass
+  phrase can be specified on the command line or if not, entered interactively
+  when curl queries for it. Use a certificate with curl on a HTTPS server
+  like:

        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/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
@@ -1,8 +1,27 @@
-.\" You can view this file with:
-.\" nroff -man curl.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 1 "5 Mar 2004" "Curl 7.11.1" "Curl Manual"
+.TH curl 1 "25 Jan 2005" "Curl 7.13.0" "Curl Manual"
 .SH NAME
 curl \- transfer a URL
 .SH SYNOPSIS
@@ -37,9 +56,10 @@ or you can get sequences of alphanumeric series by using [] as in:
 ftp://ftp.numericals.com/file[001-100].txt    (with leading zeros)
 ftp://ftp.letters.com/file[a-z].txt

-No nesting of the sequences is supported at the moment:
+No nesting of the sequences is supported at the moment, but you can use
+several ones next to each other:

- http://www.any.org/archive[1996-1999]/volume[1-4]part{a,b,c,index}.html
+ http://any.org/archive[1996-1999]/vol[1-4]/part{a,b,c}.html

 You can specify any amount of URLs on the command line. They will be fetched
 in a sequential manner in the specified order.
@@ -71,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>"
@@ -95,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"
@@ -123,7 +148,7 @@ If this option is used several times, each occurrence will toggle it on/off.
 .IP "--connect-timeout <seconds>"
 Maximum time in seconds that you allow the connection to the server to take.
 This only limits the connection phase, once curl has connected this option is
-of no more use. See also the \fI--max-time\fP option.
+of no more use. See also the \fI-m/--max-time\fP option.

 If this option is used several times, the last one will be used.
 .IP "-c/--cookie-jar <file name>"
@@ -140,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
@@ -154,7 +179,11 @@ transfer. It then uses the given output/input files to figure that out.
 If this option is used several times, the last one will be used.
 .IP "--create-dirs"
 When used in conjunction with the -o option, curl will create the necessary
-local directory hierarchy as needed.
+local directory hierarchy as needed. This option creates the dirs mentioned
+with the -o option, nothing else. If the -o file name uses no dir or if the
+dirs it mentions already exist, no dir will be created.
+
+To create remote directories when using FTP, try \fI--ftp-create-dirs\fP.
 .IP "--crlf"
 (FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).

@@ -212,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"
@@ -241,6 +270,11 @@ 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.

 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
@@ -296,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
@@ -304,19 +344,19 @@ 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
+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.
 .IP "--ftp-ssl"
 (FTP) Make the FTP connection switch to use SSL/TLS. (Added in 7.11.0)

-If this option is used twice, the second will again disable silent failure.
+If this option is used twice, the second will again disable this.
 .IP "-F/--form <name=content>"
 (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
+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
@@ -328,14 +368,18 @@ 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 for the file upload part, by
-using 'type=', in a manner similar to:
+You can also tell curl what Content-Type to use by using 'type=', in a manner
+similar to:

 \fBcurl\fP -F "web=@index.html;type=text/html" url.com

+or
+
+\fBcurl\fP -F "name=daniel;type=text/foo" url.com
+
 See further examples and details in the MANUAL.

 This option can be used multiple times.
@@ -392,7 +436,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)

@@ -420,7 +464,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.
@@ -530,12 +574,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.

@@ -559,7 +603,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
@@ -589,11 +633,23 @@ You may use this option as many times as you have number of URLs.
 (SSL) Pass phrase for the private key

 If this option is used several times, the last one will be used.
+.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
+the default authentication method curl uses with proxies.
+
+If this option is used twice, the second will again disable proxy HTTP Basic
+authentication.
+.IP "--proxy-digest"
+Tells curl to use HTTP Digest authentication when communicating with the given
+proxy. Use \fI--digest\fP for enabling HTTP Digest with a remote host.
+
+If this option is used twice, the second will again disable proxy HTTP Digest.
 .IP "--proxy-ntlm"
-Tells curl to use NTLM authentication when communicating with the given
+Tells curl to use HTTP NTLM authentication when communicating with the given
 proxy. Use \fI--ntlm\fP for enabling NTLM with a remote host.

-If this option is used twice, the second will again disable proxy NTLM.
+If this option is used twice, the second will again disable proxy HTTP NTLM.
 .IP "-p/--proxytunnel"
 When an HTTP proxy is used (\fI-x/--proxy\fP), this option will cause non-HTTP
 protocols to attempt to tunnel through the proxy instead of merely using it to
@@ -626,13 +682,14 @@ instead of PORT by using \fI--disable-eprt\fP. EPRT is really PORT++.
 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>"
-(FTP) Send an arbitrary command to the remote FTP server, by using the QUOTE
-command of the server. Not all servers support this command, and the set of
-QUOTE commands are server specific! 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 failure for one
-of the commands, the entire operation will be aborted.
+(FTP) Send an arbitrary command to the remote FTP server. Quote commands are
+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.

 This option can be used multiple times.
 .IP "--random-file <file>"
@@ -684,6 +741,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.
@@ -707,6 +795,11 @@ is a plain '-', it is instead written to stdout. This option has no point when
 you're using a shell with decent redirecting capabilities.

 If this option is used several times, the last one will be used.
+.IP "--tcp-nodelay"
+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 occurrence toggles this on/off.
 .IP "-t/--telnet-option <OPT=val>"
 Pass options to the telnet protocol. Supported options are:

@@ -757,7 +850,8 @@ to read for untrained humans.
 If this option is used several times, the last one will be used. (Added in
 7.9.7)
 .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>"
@@ -776,7 +870,7 @@ 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.

-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
@@ -804,18 +898,20 @@ 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.
 .RE
 .IP "-w/--write-out <format>"
 Defines what to display after a completed and successful operation. The format
@@ -844,6 +940,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.
@@ -861,9 +961,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
@@ -886,6 +992,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.
@@ -898,7 +1010,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.

@@ -930,22 +1042,18 @@ not set.

 If this option is used several times, the last one will be used.
 .IP "-z/--time-cond <date expression>"
-(HTTP)
-Request to get a file that has been modified later than the given time and
+(HTTP) Request a file that has been modified later than the given time and
 date, or one that has been modified before that time. The date expression can
 be all sorts of date strings or if it doesn't match any internal ones, it
 tries to get the time from a given file name instead! See the
-.BR "GNU date(1)"
-or
-.BR "curl_getdate(3)"
-man pages for date expression details.
+\fIcurl_getdate(3)\fP man pages for date expression details.

 Start the date expression with a dash (-) to make it request for a document
 that is older than the given date/time, default is a document that is newer
 than the specified date/time.

 If this option is used several times, the last one will be used.
-.IP "-Z/--max-redirs <num>"
+.IP "--max-redirs <num>"
 Set maximum number of redirection-followings allowed. If \fI-L/--location\fP
 is used, this option can be used to prevent curl from following redirections
 \&"in absurdum".
@@ -963,6 +1071,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
@@ -1035,7 +1154,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.
@@ -1145,4 +1264,4 @@ ftp://ftp.sunet.se/pub/www/utilities/curl/
 .SH "SEE ALSO"
 .BR ftp (1),
 .BR wget (1),
-.BR snarf (1)
+
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -5,11 +5,12 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies

 EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c		\
-	     persistant.c ftpget.c Makefile.example			\
-	     multithread.c getinmemory.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
+ persistant.c ftpget.c Makefile.example multithread.c getinmemory.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	\
+ anyauthput.c htmltitle.cc

 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/Show More
+++ b/Show More