release time

the user-agent fix
the libtest source codes that use curlx_tv* functions MUST use the
2007-01-29 14:53:01 +00:00 · 2007-01-29 10:12:30 +00:00 · 2007-01-29 10:09:06 +00:00 · 2007-01-29 09:26:36 +00:00 · 2007-01-29 00:51:02 +00:00 · 2007-01-28 22:45:22 +00:00
650 changed files with 28543 additions and 8766 deletions
--- a/2186
+++ b/2186
--- a/CHANGES.2005
+++ b/CHANGES.2005
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE

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

 All rights reserved.

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

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

 With Mac OS X 10.2 and the associated Developer Tools, the installed versions
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2007, 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
@@ -73,6 +73,14 @@ mingw32-ssl:
 	$(MAKE) -C lib -f Makefile.m32 SSL=1 ZLIB=1
 	$(MAKE) -C src -f Makefile.m32 SSL=1 ZLIB=1

+mingw32-ssh2-ssl:
+	$(MAKE) -C lib -f Makefile.m32 SSH2=1 SSL=1 ZLIB=1
+	$(MAKE) -C src -f Makefile.m32 SSH2=1 SSL=1 ZLIB=1
+
+mingw32-ssh2-ssl-sspi:
+	$(MAKE) -C lib -f Makefile.m32 SSH2=1 SSL=1 SSPI=1 ZLIB=1
+	$(MAKE) -C src -f Makefile.m32 SSH2=1 SSL=1 SSPI=1 ZLIB=1
+
 mingw32-clean:
 	$(MAKE) -C lib -f Makefile.m32 clean
 	$(MAKE) -C src -f Makefile.m32 clean
@@ -212,6 +220,10 @@ netware-ssl-zlib:
 	$(MAKE) -C lib -f Makefile.netware WITH_SSL=1 WITH_ZLIB=1
 	$(MAKE) -C src -f Makefile.netware WITH_SSL=1 WITH_ZLIB=1

+netware-ssh2-ssl-zlib:
+	$(MAKE) -C lib -f Makefile.netware WITH_SSH2=1 WITH_SSL=1 WITH_ZLIB=1
+	$(MAKE) -C src -f Makefile.netware WITH_SSH2=1 WITH_SSL=1 WITH_ZLIB=1
+
 netware-zlib:
 	$(MAKE) -C lib -f Makefile.netware WITH_ZLIB=1
 	$(MAKE) -C src -f Makefile.netware WITH_ZLIB=1
--- a/31
+++ b/31
@@ -7,7 +7,7 @@
 README

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

@@ -33,34 +33,7 @@ WEB SITE
  Visit the curl web site or mirrors for the latest news and downloads:

        Sweden       http://curl.haxx.se/
-        Australia    http://curl.planetmirror.com/
-        Austria      http://curl.gds.tuwien.ac.at/
-        Denmark      http://curl.cofman.dk/
-        France       http://curl.fastmirror.net/
-        Germany      http://curl.freemirror.de/
-        Germany      http://curl.mirror-server.net/
-        Germany      http://curl.mirror.at.stealer.net/
-        Germany      http://curl.mirroring.de/
-        Germany      http://curl.miscellaneousmirror.org/
-        Germany      http://curl.mons-new-media.de/
-        Germany      http://curl.storemypix.com/
-        Germany      http://curl.triplemind.com/
-        Hong Kong    http://curl.hkmirror.org/
-        Japan        http://curl.s-lines.net/
-        Netherlands  http://curl.nedmirror.nl/
-        Russia       http://curl.tsuren.net/
-        Taiwan       http://curl.cs.pu.edu.tw/
-        Thailand     http://curl.siamu.ac.th/
-        US (AZ)      http://curl.islandofpoker.com/
-        US (CA)      http://curl.meulie.net/
-        US (CA)      http://curl.mirror.redwire.net/
-        US (CA)      http://curl.mirrormonster.com/
-        US (CA)      http://curl.signal42.com/
-        US (FL)      http://curl.hoxt.com/
-        US (TX)      http://curl.109k.com/
-        US (TX)      http://curl.hostingzero.com/
-        US (TX)      http://curl.mirrors.cyberservers.net/
-        US (TX)      http://curl.seekmeup.com/
+        Mirrors      http://curlm.haxx.se/

 CVS

--- a/129
+++ b/129
@@ -1,73 +1,86 @@
-Curl and libcurl 7.15.2
+Curl and libcurl 7.16.1

- Public curl release number:               92
- Releases counted from the very beginning: 119
- Available command line options:           112
- Available curl_easy_setopt() options:     129
- Number of public functions in libcurl:    46
- Amount of public web site mirrors:        31
- Number of known libcurl bindings:         32
- Number of contributors:                   474
+ Public curl release number:               97
+ Releases counted from the very beginning: 124
+ Available command line options:           115
+ Available curl_easy_setopt() options:     137
+ Number of public functions in libcurl:    54
+ Amount of public web site mirrors:        39
+ Number of known libcurl bindings:         35
+ Number of contributors:                   539

 This release includes the following changes:
-
- o Support for SOCKS4 proxies (added --socks4)
- o CURLOPT_CONNECT_ONLY and CURLINFO_LASTSOCKET added
- o CURLOPT_LOCALPORT and CURLOPT_LOCALPORTRANGE (--local-port) added
- o Dropped support for the LPRT ftp command
- o Gopher is now officially abandoned as a protocol (lib)curl tries to support
- o curl_global_init() and curl_global_cleanup() are now using a refcount so
-   that it is now legal to call them multiple times. See updated info for
-   details
+ 
+ o Support for SCP and SFTP were added (powered by libssh2)
+ o CURLOPT_CLOSEPOLICY is now deprecated
+ o --ftp-ssl-ccc and CURLOPT_FTP_SSL_CCC were added
+ o HTTP support for non-ASCII platforms
+ o --libcurl was added

 This release includes the following bugfixes:

- o two bugs concerning using curl_multi_remove_handle() before the transfer
-   was complete
- o multi-pass authentication and compressed content
- o minor format string mistake in the GSS/Negotiate code
- o cached DNS entries could remain in the cache too long
- o improved GnuTLS check in configure
- o re-used FTP connections when the second request didn't do a transfer
- o plain --limit-rate [num] means bytes
- o re-creating a dead connection is no longer counted internally as a followed
-   redirect and thus prevents a weird error that would occur if a FTP
-   connection died on an attempted re-use
- o Try PASV after failing to connect to the port the EPSV response contained
- o -P [IP] with non-local address with ipv6-enabled curl
- o -P [hostname] with ipv6-disabled curl
- o libcurl.m4 was updated
- o configure no longer warns if the current path contains a space
- o test suite kill race condition
- o FTP_SKIP_PASV_IP and FTP_USE_EPSV when doing FTP over HTTP proxy
- o Doing a second request with FTP on the same bath path, would make libcurl
-   confuse what current working directory it had
- o FTP over HTTP proxy now sends the second CONNECT properly
- o numerous compiler warnings and build quirks for various compilers have
-   been addressed
- o supports name and passwords up to 255 bytes long, embedded in URLs
- o the HTTP_ONLY define disables the TFTP support
+ o proxy close during CONNECT authentication is now dealt with nicely
+ o the CURLOPT_DEBUGFUNCTION was sometimes called even when CURLOPT_VERBOSE
+   was not enabled
+ o multiple TFTP transfers on the same (easy or multi) handle could cause a
+   crash
+ o SIGSEGV when disconnecting on a transfer on a re-used handle when the
+   host name didn't resolve
+ o stack overwrite on 64bit Windows in the chunked decoding department
+ o HTTP responses on persistent connections without Content-Length nor chunked
+   encoding are now considered to be without response body
+ o Content-Range: header parsing improved
+ o CPU 100% load when HTTP upload connection broke
+ o active FTP didn't work with multi interface
+ o curl_getdate() could be off one hour for TZ time zones with DST, on windows
+ o CURLOPT_FORBID_REUSE works again
+ o CURLOPT_MAXCONNECTS set to zero caused libcurl to SIGSEGV
+ o rate limiting works better
+ o getting FTP response code errors when using the multi-interface caused
+   libcurl to leak memory
+ o no more SIGPIPE when GnuTLS is used
+ o FTP downloading 2 zero byte files in a row
+ o using proxy and URLs without protocol prefixes
+ o first using a proxy and then accessing a site that 'no_proxy' matched,
+   would still make libcurl use the proxy...
+ o curl_easy_duphandle() now makes a handle that is valid for the multi
+   interface since the magic number is set fine
+ o libcurl.pc now uses Libs.private for "private" libs
+ o --limit-rate (CURLOPT_MAX_SEND_SPEED_LARGE and CURLOPT_MAX_RECV_SPEED_LARGE)
+   now work on windows again
+ o improved download performance by avoiding the unconditional "double copying"
+ o base64 encoding/decoding works on non-ASCII platforms
+ o large file downloads
+ o CURLOPT_COOKIELIST set to "ALL" crash
+ o easy handle removal from multi handle before completion
+ o TFTP upload memory leak
+ o curl_easy_reset() now resets the CA bundle path correctly
+ o two User-Agent headers in CONNECT requests with custom User-Agent

-Other curl-related news since the previous public release:
+This release includes the following known bugs:

- o http://curlm.haxx.se/ is new service that automatically redirects you to a
-   curl web mirror that is close to you!
+ o see docs/KNOWN_BUGS (http://curl.haxx.se/docs/knownbugs.html)

- o http://curl.hkmirror.org/ is a new curl web mirror in Hong Kong
- o http://curl.storemypix.com/ is a new curl web mirror in Germany
- o http://curl.s-lines.net/ is a new curl web mirror in Japan
- o http://curl.oss-mirror.org/ is a new curl web mirror in Ireland
- o http://curl.linux-mirror.org/ is a new curl web mirror in Germany
- o pycurl 7.15.1 was released: http://pycurl.sf.net/
- o TclCurl 0.15.1 was released:
+Other curl-related news:
+
+ o TclCurl 7.16.0 was released:
   http://personal1.iddeo.es/andresgarci/tclcurl/english/
+ o Curb - Libcurl bindings for Ruby: http://curb.rubyforge.org/
+
+New curl mirrors:
+
+ o curl.miroir-francais.fr is a new French web mirror
+ o curl.dsmirror.nl is a new Dutch web mirror

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

- Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan
- Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,
- David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher, Kent
- Boortz, Karl Moerder, Shmulik Regev, Ulf H<>rnhammar, Peter Su
- 
+ James Housley, Olaf Stueben, Yang Tse, Gisle Vanem, Bradford Bruce,
+ Ciprian Badescu, Dmitriy Sergeyev, Nir Soffer, Venkat Akella, Toon Verwaest,
+ Matt Witherspoon, Alexey Simak, Martin Skinner, Sh Diao, Jared Lundell,
+ Stefan Krause, Sebastien Willemijns, Alexey Simak, Brendan Jurd,
+ Robson Braga Araujo, David McCreedy, Robert Foreman, Nathanael Nerode,
+ Victor Snezhko, Linus Nielsen Feltzing, Toby Peterson, Dan Fandrich, 
+ Armel Asselin, Michael Wallner, Guenter Knauf
+
        Thanks! (and sorry if I forgot to mention someone)
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-To get fixed in 7.15.2 (planned release: Febrary 2006)
+To get fixed in 7.16.1 (planned release: January 2007)
 ======================

-65 - 
+82 - 
--- a/acinclude.m4
+++ b/acinclude.m4
--- a/ares/AUTHORS
+++ b/ares/AUTHORS
@@ -12,3 +12,11 @@ Gisle Vanem
 Gunter Knauf
 Henrik Stoerner
 Yang Tse
+Nick Mathewson
+Alexander Lazic
+Andreas Rieke
+Guilherme Balena Versiani
+Brad Spencer
+Ravi Pratap
+William Ahern
+Bram Matthys
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,86 @@
  Changelog for the c-ares project

+* November 22
+
+- Install ares_dns.h too
+
+- Michael Wallner fixed this problem: When I set domains in the options
+  struct, and there are domain/search entries in /etc/resolv.conf, the domains
+  of the options struct will be overridden.
+
+* November 6
+
+- Yang Tse removed a couple of potential zero size memory allocations.
+
+- Andreas Rieke fixed the line endings in the areslib.dsp file that I (Daniel)
+  broke in the 1.3.2 release. We should switch to a system where that file is
+  auto-generated. We could rip some code for that from curl...
+
+Version 1.3.2 (November 3, 2006)
+
+* October 12 2006
+
+- Prevent ares_getsock() to overflow if more than 16 sockets are used.
+
+* September 11 2006
+
+- Guilherme Balena Versiani: I noted a strange BUG in Win32 port
+  (ares_init.c/get_iphlpapi_dns_info() function): when I disable the network
+  by hand or disconnect the network cable in Windows 2000 or Windows XP, my
+  application gets 127.0.0.1 as the only name server. The problem comes from
+  'GetNetworkParams' function, that returns the empty string "" as the only
+  name server in that case. Moreover, the Windows implementation of
+  inet_addr() returns INADDR_LOOPBACK instead of INADDR_NONE.
+
+* August 29 2006
+
+- Brad Spencer did
+
+  o made ares_version.h use extern "C" for c++ compilers
+  o fixed compiler warnings in ares_getnameinfo.c
+  o fixed a buffer position init for TCP reads
+
+* August 3 2006
+
+- Ravi Pratap fixed ares_getsock() to actually return the proper bitmap and
+  not always zero!
+
+Version 1.3.1 (June 24, 2006)
+
+* July 23, 2006
+
+- Gisle Vanem added getopt() to the ahost program. Currently accepts
+  only [-t {a|aaaa}] to specify address family in ares_gethostbyname().
+
+* June 19, 2006
+
+- (wahern) Removed "big endian" DNS section and RR data integer parser
+  macros from ares_dns.h, which break c-ares on my Sparc64. Bit-wise
+  operations in C operate on logical values. And in any event the octets are
+  already in big-endian (aka network) byte order so they're being reversed
+  (thus the source of the breakage).
+
+* June 18, 2006
+
+- William Ahern handles EAGAIN/EWOULDBLOCK errors in most of the I/O calls
+  from area_process.c.
+
+  TODO: Handle one last EAGAIN for a UDP socket send(2) in
+  ares__send_query().
+
+* May 10, 2006
+
+- Bram Matthys brought my attention to a libtool peculiarity where detecting
+  things such as C++ compiler actually is a bad thing and since we don't need
+  that detection I added a work-around, much inspired by a previous patch by
+  Paolo Bonzini. This also shortens the configure script quite a lot.
+
+* May 3, 2006
+
+- Nick Mathewson added the ARES_OPT_SOCK_STATE_CB option that when set makes
+  c-ares call a callback on socket state changes. A better way than the
+  ares_getsock() to get full control over the socket state.
+
 * January 9, 2006

 - Alexander Lazic improved the getservbyport_r() configure check.
@@ -28,15 +109,15 @@

 - Added constants that will be used by ares_getaddrinfo

- Made ares_getnameinfo use the reentrant getservbyport (getservbyport_r) if it is
-  available to ensure it works properly in a threaded environment.
+- Made ares_getnameinfo use the reentrant getservbyport (getservbyport_r) if it
+  is available to ensure it works properly in a threaded environment.

 * September 10

 - configure fix for detecting a member in the sockaddr_in6 struct which failed
  on ipv6-enabled HP-UX 11.00

-Version 1.3.0 (August 29, 2004)
+Version 1.3.0 (August 29, 2005)

 * August 21

--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -11,7 +11,7 @@ MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/vc.dsw vc/ahost/ahost.dep \
 # adig and ahost are just sample programs and thus not mentioned with the
 # regular sources and headers
 EXTRA_DIST = CHANGES README.cares Makefile.inc adig.c ahost.c $(man_MANS) \
- $(MSVCFILES) AUTHORS
+ $(MSVCFILES) AUTHORS config-win32.h


 VER=-version-info 1:0:0
@@ -43,7 +43,13 @@ VER=-version-info 1:0:0
 # set age to 0. (c:r:a=0)
 #

-libcares_la_LDFLAGS = $(VER)
+if NO_UNDEFINED
+# The -no-undefined flag is crucial for this to build fine on some platforms
+UNDEF = -no-undefined
+endif
+
+
+libcares_la_LDFLAGS = $(UNDEF) $(VER)

 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
@@ -53,7 +59,7 @@ 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
+libcares_la_HEADERS = ares.h ares_version.h ares_dns.h

 # Make files named *.dist replace the file without .dist extension
 dist-hook:
--- a/ares/Makefile.dj
+++ b/ares/Makefile.dj
@@ -2,32 +2,50 @@
 # c-ares Makefile for djgpp/gcc/Watt-32.
 #   By Gisle Vanem <giva@bgnett.no> 2004.
 #
-.SUFFIXES: .exe
+# $Id$
+
+include ../packages/DOS/common.dj

 include Makefile.inc

-WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
-
-CC      = gcc
-CFLAGS  = -O2 -Wall -DWATT32 -Dselect=select_s -DHAVE_AF_INET6 \
-          -DHAVE_PF_INET6 -DHAVE_IOCTLSOCKET -DHAVE_STRUCT_IN6_ADDR \
-          -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
-          -DHAVE_ARPA_NAMESER_H -DNS_INADDRSZ=4 \
-          -DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID -I$(WATT32_ROOT)/inc
+CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_FIONBIO \
+          -DHAVE_STRUCT_IN6_ADDR -DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID \
+          -DHAVE_SYS_TIME_H -DHAVE_STRUCT_SOCKADDR_IN6 -DHAVE_STRUCT_ADDRINFO \
+          -DHAVE_SIGNAL_H -DHAVE_SIG_ATOMIC_T -DRETSIGTYPE='void' \
+          -DHAVE_ARPA_NAMESER_H -DNS_INADDRSZ=4 -DHAVE_RECV -DHAVE_SEND \
+          -DSEND_TYPE_ARG1='int'   -DSEND_QUAL_ARG2='const' \
+          -DSEND_TYPE_ARG2='void*' -DSEND_TYPE_ARG3='int' \
+          -DSEND_TYPE_ARG4='int'   -DSEND_TYPE_RETV='int' \
+          -DRECV_TYPE_ARG1='int'   -DRECV_TYPE_ARG2='void*' \
+          -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \
+          -DRECV_TYPE_RETV='int'   -UHAVE_CONFIG_H -Dselect=select_s

 LDFLAGS = -s
-EX_LIBS = $(WATT32_ROOT)/lib/libwatt.a

-OBJ_DIR = djgpp
+ifeq ($(USE_DEBUG),1)
+  EX_LIBS = ../lib/libcurl.a
+endif
+
+ifeq ($(USE_SSL),1)
+  EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a
+endif
+
+ifeq ($(USE_ZLIB),1)
+  EX_LIBS += $(ZLIB_ROOT)/libz.a
+  CFLAGS  += -DUSE_MANUAL
+endif
+
+ifeq ($(USE_IDNA),1)
+  EX_LIBS += $(LIBIDN_ROOT)/lib/dj_obj/libidn.a -liconv
+endif
+
+EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a

 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 $@ $?

@@ -44,12 +62,132 @@ 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
+# DO NOT DELETE THIS LINE
+$(OBJ_DIR)/ares_fds.o: ares_fds.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_getsock.o: ares_getsock.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_process.o: ares_process.c setup.h setup_once.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_free_hostent.o: ares_free_hostent.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_query.o: ares_query.c setup.h setup_once.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares__close_sockets.o: ares__close_sockets.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_free_string.o: ares_free_string.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_search.o: ares_search.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares__get_hostent.o: ares__get_hostent.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h
+$(OBJ_DIR)/ares_gethostbyaddr.o: ares_gethostbyaddr.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h
+$(OBJ_DIR)/ares_send.o: ares_send.c setup.h setup_once.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares__read_line.o: ares__read_line.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_gethostbyname.o: ares_gethostbyname.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h \
+  bitncmp.h
+$(OBJ_DIR)/ares_strerror.o: ares_strerror.c setup.h setup_once.h ares.h
+$(OBJ_DIR)/ares_cancel.o: ares_cancel.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_init.o: ares_init.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h
+$(OBJ_DIR)/ares_timeout.o: ares_timeout.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_destroy.o: ares_destroy.c setup.h setup_once.h ares.h ares_private.h \
+  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_mkquery.o: ares_mkquery.c setup.h setup_once.h ares.h ares_dns.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_version.o: ares_version.c setup.h setup_once.h ares_version.h
+$(OBJ_DIR)/ares_expand_name.o: ares_expand_name.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_parse_a_reply.o: ares_parse_a_reply.c setup.h setup_once.h ares.h \
+  ares_dns.h ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/windows_port.o: windows_port.c setup.h setup_once.h
+$(OBJ_DIR)/ares_expand_string.o: ares_expand_string.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_parse_ptr_reply.o: ares_parse_ptr_reply.c setup.h setup_once.h \
+  ares.h ares_dns.h ares_private.h ares_ipv6.h ../lib/memdebug.h \
+  ../lib/setup.h ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_parse_aaaa_reply.o: ares_parse_aaaa_reply.c setup.h setup_once.h \
+  ares.h ares_dns.h inet_net_pton.h ares_private.h ares_ipv6.h \
+  ../lib/memdebug.h ../lib/setup.h ../include/curl/stdcheaders.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h
+$(OBJ_DIR)/ares_getnameinfo.o: ares_getnameinfo.c setup.h setup_once.h ares.h \
+  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
+  ../include/curl/stdcheaders.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/curl.h inet_ntop.h
+$(OBJ_DIR)/inet_net_pton.o: inet_net_pton.c setup.h setup_once.h ares_ipv6.h \
+  inet_net_pton.h
+$(OBJ_DIR)/bitncmp.o: bitncmp.c bitncmp.h
+$(OBJ_DIR)/inet_ntop.o: inet_ntop.c setup.h setup_once.h ares_ipv6.h inet_ntop.h
--- a/ares/Makefile.inc
+++ b/ares/Makefile.inc
@@ -8,11 +8,14 @@ ares_expand_string.c ares_parse_ptr_reply.c ares_parse_aaaa_reply.c	\
 ares_getnameinfo.c inet_net_pton.c bitncmp.c inet_ntop.c

 HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h          \
-           nameser.h inet_net_pton.h inet_ntop.h ares_ipv6.h bitncmp.h
+           nameser.h inet_net_pton.h inet_ntop.h ares_ipv6.h bitncmp.h      \
+           setup_once.h 

 MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3 \
 ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3                \
 ares_gethostbyname.3 ares_init.3 ares_init_options.3 ares_mkquery.3        \
 ares_parse_a_reply.3 ares_parse_ptr_reply.3 ares_process.3                 \
 ares_query.3 ares_search.3 ares_send.3 ares_strerror.3 ares_timeout.3      \
- ares_version.3 ares_cancel.3 ares_parse_aaaa_reply.3 ares_getnameinfo.3
+ ares_version.3 ares_cancel.3 ares_parse_aaaa_reply.3 ares_getnameinfo.3    \
+ ares_getsock.3
+
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -20,7 +20,7 @@ endif
 TARGETS = adig.nlm ahost.nlm
 LTARGET = libcares.lib
 VERSION	= $(LIBCARES_VERSION)
-COPYR	= Copyright (C) 1996 - 2005, Daniel Stenberg, <daniel@haxx.se>
+COPYR	= Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se>
 DESCR	= cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
 MTSAFE	= YES
 STACK	= 64000
@@ -88,7 +88,7 @@ LD	= nlmconv
 LDFLAGS	= -T
 AR	= ar
 ARFLAGS	= -cq
-CFLAGS	+= -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
+CFLAGS	+= -fno-builtin -fpcc-struct-return -fno-strict-aliasing
 CFLAGS	+= -Wall -Wno-format -Wno-uninitialized # -pedantic
 ifeq ($(LIBARCH),LIBC)
 	PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
@@ -256,8 +256,8 @@ config.h: Makefile.netware
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
 	@echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
-	@echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
-	@echo $(DL)#define PACKAGE_BUGREPORT "curl-bug@haxx.se"$(DL) >> $@
+	@echo $(DL)#define VERSION "$(LIBCARES_VERSION_STR)"$(DL) >> $@
+	@echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@
 	@echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ARPA_NAMESER_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
@@ -276,9 +276,13 @@ config.h: Makefile.netware
 	@echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
 	@echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_RECV 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SEND 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIGNAL_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIG_ATOMIC_T 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) >> $@
@@ -297,15 +301,27 @@ config.h: Makefile.netware
 	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG1 int$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG2 char *$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG3 int$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_ARG4 int$(DL) >> $@
+	@echo $(DL)#define RECV_TYPE_RETV int$(DL) >> $@
 	@echo $(DL)#define RETSIGTYPE void$(DL) >> $@
+	@echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG1 int$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG2 char *$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
+	@echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@
 	@echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@
 	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
 	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_AF_INET6 1$(DL) >> $@
 	@echo $(DL)#define HAVE_PF_INET6 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRUCT_IN6_ADDR 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@
-	@echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRUCT_TIMEVAL 1$(DL) >> $@
 	@echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@
 	@echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@
 ifdef NW_WINSOCK
--- a/ares/Makefile.vc6
+++ b/ares/Makefile.vc6
@@ -121,8 +121,8 @@ $(DEF_FILE): $(OBJECTS) Makefile.VC6
       @echo   ares_gettimeofday      >> $@
       @echo   ares_parse_aaaa_reply  >> $@

-ahost.exe: $(OBJ_DIR) $(OBJ_DIR)\ahost.obj cares_imp.lib
-       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\ahost.obj cares_imp.lib $(EX_LIBS)
+ahost.exe: $(OBJ_DIR) $(OBJ_DIR)\ahost.obj $(OBJ_DIR)\getopt.obj cares_imp.lib
+       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\ahost.obj $(OBJ_DIR)\getopt.obj cares_imp.lib $(EX_LIBS)

 adig.exe: $(OBJ_DIR) $(OBJ_DIR)\adig.obj $(OBJ_DIR)\getopt.obj cares_imp.lib
       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\adig.obj $(OBJ_DIR)\getopt.obj cares_imp.lib $(EX_LIBS)
@@ -140,51 +140,58 @@ vclean realclean: clean
 #
 # Copyright "gcc -MM .."
 #
-$(OBJ_DIR)\ares_fds.obj: ares_fds.c setup.h ares.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h nameser.h ares.h ares_dns.h \
-  ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c setup.h ares.h ares_private.h \
+$(OBJ_DIR)\ares_fds.obj: ares_fds.c setup.h setup_once.h ares.h ares_private.h \
  ares_ipv6.h
-$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h nameser.h ares.h ares_dns.h \
+$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h setup_once.h nameser.h     \
+  ares.h ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c setup.h setup_once.h     \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h setup_once.h nameser.h         \
+  ares.h ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c setup.h setup_once.h \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h setup_once.h ares.h
+$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h setup_once.h nameser.h       \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h setup_once.h     \
+  ares.h ares_private.h ares_ipv6.h inet_net_pton.h
+$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h setup_once.h   \
+  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h
+$(OBJ_DIR)\ares_send.obj: ares_send.c setup.h setup_once.h nameser.h ares.h    \
+  ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h setup_once.h ares.h  \
  ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c setup.h ares.h \
+$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h setup_once.h   \
+  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h
+$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h setup_once.h ares.h
+$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h setup_once.h ares.h          \
  ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h ares.h
-$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h nameser.h ares.h ares_private.h \
-  ares_ipv6.h
-$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h ares.h ares_private.h \
-  ares_ipv6.h inet_net_pton.h
-$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h nameser.h ares.h \
+$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h setup_once.h nameser.h ares.h    \
  ares_private.h ares_ipv6.h inet_net_pton.h
-$(OBJ_DIR)\ares_send.obj: ares_send.c setup.h nameser.h ares.h ares_dns.h \
+$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c setup.h setup_once.h ares.h        \
  ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h ares.h ares_private.h \
+$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h setup_once.h ares.h        \
+  ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h setup_once.h nameser.h     \
+  ares.h ares_dns.h
+$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h setup_once.h ares_version.h
+$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h setup_once.h       \
+  nameser.h ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c setup.h setup_once.h   \
+  nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h setup_once.h nameser.h     \
+  ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h setup_once.h   \
+  nameser.h ares.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c setup.h            \
+  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
+$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h          \
+  setup_once.h nameser.h ares.h ares_dns.h inet_net_pton.h ares_private.h      \
  ares_ipv6.h
-$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h nameser.h ares.h \
-  ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h
-$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h ares.h
-$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h ares.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h nameser.h ares.h ares_private.h \
+$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h setup_once.h       \
+  nameser.h ares.h ares_private.h ares_ipv6.h inet_ntop.h
+$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c setup.h setup_once.h nameser.h   \
  ares_ipv6.h inet_net_pton.h
-$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c setup.h ares.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h ares.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h nameser.h ares.h ares_dns.h
-$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h ares_version.h
-$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h nameser.h ares.h \
-  ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c setup.h nameser.h ares.h \
-  ares_dns.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h nameser.h ares.h ares_private.h \
-  ares_ipv6.h
-$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h nameser.h ares.h \
-  ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c setup.h nameser.h ares.h \
-  ares_dns.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h nameser.h ares.h \
-  ares_dns.h inet_net_pton.h ares_private.h ares_ipv6.h
-$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h nameser.h ares.h \
-  ares_private.h ares_ipv6.h inet_ntop.h
-$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c setup.h nameser.h ares_ipv6.h \
-  inet_net_pton.h
 $(OBJ_DIR)\bitncmp.obj: bitncmp.c bitncmp.h
-$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h nameser.h ares_ipv6.h inet_ntop.h
+$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h setup_once.h nameser.h           \
+  ares_ipv6.h inet_ntop.h
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -14,7 +14,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
 #endif
 #include <windows.h>
      ],[
+#ifdef __CYGWIN__
+        HAVE_WINDOWS_H shall not be defined.
+#else
        int dummy=2*WINVER;
+#endif
      ])
    ],[
      ac_cv_header_windows_h="yes"
@@ -22,12 +26,14 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
      ac_cv_header_windows_h="no"
    ])
  ])
-  if test "x$ac_cv_header_windows_h" = "xyes"; then
-    AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
-      [Define to 1 if you have the windows.h header file.])
-    AC_DEFINE_UNQUOTED(WIN32_LEAN_AND_MEAN, 1,
-      [Define to avoid automatic inclusion of winsock.h])
-  fi
+  case "$ac_cv_header_windows_h" in
+    yes)
+      AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
+        [Define to 1 if you have the windows.h header file.])
+      AC_DEFINE_UNQUOTED(WIN32_LEAN_AND_MEAN, 1,
+        [Define to avoid automatic inclusion of winsock.h])
+      ;;
+  esac
 ])


@@ -47,7 +53,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
 #include <windows.h>
 #include <winsock.h>
      ],[
+#ifdef __CYGWIN__
+        HAVE_WINSOCK_H shall not be defined.
+#else
        int dummy=WSACleanup();
+#endif
      ])
    ],[
      ac_cv_header_winsock_h="yes"
@@ -55,10 +65,12 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
      ac_cv_header_winsock_h="no"
    ])
  ])
-  if test "x$ac_cv_header_winsock_h" = "xyes"; then
-    AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1,
-      [Define to 1 if you have the winsock.h header file.])
-  fi
+  case "$ac_cv_header_winsock_h" in
+    yes)
+      AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1,
+        [Define to 1 if you have the winsock.h header file.])
+      ;;
+  esac
 ])


@@ -78,7 +90,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
 #include <windows.h>
 #include <winsock2.h>
      ],[
+#ifdef __CYGWIN__
+        HAVE_WINSOCK2_H shall not be defined.
+#else
        int dummy=2*IPPROTO_ESP;
+#endif
      ])
    ],[
      ac_cv_header_winsock2_h="yes"
@@ -86,10 +102,12 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
      ac_cv_header_winsock2_h="no"
    ])
  ])
-  if test "x$ac_cv_header_winsock2_h" = "xyes"; then
-    AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, 1,
-      [Define to 1 if you have the winsock2.h header file.])
-  fi
+  case "$ac_cv_header_winsock2_h" in
+    yes)
+      AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, 1,
+        [Define to 1 if you have the winsock2.h header file.])
+      ;;
+  esac
 ])


@@ -110,7 +128,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
 #include <winsock2.h>
 #include <ws2tcpip.h>
      ],[
+#ifdef __CYGWIN__
+        HAVE_WS2TCPIP_H shall not be defined.
+#else
        int dummy=2*IP_PKTINFO;
+#endif
      ])
    ],[
      ac_cv_header_ws2tcpip_h="yes"
@@ -118,9 +140,62 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
      ac_cv_header_ws2tcpip_h="no"
    ])
  ])
-  if test "x$ac_cv_header_ws2tcpip_h" = "xyes"; then
-    AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, 1,
-      [Define to 1 if you have the ws2tcpip.h header file.])
+  case "$ac_cv_header_ws2tcpip_h" in
+    yes)
+      AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, 1,
+        [Define to 1 if you have the ws2tcpip.h header file.])
+      ;;
+  esac
+])
+
+
+dnl CURL_CHECK_HEADER_MALLOC
+dnl -------------------------------------------------
+dnl Check for compilable and valid malloc.h header,
+dnl and check if it is needed even with stdlib.h
+
+AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
+  AC_CACHE_CHECK([for malloc.h], [ac_cv_header_malloc_h], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#include <malloc.h>
+      ],[
+        void *p = malloc(10);
+        void *q = calloc(10,10);
+        free(p);
+        free(q);
+      ])
+    ],[
+      ac_cv_header_malloc_h="yes"
+    ],[
+      ac_cv_header_malloc_h="no"
+    ])
+  ])
+  if test "$ac_cv_header_malloc_h" = "yes"; then
+    AC_DEFINE_UNQUOTED(HAVE_MALLOC_H, 1,
+      [Define to 1 if you have the malloc.h header file.])
+    #
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#include <stdlib.h>
+      ],[
+        void *p = malloc(10);
+        void *q = calloc(10,10);
+        free(p);
+        free(q);
+      ])
+    ],[
+      curl_cv_need_header_malloc_h="no"
+    ],[
+      curl_cv_need_header_malloc_h="yes"
+    ])
+    #
+    case "$curl_cv_need_header_malloc_h" in
+      yes)
+        AC_DEFINE_UNQUOTED(NEED_MALLOC_H, 1,
+          [Define to 1 if you need the malloc.h header file even with stdlib.h])
+        ;;
+    esac
  fi
 ])

@@ -173,12 +248,15 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
        done
      done
    ])
-    if test "$curl_cv_socklen_t_equiv" = "unknown"; then
-      AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
-    else
-      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
-        [type to use in place of socklen_t if not defined])
-    fi
+    case "$curl_cv_socklen_t_equiv" in
+      unknown)
+        AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+        ;;
+      *)
+        AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+          [type to use in place of socklen_t if not defined])
+        ;;
+    esac
  ],[
 #undef inline
 #ifdef HAVE_WINDOWS_H
@@ -211,9 +289,9 @@ dnl and check the types of five of its arguments.
 dnl If the function succeeds HAVE_GETNAMEINFO will be
 dnl defined, defining the types of the arguments in
 dnl GETNAMEINFO_TYPE_ARG1, GETNAMEINFO_TYPE_ARG2,
-dnl GETNAMEINFO_TYPE_ARG46 and GETNAMEINFO_TYPE_ARG7.
-dnl This function is experimental and its results shall
-dnl not be trusted while this notice is in place ------
+dnl GETNAMEINFO_TYPE_ARG46 and GETNAMEINFO_TYPE_ARG7,
+dnl and also defining the type qualifier of first 
+dnl argument in GETNAMEINFO_QUAL_ARG1.

 AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
  AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
@@ -349,14 +427,50 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
      set dummy `echo "$curl_cv_func_getnameinfo_args" | sed 's/\*/\*/g'`
      IFS=$gni_prev_IFS
      shift
-      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG1, $[1],
-        [Define to the type of arg 1 for getnameinfo.])
+      #
+      gni_qual_type_arg1=$[1]
+      #
      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG2, $[2],
        [Define to the type of arg 2 for getnameinfo.])
      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG46, $[3],
        [Define to the type of args 4 and 6 for getnameinfo.])
      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, $[4],
        [Define to the type of arg 7 for getnameinfo.])
+      #
+      prev_sh_opts=$-
+      #
+      case $prev_sh_opts in
+        *f*)
+          ;;
+        *)
+          set -f
+          ;;
+      esac
+      #
+      case "$gni_qual_type_arg1" in
+        const*)
+          gni_qual_arg1=const
+          gni_type_arg1=`echo $gni_qual_type_arg1 | sed 's/^const //'`
+        ;;
+        *)
+          gni_qual_arg1=
+          gni_type_arg1=$gni_qual_type_arg1
+        ;;
+      esac
+      #
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_QUAL_ARG1, $gni_qual_arg1,
+        [Define to the type qualifier of arg 1 for getnameinfo.])
+      AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG1, $gni_type_arg1,
+        [Define to the type of arg 1 for getnameinfo.])
+      #
+      case $prev_sh_opts in
+        *f*)
+          ;;
+        *)
+          set +f
+          ;;
+      esac
+      #
      AC_DEFINE_UNQUOTED(HAVE_GETNAMEINFO, 1,
        [Define to 1 if you have the getnameinfo function.])
      ac_cv_func_getnameinfo="yes"
@@ -365,6 +479,582 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
 ]) # AC_DEFUN


+dnl TYPE_SOCKADDR_STORAGE
+dnl -------------------------------------------------
+dnl Check for struct sockaddr_storage. Most IPv6-enabled 
+dnl hosts have it, but AIX 4.3 is one known exception.
+
+AC_DEFUN([TYPE_SOCKADDR_STORAGE],
+[
+   AC_CHECK_TYPE([struct sockaddr_storage],
+        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
+                  [if struct sockaddr_storage is defined]), ,
+   [
+#undef inline
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#endif
+   ])
+])
+
+
+dnl CURL_CHECK_NI_WITHSCOPEID
+dnl -------------------------------------------------
+dnl Check for working NI_WITHSCOPEID in getnameinfo()
+
+AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
+  AC_REQUIRE([CURL_CHECK_FUNC_GETNAMEINFO])dnl
+  AC_REQUIRE([TYPE_SOCKADDR_STORAGE])dnl
+  AC_CHECK_HEADERS(stdio.h sys/types.h sys/socket.h \
+                   netdb.h netinet/in.h arpa/inet.h)
+  #
+  AC_CACHE_CHECK([for working NI_WITHSCOPEID], 
+    [ac_cv_working_ni_withscopeid], [
+    AC_RUN_IFELSE([
+      AC_LANG_PROGRAM([
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+      ],[
+#if defined(NI_WITHSCOPEID) && defined(HAVE_GETNAMEINFO)
+#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+        struct sockaddr_storage sa;
+#else
+        unsigned char sa[256];
+#endif
+        char hostbuf[NI_MAXHOST];
+        int rc;
+        GETNAMEINFO_TYPE_ARG2 salen = (GETNAMEINFO_TYPE_ARG2)sizeof(sa);
+        GETNAMEINFO_TYPE_ARG46 hostlen = (GETNAMEINFO_TYPE_ARG46)sizeof(hostbuf);
+        GETNAMEINFO_TYPE_ARG7 flags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
+        int fd = socket(AF_INET6, SOCK_STREAM, 0);
+        if(fd < 0) {
+          perror("socket()");
+          return 1; /* Error creating socket */
+        }
+        rc = getsockname(fd, (GETNAMEINFO_TYPE_ARG1)&sa, &salen);
+        if(rc) {
+          perror("getsockname()");
+          return 2; /* Error retrieving socket name */
+        }
+        rc = getnameinfo((GETNAMEINFO_TYPE_ARG1)&sa, salen, hostbuf, hostlen, NULL, 0, flags);
+        if(rc) {
+          printf("rc = %s\n", gai_strerror(rc));
+          return 3; /* Error translating socket address */
+        }
+        return 0; /* Ok, NI_WITHSCOPEID works */
+#else
+        return 4; /* Error, NI_WITHSCOPEID not defined or no getnameinfo() */
+#endif
+      ]) # AC_LANG_PROGRAM
+    ],[
+      # Exit code == 0. Program worked.
+      ac_cv_working_ni_withscopeid="yes"
+    ],[
+      # Exit code != 0. Program failed.
+      ac_cv_working_ni_withscopeid="no"
+    ],[
+      # Program is not run when cross-compiling. So we assume
+      # NI_WITHSCOPEID will work if we are able to compile it.
+      AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+        ],[
+          unsigned int dummy= NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
+        ])
+      ],[
+        ac_cv_working_ni_withscopeid="yes"
+      ],[
+        ac_cv_working_ni_withscopeid="no"
+      ]) # AC_COMPILE_IFELSE
+    ]) # AC_RUN_IFELSE
+  ]) # AC_CACHE_CHECK
+  case "$ac_cv_working_ni_withscopeid" in
+    yes)
+      AC_DEFINE(HAVE_NI_WITHSCOPEID, 1,
+        [Define to 1 if NI_WITHSCOPEID exists and works.])
+      ;;
+  esac
+]) # AC_DEFUN
+
+
+dnl CURL_CHECK_FUNC_RECV
+dnl -------------------------------------------------
+dnl Test if the socket recv() function is available, 
+dnl and check its return type and the types of its 
+dnl arguments. If the function succeeds HAVE_RECV 
+dnl will be defined, defining the types of the arguments 
+dnl in RECV_TYPE_ARG1, RECV_TYPE_ARG2, RECV_TYPE_ARG3 
+dnl and RECV_TYPE_ARG4, defining the type of the function
+dnl return value in RECV_TYPE_RETV.
+
+AC_DEFUN([CURL_CHECK_FUNC_RECV], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
+  AC_CHECK_HEADERS(sys/types.h sys/socket.h)
+  #
+  AC_MSG_CHECKING([for recv])
+  AC_TRY_LINK([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+    ],[
+      recv(0, 0, 0, 0);
+    ],[ 
+      AC_MSG_RESULT([yes])
+      curl_cv_recv="yes"
+    ],[
+      AC_MSG_RESULT([no])
+      curl_cv_recv="no"
+  ])
+  #
+  if test "$curl_cv_recv" = "yes"; then
+    AC_CACHE_CHECK([types of arguments and return type for recv],
+      [curl_cv_func_recv_args], [
+      curl_cv_func_recv_args="unknown"
+      for recv_retv in 'int' 'ssize_t'; do
+        for recv_arg1 in 'int' 'ssize_t' 'SOCKET'; do
+          for recv_arg2 in 'char *' 'void *'; do
+            for recv_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
+              for recv_arg4 in 'int' 'unsigned int'; do
+                AC_COMPILE_IFELSE([
+                  AC_LANG_PROGRAM([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#define RECVCALLCONV PASCAL
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#define RECVCALLCONV
+#endif
+                    extern $recv_retv RECVCALLCONV recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
+                  ],[
+                    $recv_arg1 s=0;
+                    $recv_arg2 buf=0;
+                    $recv_arg3 len=0;
+                    $recv_arg4 flags=0;
+                    $recv_retv res = recv(s, buf, len, flags);
+                  ])
+                ],[
+                   curl_cv_func_recv_args="$recv_arg1,$recv_arg2,$recv_arg3,$recv_arg4,$recv_retv"
+                   break 5
+                ])
+              done
+            done
+          done
+        done
+      done
+    ]) # AC_CACHE_CHECK
+    if test "$curl_cv_func_recv_args" = "unknown"; then
+      AC_MSG_ERROR([Cannot find proper types to use for recv args])
+    else
+      recv_prev_IFS=$IFS; IFS=','
+      set dummy `echo "$curl_cv_func_recv_args" | sed 's/\*/\*/g'`
+      IFS=$recv_prev_IFS
+      shift
+      #
+      AC_DEFINE_UNQUOTED(RECV_TYPE_ARG1, $[1],
+        [Define to the type of arg 1 for recv.])
+      AC_DEFINE_UNQUOTED(RECV_TYPE_ARG2, $[2],
+        [Define to the type of arg 2 for recv.])
+      AC_DEFINE_UNQUOTED(RECV_TYPE_ARG3, $[3],
+        [Define to the type of arg 3 for recv.])
+      AC_DEFINE_UNQUOTED(RECV_TYPE_ARG4, $[4],
+        [Define to the type of arg 4 for recv.])
+      AC_DEFINE_UNQUOTED(RECV_TYPE_RETV, $[5],
+        [Define to the function return type for recv.])
+      #
+      AC_DEFINE_UNQUOTED(HAVE_RECV, 1,
+        [Define to 1 if you have the recv function.])
+      ac_cv_func_recv="yes"
+    fi
+  else
+    AC_MSG_ERROR([Unable to link function recv])
+  fi
+]) # AC_DEFUN
+
+
+dnl CURL_CHECK_FUNC_SEND
+dnl -------------------------------------------------
+dnl Test if the socket send() function is available, 
+dnl and check its return type and the types of its 
+dnl arguments. If the function succeeds HAVE_SEND 
+dnl will be defined, defining the types of the arguments 
+dnl in SEND_TYPE_ARG1, SEND_TYPE_ARG2, SEND_TYPE_ARG3 
+dnl and SEND_TYPE_ARG4, defining the type of the function
+dnl return value in SEND_TYPE_RETV, and also defining the 
+dnl type qualifier of second argument in SEND_QUAL_ARG2.
+
+AC_DEFUN([CURL_CHECK_FUNC_SEND], [
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
+  AC_CHECK_HEADERS(sys/types.h sys/socket.h)
+  #
+  AC_MSG_CHECKING([for send])
+  AC_TRY_LINK([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+    ],[
+      send(0, 0, 0, 0);
+    ],[ 
+      AC_MSG_RESULT([yes])
+      curl_cv_send="yes"
+    ],[
+      AC_MSG_RESULT([no])
+      curl_cv_send="no"
+  ])
+  #
+  if test "$curl_cv_send" = "yes"; then
+    AC_CACHE_CHECK([types of arguments and return type for send],
+      [curl_cv_func_send_args], [
+      curl_cv_func_send_args="unknown"
+      for send_retv in 'int' 'ssize_t'; do
+        for send_arg1 in 'int' 'ssize_t' 'SOCKET'; do
+          for send_arg2 in 'char *' 'void *' 'const char *' 'const void *'; do
+            for send_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
+              for send_arg4 in 'int' 'unsigned int'; do
+                AC_COMPILE_IFELSE([
+                  AC_LANG_PROGRAM([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#define SENDCALLCONV PASCAL
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#define SENDCALLCONV
+#endif
+                    extern $send_retv SENDCALLCONV send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
+                  ],[
+                    $send_arg1 s=0;
+                    $send_arg3 len=0;
+                    $send_arg4 flags=0;
+                    $send_retv res = send(s, 0, len, flags);
+                  ])
+                ],[
+                   curl_cv_func_send_args="$send_arg1,$send_arg2,$send_arg3,$send_arg4,$send_retv"
+                   break 5
+                ])
+              done
+            done
+          done
+        done
+      done
+    ]) # AC_CACHE_CHECK
+    if test "$curl_cv_func_send_args" = "unknown"; then
+      AC_MSG_ERROR([Cannot find proper types to use for send args])
+    else
+      send_prev_IFS=$IFS; IFS=','
+      set dummy `echo "$curl_cv_func_send_args" | sed 's/\*/\*/g'`
+      IFS=$send_prev_IFS
+      shift
+      #
+      send_qual_type_arg2=$[2]
+      #
+      AC_DEFINE_UNQUOTED(SEND_TYPE_ARG1, $[1],
+        [Define to the type of arg 1 for send.])
+      AC_DEFINE_UNQUOTED(SEND_TYPE_ARG3, $[3],
+        [Define to the type of arg 3 for send.])
+      AC_DEFINE_UNQUOTED(SEND_TYPE_ARG4, $[4],
+        [Define to the type of arg 4 for send.])
+      AC_DEFINE_UNQUOTED(SEND_TYPE_RETV, $[5],
+        [Define to the function return type for send.])
+      #
+      prev_sh_opts=$-
+      #
+      case $prev_sh_opts in
+        *f*)
+          ;;
+        *)
+          set -f
+          ;;
+      esac
+      #
+      case "$send_qual_type_arg2" in
+        const*)
+          send_qual_arg2=const
+          send_type_arg2=`echo $send_qual_type_arg2 | sed 's/^const //'`
+        ;;
+        *)
+          send_qual_arg2=
+          send_type_arg2=$send_qual_type_arg2
+        ;;
+      esac
+      #
+      AC_DEFINE_UNQUOTED(SEND_QUAL_ARG2, $send_qual_arg2,
+        [Define to the type qualifier of arg 2 for send.])
+      AC_DEFINE_UNQUOTED(SEND_TYPE_ARG2, $send_type_arg2,
+        [Define to the type of arg 2 for send.])
+      #
+      case $prev_sh_opts in
+        *f*)
+          ;;
+        *)
+          set +f
+          ;;
+      esac
+      #
+      AC_DEFINE_UNQUOTED(HAVE_SEND, 1,
+        [Define to 1 if you have the send function.])
+      ac_cv_func_send="yes"
+    fi
+  else
+    AC_MSG_ERROR([Unable to link function send])
+  fi
+]) # AC_DEFUN
+
+
+dnl CURL_CHECK_MSG_NOSIGNAL
+dnl -------------------------------------------------
+dnl Check for MSG_NOSIGNAL
+
+AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
+  AC_CHECK_HEADERS(sys/types.h sys/socket.h)
+  AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#else
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#endif
+      ],[
+        int flag=MSG_NOSIGNAL;
+      ])
+    ],[
+      ac_cv_msg_nosignal="yes"
+    ],[
+      ac_cv_msg_nosignal="no"
+    ])
+  ])
+  case "$ac_cv_msg_nosignal" in
+    yes)
+      AC_DEFINE_UNQUOTED(HAVE_MSG_NOSIGNAL, 1,
+        [Define to 1 if you have the MSG_NOSIGNAL flag.])
+      ;;
+  esac
+]) # AC_DEFUN
+
+
+dnl CURL_CHECK_STRUCT_TIMEVAL
+dnl -------------------------------------------------
+dnl Check for timeval struct
+
+AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
+  AC_REQUIRE([AC_HEADER_TIME])dnl
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
+  AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
+  AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
+  AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM([
+#undef inline 
+#ifdef HAVE_WINDOWS_H
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+#endif
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#else
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#endif
+      ],[
+        struct timeval ts;
+        ts.tv_sec  = 0;
+        ts.tv_usec = 0;
+      ])
+    ],[
+      ac_cv_struct_timeval="yes"
+    ],[
+      ac_cv_struct_timeval="no"
+    ])
+  ])
+  case "$ac_cv_struct_timeval" in
+    yes)
+      AC_DEFINE_UNQUOTED(HAVE_STRUCT_TIMEVAL, 1,
+        [Define to 1 if you have the timeval struct.])
+      ;;
+  esac
+]) # AC_DEFUN
+
+
+dnl TYPE_SIG_ATOMIC_T
+dnl -------------------------------------------------
+dnl Check if the sig_atomic_t type is available, and
+dnl verify if it is already defined as volatile.
+
+AC_DEFUN([TYPE_SIG_ATOMIC_T], [
+  AC_CHECK_HEADERS(signal.h)
+  AC_CHECK_TYPE([sig_atomic_t],[
+    AC_DEFINE(HAVE_SIG_ATOMIC_T, 1,
+      [Define to 1 if sig_atomic_t is an available typedef.])
+  ], ,[
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+  ])
+  case "$ac_cv_type_sig_atomic_t" in
+    yes)
+      #
+      AC_MSG_CHECKING([if sig_atomic_t is already defined as volatile])
+      AC_TRY_LINK([
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+        ],[
+          static volatile sig_atomic_t dummy = 0;
+        ],[ 
+          AC_MSG_RESULT([no])
+          ac_cv_sig_atomic_t_volatile="no"
+        ],[
+          AC_MSG_RESULT([yes])
+          ac_cv_sig_atomic_t_volatile="yes"
+      ])
+      #
+      if test "$ac_cv_sig_atomic_t_volatile" = "yes"; then
+        AC_DEFINE(HAVE_SIG_ATOMIC_T_VOLATILE, 1,
+          [Define to 1 if sig_atomic_t is already defined as volatile.])
+      fi
+      ;;
+  esac
+]) # AC_DEFUN
+
+
 dnl CURL_CHECK_NONBLOCKING_SOCKET
 dnl -------------------------------------------------
 dnl Check for how to set a socket to non-blocking state. There seems to exist
@@ -826,3 +1516,39 @@ else
 fi
 ])

+# Prevent libtool for checking how to run C++ compiler and check for other
+# tools we don't want to use. We do this by m4-defining the _LT_AC_TAGCONFIG
+# variable to the code to run, as by default it uses a much more complicated
+# approach. The code below that is actually added seems to be used for cases
+# where configure has trouble figuring out what C compiler to use but where
+# the installed libtool has an idea.
+#
+# This function is a re-implemented version of the Paolo Bonzini fix posted to
+# the c-ares mailing list by Bram Matthys on May 6 2006. My version removes
+# redundant code but also adds the LTCFLAGS check that wasn't in that patch.
+#
+# Some code in this function was extracted from the generated configure script.
+#
+# CARES_CLEAR_LIBTOOL_TAGS
+AC_DEFUN([CARES_CLEAR_LIBTOOL_TAGS],
+  [m4_define([_LT_AC_TAGCONFIG], [
+  if test -f "$ltmain"; then
+    if test ! -f "${ofile}"; then
+      AC_MSG_WARN([output file `$ofile' does not exist])
+    fi
+
+    if test -z "$LTCC"; then
+      eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+      if test -z "$LTCC"; then
+        AC_MSG_WARN([output file `$ofile' does not look like a libtool
+script])
+      else
+        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+      fi
+    fi
+    if test -z "$LTCFLAGS"; then
+      eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+    fi
+  fi
+  ])]
+)
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -1,4 +1,6 @@
 /* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * $Id$
 *
 * Permission to use, copy, modify, and distribute this
 * software and its documentation for any purpose and without
@@ -16,7 +18,7 @@
 #include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/time.h>
@@ -153,8 +155,8 @@ int main(int argc, char **argv)
  fd_set read_fds, write_fds;
  struct timeval *tvp, tv;

-#ifdef WIN32
-  WORD wVersionRequested = MAKEWORD(1,1);
+#ifdef USE_WINSOCK
+  WORD wVersionRequested = MAKEWORD(USE_WINSOCK,USE_WINSOCK);
  WSADATA wsaData;
  WSAStartup(wVersionRequested, &wsaData);
 #endif
@@ -162,10 +164,16 @@ int main(int argc, char **argv)
  options.flags = ARES_FLAG_NOCHECKRESP;
  options.servers = NULL;
  options.nservers = 0;
-  while ((c = getopt(argc, argv, "f:s:c:t:T:U:")) != -1)
+  while ((c = getopt(argc, argv, "df:s:c:t:T:U:")) != -1)
    {
      switch (c)
        {
+        case 'd':
+#ifdef WATT32
+          dbug_init();
+#endif
+          break;
+
        case 'f':
          /* Add a flag. */
          for (i = 0; i < nflags; i++)
@@ -225,7 +233,7 @@ int main(int argc, char **argv)

        case 'T':
          /* Set the TCP port number. */
-          if (!isdigit((unsigned char)*optarg))
+          if (!ISDIGIT(*optarg))
            usage();
          options.tcp_port = (unsigned short)strtol(optarg, NULL, 0);
          optmask |= ARES_OPT_TCP_PORT;
@@ -233,7 +241,7 @@ int main(int argc, char **argv)

        case 'U':
          /* Set the UDP port number. */
-          if (!isdigit((unsigned char)*optarg))
+          if (!ISDIGIT(*optarg))
            usage();
          options.udp_port = (unsigned short)strtol(optarg, NULL, 0);
          optmask |= ARES_OPT_UDP_PORT;
@@ -396,7 +404,7 @@ static const unsigned char *display_question(const unsigned char *aptr,
   */
  if (aptr + QFIXEDSZ > abuf + alen)
    {
-      free(name);
+      ares_free_string(name);
      return NULL;
    }

@@ -412,7 +420,7 @@ static const unsigned char *display_question(const unsigned char *aptr,
  if (dnsclass != C_IN)
    printf("\t%s", class_name(dnsclass));
  printf("\t%s\n", type_name(type));
-  free(name);
+  ares_free_string(name);
  return aptr;
 }

@@ -436,7 +444,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
   */
  if (aptr + RRFIXEDSZ > abuf + alen)
    {
-      free(name);
+      ares_free_string(name);
      return NULL;
    }

@@ -449,7 +457,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
  aptr += RRFIXEDSZ;
  if (aptr + dlen > abuf + alen)
    {
-      free(name);
+      ares_free_string(name);
      return NULL;
    }

@@ -458,7 +466,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
  if (dnsclass != C_IN)
    printf("\t%s", class_name(dnsclass));
  printf("\t%s", type_name(type));
-  free(name);
+  ares_free_string(name);

  /* Display the RR data.  Don't touch aptr. */
  switch (type)
@@ -476,7 +484,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
      break;

    case T_HINFO:
@@ -500,13 +508,13 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
      p += len;
      status = ares_expand_name(p, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
      break;

    case T_MX:
@@ -520,7 +528,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
      break;

    case T_SOA:
@@ -532,13 +540,13 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.\n", name);
-      free(name);
+      ares_free_string(name);
      p += len;
      status = ares_expand_name(p, abuf, alen, &name, &len);
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t\t\t\t\t\t%s.\n", name);
-      free(name);
+      ares_free_string(name);
      p += len;
      if (p + 20 > aptr + dlen)
        return NULL;
@@ -592,7 +600,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
      if (status != ARES_SUCCESS)
        return NULL;
      printf("\t%s.", name);
-      free(name);
+      ares_free_string(name);
      break;

    default:
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -1,4 +1,6 @@
 /* Copyright 1998 by the Massachusetts Institute of Technology.
+ *
+ * $Id$
 *
 * Permission to use, copy, modify, and distribute this
 * software and its documentation for any purpose and without
@@ -16,8 +18,7 @@
 #include "setup.h"
 #include <sys/types.h>

-#ifdef WIN32
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -30,6 +31,10 @@
 #include <stdlib.h>
 #include <string.h>

+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
 #include "ares.h"
 #include "ares_dns.h"
 #include "inet_ntop.h"
@@ -52,19 +57,40 @@ static void usage(void);
 int main(int argc, char **argv)
 {
  ares_channel channel;
-  int status, nfds;
+  int status, nfds, c, addr_family = AF_INET;
  fd_set read_fds, write_fds;
  struct timeval *tvp, tv;
  struct in_addr addr4;
  struct in6_addr addr6;

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

-  if (argc <= 1)
+  while ((c = getopt(argc,argv,"t:h")) != -1)
+    {
+      switch (c)
+        {
+        case 't':
+          if (!strcasecmp(optarg,"a"))
+            addr_family = AF_INET;
+          else if (!strcasecmp(optarg,"aaaa"))
+            addr_family = AF_INET6;
+          else
+            usage();
+          break;
+        case 'h':
+        default:
+          usage();
+          break;
+        }
+    }
+
+  argc -= optind;
+  argv += optind;
+  if (argc < 1)
    usage();

  status = ares_init(&channel);
@@ -75,7 +101,7 @@ int main(int argc, char **argv)
    }

  /* Initiate the queries, one per command-line argument. */
-  for (argv++; *argv; argv++)
+  for ( ; *argv; argv++)
    {
      if (ares_inet_pton(AF_INET, *argv, &addr4) == 1)
        {
@@ -89,8 +115,7 @@ int main(int argc, char **argv)
        }
      else
        {
-          /* assume user wants A-records */
-          ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
+          ares_gethostbyname(channel, *argv, addr_family, callback, *argv);
        }
    }

@@ -132,8 +157,8 @@ static void callback(void *arg, int status, struct hostent *host)
        {
           int i;

-	   printf (", Aliases: ");
-	   for (i = 0; host->h_aliases[i]; i++)
+           printf (", Aliases: ");
+           for (i = 0; host->h_aliases[i]; i++)
               printf("%s ", host->h_aliases[i]);
        }
 #endif
@@ -143,6 +168,6 @@ static void callback(void *arg, int status, struct hostent *host)

 static void usage(void)
 {
-  fprintf(stderr, "usage: ahost {host|addr} ...\n");
+  fprintf(stderr, "usage: ahost [-t {a|aaaa}] {host|addr} ...\n");
  exit(1);
 }
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -93,6 +93,7 @@ extern "C" {
 #define ARES_OPT_SERVERS        (1 << 6)
 #define ARES_OPT_DOMAINS        (1 << 7)
 #define ARES_OPT_LOOKUPS        (1 << 8)
+#define ARES_OPT_SOCK_STATE_CB  (1 << 9)

 /* Nameinfo flag values */
 #define ARES_NI_NOFQDN                  (1 << 0)
@@ -135,6 +136,18 @@ extern "C" {
 #define ARES_GETSOCK_WRITABLE(bits,num) (bits & (1 << ((num) + \
                                         ARES_GETSOCK_MAXNUM)))

+#ifdef WIN32
+typedef void (*ares_sock_state_cb)(void *data,
+                                   SOCKET socket,
+                                   int readable,
+                                   int writable);
+#else
+typedef void (*ares_sock_state_cb)(void *data,
+                                   int socket,
+                                   int readable,
+                                   int writable);
+#endif
+
 struct ares_options {
  int flags;
  int timeout;
@@ -147,6 +160,8 @@ struct ares_options {
  char **domains;
  int ndomains;
  char *lookups;
+  ares_sock_state_cb sock_state_cb;
+  void *sock_state_cb_data;
 };

 struct hostent;
--- a/ares/ares__close_sockets.c
+++ b/ares/ares__close_sockets.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -23,7 +25,7 @@
 #include "ares.h"
 #include "ares_private.h"

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

@@ -46,11 +48,13 @@ void ares__close_sockets(struct server_state *server)
  /* Close the TCP and UDP sockets. */
  if (server->tcp_socket != ARES_SOCKET_BAD)
    {
+      SOCK_STATE_CALLBACK(channel, server->tcp_socket, 0, 0);
      closesocket(server->tcp_socket);
      server->tcp_socket = ARES_SOCKET_BAD;
    }
  if (server->udp_socket != ARES_SOCKET_BAD)
    {
+      SOCK_STATE_CALLBACK(channel, server->udp_socket, 0, 0);
      closesocket(server->udp_socket);
      server->udp_socket = ARES_SOCKET_BAD;
    }
--- a/ares/ares__get_hostent.c
+++ b/ares/ares__get_hostent.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -52,7 +54,7 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)

      /* Get the address part. */
      p = line;
-      while (*p && !isspace((unsigned char)*p))
+      while (*p && !ISSPACE(*p))
        p++;
      if (!*p)
        continue;
@@ -74,12 +76,12 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)

      /* Get the canonical hostname. */
      p++;
-      while (isspace((unsigned char)*p))
+      while (ISSPACE(*p))
        p++;
      if (!*p)
        continue;
      q = p;
-      while (*q && !isspace((unsigned char)*q))
+      while (*q && !ISSPACE(*q))
        q++;
      end_at_hostname = (*q == 0);
      *q = 0;
@@ -90,13 +92,13 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
        {
          /* Count the aliases. */
          p = q + 1;
-          while (isspace((unsigned char)*p))
+          while (ISSPACE(*p))
            p++;
          while (*p)
            {
-              while (*p && !isspace((unsigned char)*p))
+              while (*p && !ISSPACE(*p))
                p++;
-              while (isspace((unsigned char)*p))
+              while (ISSPACE(*p))
                p++;
              naliases++;
            }
@@ -126,12 +128,12 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
      if (!end_at_hostname)
        {
          p = canonical + strlen(canonical) + 1;
-          while (isspace((unsigned char)*p))
+          while (ISSPACE(*p))
            p++;
          while (*p)
            {
              q = p;
-              while (*q && !isspace((unsigned char)*q))
+              while (*q && !ISSPACE(*q))
                q++;
              hostent->h_aliases[naliases] = malloc(q - p + 1);
              if (hostent->h_aliases[naliases] == NULL)
@@ -139,7 +141,7 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
              memcpy(hostent->h_aliases[naliases], p, q - p);
              hostent->h_aliases[naliases][q - p] = 0;
              p = q;
-              while (isspace((unsigned char)*p))
+              while (ISSPACE(*p))
                p++;
              naliases++;
            }
--- a/ares/ares__read_line.c
+++ b/ares/ares__read_line.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_cancel.c
+++ b/ares/ares_cancel.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright (C) 2004 by Daniel Stenberg et al
 *
 * Permission to use, copy, modify, and distribute this software and its
@@ -37,7 +39,10 @@ void ares_cancel(ares_channel channel)
  channel->queries = NULL;
  if (!(channel->flags & ARES_FLAG_STAYOPEN))
  {
-    for (i = 0; i < channel->nservers; i++)
-      ares__close_sockets(&channel->servers[i]);
+    if (channel->servers)
+    {
+      for (i = 0; i < channel->nservers; i++)
+        ares__close_sockets(channel, &channel->servers[i]);
+    }
  }
 }
--- a/ares/ares_destroy.c
+++ b/ares/ares_destroy.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -23,23 +25,37 @@ void ares_destroy(ares_channel channel)
  int i;
  struct query *query;

-  for (i = 0; i < channel->nservers; i++)
-    ares__close_sockets(&channel->servers[i]);
-  free(channel->servers);
-  for (i = 0; i < channel->ndomains; i++)
-    free(channel->domains[i]);
-  free(channel->domains);
+  if (!channel)
+    return;
+
+  if (channel->servers) {
+    for (i = 0; i < channel->nservers; i++)
+      ares__close_sockets(channel, &channel->servers[i]);
+    free(channel->servers);
+  }
+
+  if (channel->domains) {
+    for (i = 0; i < channel->ndomains; i++)
+      free(channel->domains[i]);
+    free(channel->domains);
+  }
+
  if(channel->sortlist)
    free(channel->sortlist);
-  free(channel->lookups);
-  while (channel->queries)
-    {
-      query = channel->queries;
-      channel->queries = query->next;
-      query->callback(query->arg, ARES_EDESTRUCTION, NULL, 0);
+
+  if (channel->lookups)
+    free(channel->lookups);
+
+  while (channel->queries) {
+    query = channel->queries;
+    channel->queries = query->next;
+    query->callback(query->arg, ARES_EDESTRUCTION, NULL, 0);
+    if (query->tcpbuf)
      free(query->tcpbuf);
+    if (query->skip_server)
      free(query->skip_server);
-      free(query);
-    }
+    free(query);
+  }
+
  free(channel);
 }
--- a/ares/ares_dns.h
+++ b/ares/ares_dns.h
@@ -18,18 +18,6 @@
 #ifndef ARES__DNS_H
 #define ARES__DNS_H

-#ifdef ARES_BIG_ENDIAN
-/* big-endian aware versions */
-#define DNS__16BIT(p)                   (((p)[1] << 8) | (p)[0])
-#define DNS__32BIT(p)                   (((p)[3] << 24) | ((p)[2] << 16) | \
-                                         ((p)[1] << 8) | (p)[0])
-#define DNS__SET16BIT(p, v)             (((p)[1] = ((v) >> 8) & 0xff), \
-                                         ((p)[0] = (v) & 0xff))
-#define DNS__SET32BIT(p, v)             (((p)[3] = ((v) >> 24) & 0xff), \
-                                         ((p)[2] = ((v) >> 16) & 0xff), \
-                                         ((p)[1] = ((v) >> 8) & 0xff), \
-                                         ((p)[0] = (v) & 0xff))
-#else
 #define DNS__16BIT(p)                   (((p)[0] << 8) | (p)[1])
 #define DNS__32BIT(p)                   (((p)[0] << 24) | ((p)[1] << 16) | \
                                         ((p)[2] << 8) | (p)[3])
@@ -39,7 +27,6 @@
                                         ((p)[1] = ((v) >> 16) & 0xff), \
                                         ((p)[2] = ((v) >> 8) & 0xff), \
                                         ((p)[3] = (v) & 0xff))
-#endif

 #if 0
 /* we cannot use this approach on systems where we can't access 16/32 bit
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -53,13 +55,13 @@ int ares_expand_string(const unsigned char *encoded,
  *s = malloc(len+1);
  if (*s == NULL)
    return ARES_ENOMEM;
-  q = *s; 
+  q = *s;
  strncpy((char *)q, (char *)encoded, len);
  q[len] = '\0';

  *s = q;

-  *enclen = len+1; 
+  *enclen = len+1;

  return ARES_SUCCESS;
 }
--- a/ares/ares_free_hostent.c
+++ b/ares/ares_free_hostent.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_free_string.c
+++ b/ares/ares_free_string.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 2000 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -16,6 +18,7 @@
 #include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
+#include "ares_private.h"

 void ares_free_string(void *str)
 {
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -170,7 +172,7 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)
    }
  else if (status == ARES_ENODATA && hquery->family == AF_INET6)
    {
-      /* There was no AAAA now lookup an A */
+      /* There was no AAAA. Now lookup an A */
      hquery->family = AF_INET;
      ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
                  hquery);
--- a/ares/ares_getnameinfo.c
+++ b/ares/ares_getnameinfo.c
@@ -264,11 +264,11 @@ static char *lookup_service(unsigned short port, int flags,
  char tmpbuf[4096];

  if (port)
-    { 
+    {
      if (flags & ARES_NI_NUMERICSERV)
        sep = NULL;
      else
-        { 
+        {
          if (flags & ARES_NI_UDP)
            proto = "udp";
          else if (flags & ARES_NI_SCTP)
@@ -288,15 +288,15 @@ static char *lookup_service(unsigned short port, int flags,
 #elif GETSERVBYPORT_R_ARGS == 4
          if (getservbyport_r(port, proto, &se, (void *)tmpbuf) != 0)
            sep = NULL;
-#else     
+#else
          /* Lets just hope the OS uses TLS! */
          sep = getservbyport(port, proto);
-#endif    
-#else     
+#endif
+#else
          /* Lets just hope the OS uses TLS! */
          sep = getservbyport(port, proto);
-#endif    
-        } 
+#endif
+        }
      if (sep && sep->s_name)
        /* get service name */
        strcpy(tmpbuf, sep->s_name);
--- a/ares/ares_getsock.c
+++ b/ares/ares_getsock.c
@@ -1,6 +1,6 @@
 /* $Id$ */

-/* Copyright 2005 by Daniel Stenberg.
+/* Copyright (C) 2005 - 2006, Daniel Stenberg
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose and without fee is hereby granted, provided
@@ -28,7 +28,6 @@ int ares_getsock(ares_channel channel,
                 int numsocks) /* size of the 'socks' array */
 {
  struct server_state *server;
-  ares_socket_t nfds;
  int i;
  int sockindex=0;
  int bitmap = 0;
@@ -40,8 +39,9 @@ int ares_getsock(ares_channel channel,
  if (!channel->queries)
    return 0;

-  nfds = 0;
-  for (i = 0; i < channel->nservers; i++)
+  for (i = 0;
+       (i < channel->nservers) && (sockindex < ARES_GETSOCK_MAXNUM);
+       i++)
    {
      server = &channel->servers[i];
      if (server->udp_socket != ARES_SOCKET_BAD)
@@ -58,14 +58,13 @@ int ares_getsock(ares_channel channel,
           break;
         socks[sockindex] = server->tcp_socket;
         bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
-         sockindex++;

-         if (server->qhead) {
+         if (server->qhead)
           /* then the tcp socket is also writable! */
-           bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex-1);
-         }
+           bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex);

+         sockindex++;
       }
    }
-  return (int)nfds;
+  return bitmap;
 }
--- a/ares/ares_init.3
+++ b/ares/ares_init.3
@@ -98,6 +98,24 @@ The lookups to perform for host queries.
 .I lookups
 should be set to a string of the characters "b" or "f", where "b"
 indicates a DNS lookup and "f" indicates a lookup in the hosts file.
+.TP 18
+.B ARES_OPT_SOCK_STATE_CB
+.B void (*\fIsock_state_cb\fP)(void *data, int s, int read, int write);
+.br
+.B void *\fIsock_state_cb_data\fP;
+.br
+A callback function to be invoked when a socket changes state.
+.I s
+will be passed the socket whose state has changed;
+.I read
+will be set to true if the socket should listen for read events, and
+.I write
+will be set to true if the socket should listen for write events.
+The value of
+.I sock_state_cb_data
+will be passed as the
+.I data
+argument.
 .PP
 The
 .I flags
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -93,6 +95,16 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  struct server_state *server;
  struct timeval tv;

+#ifdef CURLDEBUG
+  const char *env = getenv("CARES_MEMDEBUG");
+
+  if (env)
+    curl_memdebug(env);
+  env = getenv("CARES_MEMLIMIT");
+  if (env)
+    curl_memlimit(atoi(env));
+#endif
+
  channel = malloc(sizeof(struct ares_channeldata));
  if (!channel)
    return ARES_ENOMEM;
@@ -113,6 +125,9 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  channel->queries = NULL;
  channel->domains = NULL;
  channel->sortlist = NULL;
+  channel->servers = NULL;
+  channel->sock_state_cb = NULL;
+  channel->sock_state_cb_data = NULL;

  /* Initialize configuration by each of the four sources, from highest
   * precedence to lowest.
@@ -127,7 +142,7 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
  if (status != ARES_SUCCESS)
    {
      /* Something failed; clean up memory we may have allocated. */
-      if (channel->nservers != -1)
+      if (channel->servers)
        free(channel->servers);
      if (channel->domains)
        {
@@ -192,16 +207,25 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
    channel->udp_port = options->udp_port;
  if ((optmask & ARES_OPT_TCP_PORT) && channel->tcp_port == -1)
    channel->tcp_port = options->tcp_port;
+  if ((optmask & ARES_OPT_SOCK_STATE_CB) && channel->sock_state_cb == NULL)
+    {
+      channel->sock_state_cb = options->sock_state_cb;
+      channel->sock_state_cb_data = options->sock_state_cb_data;
+    }

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

@@ -210,16 +234,20 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
   */
  if ((optmask & ARES_OPT_DOMAINS) && channel->ndomains == -1)
    {
-      channel->domains = malloc(options->ndomains * sizeof(char *));
-      if (!channel->domains && options->ndomains != 0)
-        return ARES_ENOMEM;
-      for (i = 0; i < options->ndomains; i++)
-        {
-          channel->ndomains = i;
-          channel->domains[i] = strdup(options->domains[i]);
-          if (!channel->domains[i])
-            return ARES_ENOMEM;
-        }
+      /* Avoid zero size allocations at any cost */
+      if (options->ndomains > 0)
+      {
+        channel->domains = malloc(options->ndomains * sizeof(char *));
+        if (!channel->domains)
+          return ARES_ENOMEM;
+        for (i = 0; i < options->ndomains; i++)
+          {
+            channel->ndomains = i;
+            channel->domains[i] = strdup(options->domains[i]);
+            if (!channel->domains[i])
+              return ARES_ENOMEM;
+          }
+      }
      channel->ndomains = options->ndomains;
    }

@@ -355,7 +383,8 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
    printf ("DNS Servers:\n"
            "    %s (primary)\n", fi->DnsServerList.IpAddress.String);
  }
-  if (inet_addr(fi->DnsServerList.IpAddress.String) != INADDR_NONE &&
+  if (strlen(fi->DnsServerList.IpAddress.String) > 0 &&
+      inet_addr(fi->DnsServerList.IpAddress.String) != INADDR_NONE &&
      left > ip_size)
  {
    ret += sprintf (ret, "%s,", fi->DnsServerList.IpAddress.String);
@@ -563,11 +592,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")))
+      if ((p = try_config(line, "domain")) && channel->ndomains == -1)
        status = config_domain(channel, p);
      else if ((p = try_config(line, "lookup")) && !channel->lookups)
        status = config_lookup(channel, p, "bind", "file");
-      else if ((p = try_config(line, "search")))
+      else if ((p = try_config(line, "search")) && channel->ndomains == -1)
        status = set_search(channel, p);
      else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
        status = config_nameserver(&servers, &nservers, p);
@@ -692,7 +721,6 @@ static int init_by_defaults(ares_channel channel)
      if (gethostname(hostname, sizeof(hostname)) == -1
          || !strchr(hostname, '.'))
        {
-          channel->domains = malloc(0);
          channel->ndomains = 0;
        }
      else
@@ -731,7 +759,7 @@ static int config_domain(ares_channel channel, char *str)

  /* Set a single search domain. */
  q = str;
-  while (*q && !isspace((unsigned char)*q))
+  while (*q && !ISSPACE(*q))
    q++;
  *q = 0;
  return set_search(channel, str);
@@ -755,9 +783,9 @@ static int config_lookup(ares_channel channel, const char *str,
        if (*p == *bindch) *l++ = 'b';
        else *l++ = 'f';
      }
-      while (*p && !isspace((unsigned char)*p) && (*p != ','))
+      while (*p && !ISSPACE(*p) && (*p != ','))
        p++;
-      while (*p && (isspace((unsigned char)*p) || (*p == ',')))
+      while (*p && (ISSPACE(*p) || (*p == ',')))
        p++;
    }
  *l = 0;
@@ -782,7 +810,7 @@ static int config_nameserver(struct server_state **servers, int *nservers,
  while (more)
  {
    more = 0;
-    while (*p && !isspace(*p) && *p != ',')
+    while (*p && !ISSPACE(*p) && *p != ',')
      p++;

    if (*p)
@@ -842,7 +870,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
      char ipbuf[16], ipbufpfx[32];
      /* Find just the IP */
      q = str;
-      while (*q && *q != '/' && *q != ';' && !isspace((unsigned char)*q))
+      while (*q && *q != '/' && *q != ';' && !ISSPACE(*q))
        q++;
      memcpy(ipbuf, str, (int)(q-str));
      ipbuf[(int)(q-str)] = 0;
@@ -850,7 +878,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
      if (*q == '/')
        {
          const char *str2 = q+1;
-          while (*q && *q != ';' && !isspace((unsigned char)*q))
+          while (*q && *q != ';' && !ISSPACE(*q))
            q++;
          memcpy(ipbufpfx, str, (int)(q-str));
          ipbufpfx[(int)(q-str)] = 0;
@@ -899,11 +927,11 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
        }
      else
        {
-          while (*q && *q != ';' && !isspace((unsigned char)*q))
+          while (*q && *q != ';' && !ISSPACE(*q))
            q++;
        }
      str = q;
-      while (isspace((unsigned char)*str))
+      while (ISSPACE(*str))
        str++;
    }

@@ -921,6 +949,7 @@ static int set_search(ares_channel channel, const char *str)
    for(n=0; n < channel->ndomains; n++)
      free(channel->domains[n]);
    free(channel->domains);
+    channel->domains = NULL;
    channel->ndomains = -1;
  }

@@ -929,15 +958,21 @@ static int set_search(ares_channel channel, const char *str)
  p = str;
  while (*p)
    {
-      while (*p && !isspace((unsigned char)*p))
+      while (*p && !ISSPACE(*p))
        p++;
-      while (isspace((unsigned char)*p))
+      while (ISSPACE(*p))
        p++;
      n++;
    }

+  if (!n)
+    {
+      channel->ndomains = 0;
+      return ARES_SUCCESS;
+    }
+
  channel->domains = malloc(n * sizeof(char *));
-  if (!channel->domains && n)
+  if (!channel->domains)
    return ARES_ENOMEM;

  /* Now copy the domains. */
@@ -947,7 +982,7 @@ static int set_search(ares_channel channel, const char *str)
    {
      channel->ndomains = n;
      q = p;
-      while (*q && !isspace((unsigned char)*q))
+      while (*q && !ISSPACE(*q))
        q++;
      channel->domains[n] = malloc(q - p + 1);
      if (!channel->domains[n])
@@ -955,7 +990,7 @@ static int set_search(ares_channel channel, const char *str)
      memcpy(channel->domains[n], p, q - p);
      channel->domains[n][q - p] = 0;
      p = q;
-      while (isspace((unsigned char)*p))
+      while (ISSPACE(*p))
        p++;
      n++;
    }
@@ -972,7 +1007,7 @@ static int set_options(ares_channel channel, const char *str)
  while (*p)
    {
      q = p;
-      while (*q && !isspace((unsigned char)*q))
+      while (*q && !ISSPACE(*q))
        q++;
      val = try_option(p, q, "ndots:");
      if (val && channel->ndots == -1)
@@ -984,7 +1019,7 @@ static int set_options(ares_channel channel, const char *str)
      if (val && channel->tries == -1)
        channel->tries = atoi(val);
      p = q;
-      while (isspace((unsigned char)*p))
+      while (ISSPACE(*p))
        p++;
    }

@@ -997,10 +1032,10 @@ static char *try_config(char *s, const char *opt)
  size_t len;

  len = strlen(opt);
-  if (strncmp(s, opt, len) != 0 || !isspace((unsigned char)s[len]))
+  if (strncmp(s, opt, len) != 0 || !ISSPACE(s[len]))
    return NULL;
  s += len;
-  while (isspace((unsigned char)*s))
+  while (ISSPACE(*s))
    s++;
  return s;
 }
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -40,14 +40,14 @@ struct sockaddr_in6
 #endif

 #ifndef HAVE_STRUCT_ADDRINFO
-struct addrinfo
+struct addrinfo 
 {
-  int ai_flags;
-  int ai_family;
-  int ai_socktype;
-  int ai_protocol;
-  size_t ai_addrlen;
-  char *ai_cannonname;
+  int              ai_flags;
+  int              ai_family;
+  int              ai_socktype;
+  int              ai_protocol;
+  socklen_t        ai_addrlen;   /* Follow rfc3493 struct addrinfo */
+  char            *ai_canonname;
  struct sockaddr *ai_addr;
  struct addrinfo *ai_next;
 };
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -30,6 +32,7 @@
 #include <string.h>
 #include "ares.h"
 #include "ares_dns.h"
+#include "ares_private.h"

 /* Header format, from RFC 1035:
 *                                  1  1  1  1  1  1
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_parse_aaaa_reply.c
+++ b/ares/ares_parse_aaaa_reply.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 2005 Dominick Meglio
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_private.h
+++ b/ares/ares_private.h
@@ -1,3 +1,6 @@
+#ifndef __ARES_PRIVATE_H
+#define __ARES_PRIVATE_H
+
 /* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
@@ -176,13 +179,22 @@ struct ares_channeldata {

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

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

+#define SOCK_STATE_CALLBACK(c, s, r, w)                                 \
+  do {                                                                  \
+    if ((c)->sock_state_cb)                                             \
+      (c)->sock_state_cb((c)->sock_state_cb_data, (s), (r), (w));       \
+  } while (0)
+
 #ifdef CURLDEBUG
 /* This is low-level hard-hacking memory leak tracking and similar. Using the
   libcurl lowlevel code from within library is ugly and only works when
@@ -190,3 +202,6 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize);
   this anyway for convenience. */
 #include "../lib/memdebug.h"
 #endif
+
+#endif /* __ARES_PRIVATE_H */
+
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -57,12 +59,13 @@
 #define TRUE 1
 #endif

-#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
+#ifdef USE_WINSOCK
 #define GET_ERRNO()  WSAGetLastError()
 #else
 #define GET_ERRNO()  errno
 #endif

+static int try_again(int errnum);
 static void write_tcp_data(ares_channel channel, fd_set *write_fds,
                           time_t now);
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now);
@@ -94,6 +97,31 @@ void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
  process_timeouts(channel, now);
 }

+/* Return 1 if the specified errno describes a readiness error, or 0
+ * otherwise. This is mostly for HP-UX, which could return EAGAIN or
+ * EWOULDBLOCK. See this man page
+ *
+ * 	http://devrsrc1.external.hp.com/STKS/cgi-bin/man2html?manpage=/usr/share/man/man2.Z/send.2
+ */
+static int try_again(int errnum)
+{
+#if !defined EWOULDBLOCK && !defined EAGAIN
+#error "Neither EWOULDBLOCK nor EAGAIN defined"
+#endif
+  switch (errnum)
+    {
+#ifdef EWOULDBLOCK
+    case EWOULDBLOCK:
+      return 1;
+#endif
+#if defined EAGAIN && EAGAIN != EWOULDBLOCK
+    case EAGAIN:
+      return 1;
+#endif
+    }
+  return 0;
+}
+
 /* If any TCP sockets select true for writing, write out queued data
 * we have for them.
 */
@@ -132,11 +160,12 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
              vec[n].iov_len = sendreq->len;
              n++;
            }
-          wcount = writev(server->tcp_socket, vec, n);
+          wcount = (ssize_t)writev(server->tcp_socket, vec, (int)n);
          free(vec);
          if (wcount < 0)
            {
-              handle_error(channel, i, now);
+              if (!try_again(GET_ERRNO()))
+                  handle_error(channel, i, now);
              continue;
            }

@@ -149,7 +178,10 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
                  wcount -= sendreq->len;
                  server->qhead = sendreq->next;
                  if (server->qhead == NULL)
-                    server->qtail = NULL;
+                    {
+                      SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+                      server->qtail = NULL;
+                    }
                  free(sendreq);
                }
              else
@@ -165,12 +197,11 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
          /* Can't allocate iovecs; just send the first request. */
          sendreq = server->qhead;

-          scount = send(server->tcp_socket, (void *)sendreq->data,
-                        sendreq->len, 0);
-
+          scount = swrite(server->tcp_socket, sendreq->data, sendreq->len);
          if (scount < 0)
            {
-              handle_error(channel, i, now);
+              if (!try_again(GET_ERRNO()))
+                  handle_error(channel, i, now);
              continue;
            }

@@ -179,7 +210,10 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
            {
              server->qhead = sendreq->next;
              if (server->qhead == NULL)
-                server->qtail = NULL;
+                {
+                  SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+                  server->qtail = NULL;
+                }
              free(sendreq);
            }
          else
@@ -198,7 +232,8 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
 {
  struct server_state *server;
-  int i, count;
+  int i;
+  ssize_t count;

  for (i = 0; i < channel->nservers; i++)
    {
@@ -213,16 +248,17 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
          /* We haven't yet read a length word, so read that (or
           * what's left to read of it).
           */
-          count = recv(server->tcp_socket,
-                       (void *)(server->tcp_lenbuf + server->tcp_lenbuf_pos),
-                       2 - server->tcp_lenbuf_pos, 0);
+          count = sread(server->tcp_socket,
+                        server->tcp_lenbuf + server->tcp_lenbuf_pos,
+                        2 - server->tcp_lenbuf_pos);
          if (count <= 0)
            {
-              handle_error(channel, i, now);
+              if (!(count == -1 && try_again(GET_ERRNO())))
+                  handle_error(channel, i, now);
              continue;
            }

-          server->tcp_lenbuf_pos += count;
+          server->tcp_lenbuf_pos += (int)count;
          if (server->tcp_lenbuf_pos == 2)
            {
              /* We finished reading the length word.  Decode the
@@ -239,16 +275,17 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
      else
        {
          /* Read data into the allocated buffer. */
-          count = recv(server->tcp_socket,
-                       (void *)(server->tcp_buffer + server->tcp_buffer_pos),
-                       server->tcp_length - server->tcp_buffer_pos, 0);
+          count = sread(server->tcp_socket,
+                        server->tcp_buffer + server->tcp_buffer_pos,
+                        server->tcp_length - server->tcp_buffer_pos);
          if (count <= 0)
            {
-              handle_error(channel, i, now);
+              if (!(count == -1 && try_again(GET_ERRNO())))
+                  handle_error(channel, i, now);
              continue;
            }

-          server->tcp_buffer_pos += count;
+          server->tcp_buffer_pos += (int)count;
          if (server->tcp_buffer_pos == server->tcp_length)
            {
              /* We finished reading this answer; process it and
@@ -260,6 +297,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
                        free(server->tcp_buffer);
              server->tcp_buffer = NULL;
              server->tcp_lenbuf_pos = 0;
+              server->tcp_buffer_pos = 0;
            }
        }
    }
@@ -270,7 +308,8 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
                             time_t now)
 {
  struct server_state *server;
-  int i, count;
+  int i;
+  ssize_t count;
  unsigned char buf[PACKETSZ + 1];

  for (i = 0; i < channel->nservers; i++)
@@ -282,11 +321,13 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
          !FD_ISSET(server->udp_socket, read_fds))
        continue;

-      count = recv(server->udp_socket, (void *)buf, sizeof(buf), 0);
-      if (count <= 0)
+      count = sread(server->udp_socket, buf, sizeof(buf));
+      if (count == -1 && try_again(GET_ERRNO()))
+        continue;
+      else if (count <= 0)
        handle_error(channel, i, now);

-      process_answer(channel, buf, count, i, 0, now);
+      process_answer(channel, buf, (int)count, i, 0, now);
    }
 }

@@ -380,7 +421,7 @@ static void handle_error(ares_channel channel, int whichserver, time_t now)
  struct query *query, *next;

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

  /* Tell all queries talking to this server to move on and not try
   * this server again.
@@ -452,7 +493,10 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
      if (server->qtail)
        server->qtail->next = sendreq;
      else
-        server->qhead = sendreq;
+        {
+          SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 1);
+          server->qhead = sendreq;
+        }
      server->qtail = sendreq;
      query->timeout = 0;
    }
@@ -467,9 +511,9 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
              return;
            }
        }
-      if (send(server->udp_socket, (void *)query->qbuf,
-               query->qlen, 0) == -1)
+      if (swrite(server->udp_socket, query->qbuf, query->qlen) == -1)
        {
+          /* FIXME: Handle EAGAIN here since it likely can happen. */
          query->skip_server[query->server] = 1;
          next_server(channel, query, now);
          return;
@@ -575,6 +619,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
    }
  }

+  SOCK_STATE_CALLBACK(channel, s, 1, 0);
  server->tcp_buffer_pos = 0;
  server->tcp_socket = s;
  return 0;
@@ -604,6 +649,8 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
      return -1;
    }

+  SOCK_STATE_CALLBACK(channel, s, 1, 0);
+
  server->udp_socket = s;
  return 0;
 }
@@ -714,7 +761,7 @@ static struct query *end_query (ares_channel channel, struct query *query, int s
  if (!channel->queries && !(channel->flags & ARES_FLAG_STAYOPEN))
    {
      for (i = 0; i < channel->nservers; i++)
-        ares__close_sockets(&channel->servers[i]);
+        ares__close_sockets(channel, &channel->servers[i]);
    }
  return (next);
 }
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_search.c
+++ b/ares/ares_search.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
@@ -237,15 +239,15 @@ static int single_domain(ares_channel channel, const char *name, char **s)
                     == ARES_SUCCESS)
                {
                  if (strncasecmp(line, name, len) != 0 ||
-                      !isspace((unsigned char)line[len]))
+                      !ISSPACE(line[len]))
                    continue;
                  p = line + len;
-                  while (isspace((unsigned char)*p))
+                  while (ISSPACE(*p))
                    p++;
                  if (*p)
                    {
                      q = p + 1;
-                      while (*q && !isspace((unsigned char)*q))
+                      while (*q && !ISSPACE(*q))
                        q++;
                      *s = malloc(q - p + 1);
                      if (*s)
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_strerror.c
+++ b/ares/ares_strerror.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
 * Permission to use, copy, modify, and distribute this
--- a/ares/ares_version.h
+++ b/ares/ares_version.h
@@ -5,13 +5,21 @@

 #define ARES_VERSION_MAJOR 1
 #define ARES_VERSION_MINOR 3
-#define ARES_VERSION_PATCH 1
+#define ARES_VERSION_PATCH 3
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
                       (ARES_VERSION_MINOR<<8)|\
                       (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.3.1"
+#define ARES_VERSION_STR "1.3.3-CVS"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif

 const char *ares_version(int *version);

+#ifdef  __cplusplus
+}
+#endif
+
 #endif

--- a/ares/bitncmp.c
+++ b/ares/bitncmp.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /*
 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1996,1999 by Internet Software Consortium.
--- a/ares/bitncmp.h
+++ b/ares/bitncmp.h
@@ -1,3 +1,6 @@
+#ifndef __ARES_BITNCMP_H
+#define __ARES_BITNCMP_H
+
 /* $Id$ */

 /*
@@ -14,13 +17,10 @@
 * without express or implied warranty.
 */

-#ifndef BITNCMP_H
-#define BITNCMP_H
-
 #ifndef HAVE_BITNCMP
 int ares_bitncmp(const void *l, const void *r, int n);
 #else
 #define ares_bitncmp(x,y,z) bitncmp(x,y,z)
 #endif

-#endif /* BITNCMP_H */
+#endif /* __ARES_BITNCMP_H */
--- a/ares/config-win32.h
+++ b/ares/config-win32.h
@@ -3,7 +3,7 @@

 /* $Id$ */

-/* Copyright (C) 2004 - 2005 by Daniel Stenberg et al
+/* Copyright (C) 2004 - 2006 by Daniel Stenberg et al
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose and without fee is hereby granted, provided
@@ -17,7 +17,7 @@
 */

 /* ================================================================ */
-/*    ares/config-win32.h - Hand crafted config file for windows    */
+/*    ares/config-win32.h - Hand crafted config file for Windows    */
 /* ================================================================ */

 /* ---------------------------------------------------------------- */
@@ -29,6 +29,15 @@
 #define HAVE_GETOPT_H 1
 #endif

+/* Define if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define if you have the <sys/time.h> header file */
+/* #define HAVE_SYS_TIME_H 1 */
+
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H 1
+
 /* Define if you have the <unistd.h> header file.  */
 #if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \
    defined(__POCC__)
@@ -47,6 +56,19 @@
 /* Define if you have the <ws2tcpip.h> header file.  */
 #define HAVE_WS2TCPIP_H 1

+/* ---------------------------------------------------------------- */
+/*                        OTHER HEADER INFO                         */
+/* ---------------------------------------------------------------- */
+
+/* Define if sig_atomic_t is an available typedef. */
+#define HAVE_SIG_ATOMIC_T 1
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+/* #define TIME_WITH_SYS_TIME 1 */
+
 /* ---------------------------------------------------------------- */
 /*                             FUNCTIONS                            */
 /* ---------------------------------------------------------------- */
@@ -54,6 +76,78 @@
 /* Define if you have the ioctlsocket function.  */
 #define HAVE_IOCTLSOCKET 1

+/* Define if you have the recv function. */
+#define HAVE_RECV 1
+
+/* Define to the type of arg 1 for recv. */
+#define RECV_TYPE_ARG1 SOCKET
+
+/* Define to the type of arg 2 for recv. */
+#define RECV_TYPE_ARG2 char *
+
+/* Define to the type of arg 3 for recv. */
+#define RECV_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for recv. */
+#define RECV_TYPE_ARG4 int
+
+/* Define to the function return type for recv. */
+#define RECV_TYPE_RETV int
+
+/* Define if you have the send function. */
+#define HAVE_SEND 1
+
+/* Define to the type of arg 1 for send. */
+#define SEND_TYPE_ARG1 SOCKET
+
+/* Define to the type qualifier of arg 2 for send. */
+#define SEND_QUAL_ARG2 const
+
+/* Define to the type of arg 2 for send. */
+#define SEND_TYPE_ARG2 char *
+
+/* Define to the type of arg 3 for send. */
+#define SEND_TYPE_ARG3 int
+
+/* Define to the type of arg 4 for send. */
+#define SEND_TYPE_ARG4 int
+
+/* Define to the function return type for send. */
+#define SEND_TYPE_RETV int
+
+/* Specifics for the Watt-32 tcp/ip stack */
+#ifdef WATT32
+  #define SOCKET              int
+  #define NS_INADDRSZ         4
+  #define HAVE_ARPA_NAMESER_H 1
+  #undef HAVE_WINSOCK_H
+  #undef HAVE_WINSOCK2_H
+  #undef HAVE_WS2TCPIP_H
+#endif
+
+/* ---------------------------------------------------------------- */
+/*                       TYPEDEF REPLACEMENTS                       */
+/* ---------------------------------------------------------------- */
+
+/* Define this if in_addr_t is not an available 'typedefed' type */
+#define in_addr_t unsigned long
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define ssize_t if it is not an available 'typedefed' type */
+#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
+#elif defined(_WIN64)
+#define ssize_t __int64
+#else
+#define ssize_t int
+#endif
+
+/* Define to 'int' if socklen_t is not an available 'typedefed' type */
+#ifndef HAVE_WS2TCPIP_H
+#define socklen_t int
+#endif
+
 /* ---------------------------------------------------------------- */
 /*                          STRUCT RELATED                          */
 /* ---------------------------------------------------------------- */
@@ -64,6 +158,9 @@
 /* Define this if you have struct sockaddr_storage */
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1

+/* Define this if you have struct timeval */
+#define HAVE_STRUCT_TIMEVAL 1
+
 /* ---------------------------------------------------------------- */
 /*                         IPV6 COMPATIBILITY                       */
 /* ---------------------------------------------------------------- */
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -16,10 +16,6 @@ solaris*)
 	;;
 esac

-AC_SEARCH_LIBS(gethostbyname, nsl)
-AC_SEARCH_LIBS(socket, socket)
-
-dnl check for cygwin stuff
 AC_LIBTOOL_WIN32_DLL

 dnl ************************************************************
@@ -47,6 +43,15 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
    CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I$srcdir/../include"
    CFLAGS="$CFLAGS -g" 

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

 dnl libtool setup
+CARES_CLEAR_LIBTOOL_TAGS
 AC_PROG_LIBTOOL

+AC_MSG_CHECKING([if we need -no-undefined])
+case $host in
+  *-*-cygwin | *-*-mingw* | *-*-pw32*)
+    need_no_undefined=yes
+    ;;
+  *)
+    need_no_undefined=no
+    ;;
+esac
+AC_MSG_RESULT($need_no_undefined)
+AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
+
+dnl **********************************************************************
+dnl Checks for libraries.
+dnl **********************************************************************
+
+dnl gethostbyname without lib or in the nsl lib?
+AC_CHECK_FUNC(gethostbyname,
+              [HAVE_GETHOSTBYNAME="1"
+              ],
+              [ AC_CHECK_LIB(nsl, gethostbyname,
+                             [HAVE_GETHOSTBYNAME="1"
+                             LIBS="$LIBS -lnsl"
+                             ])
+              ])
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl gethostbyname in the socket lib?
+  AC_CHECK_LIB(socket, gethostbyname,
+               [HAVE_GETHOSTBYNAME="1"
+               LIBS="$LIBS -lsocket"
+               ])
+fi
+
+dnl At least one system has been identified to require BOTH nsl and socket
+dnl libs at the same time to link properly.
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  AC_MSG_CHECKING([for gethostbyname with both nsl and socket libs])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lnsl -lsocket $LIBS"
+  AC_TRY_LINK( ,
+             [gethostbyname();],
+             [ dnl found it!
+             HAVE_GETHOSTBYNAME="1"
+             AC_MSG_RESULT([yes])],
+             [ dnl failed!
+             AC_MSG_RESULT([no])
+             dnl restore LIBS
+             LIBS=$my_ac_save_LIBS]
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl This is for Msys/Mingw
+  AC_MSG_CHECKING([for gethostbyname in ws2_32])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lws2_32 $LIBS"
+  AC_TRY_LINK([#include <winsock2.h>],
+               [gethostbyname("www.dummysite.com");],
+               [ dnl worked!
+               ws2="yes"
+               AC_MSG_RESULT([yes])
+               HAVE_GETHOSTBYNAME="1"],
+               [ dnl failed, restore LIBS
+               LIBS=$my_ac_save_LIBS
+               AC_MSG_RESULT(no)]
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl This is for eCos with a stubbed DNS implementation
+  AC_MSG_CHECKING([for gethostbyname for eCos])
+  AC_TRY_LINK([
+#include <stdio.h>
+#include <netdb.h>],
+               [gethostbyname("www.dummysite.com");],
+               [ dnl worked!
+               AC_MSG_RESULT([yes])
+               HAVE_GETHOSTBYNAME="1"],
+               AC_MSG_RESULT(no)
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl gethostbyname in the net lib - for BeOS
+  AC_CHECK_LIB(net, gethostbyname,
+               [HAVE_GETHOSTBYNAME="1"
+               LIBS="$LIBS -lnet"
+               ])
+fi
+
+
+if test "$HAVE_GETHOSTBYNAME" = "1"; then
+  AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [If you have gethostbyname])
+else
+  AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
+fi
+
+dnl resolve lib?
+AC_CHECK_FUNC(strcasecmp, , [ AC_CHECK_LIB(resolve, strcasecmp) ])
+
+if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
+  AC_CHECK_LIB(resolve, strcasecmp,
+              [LIBS="-lresolve $LIBS"],
+               ,
+               -lnsl)
+fi
+
+dnl socket lib?
+AC_CHECK_FUNC(connect, , [ AC_CHECK_LIB(socket, connect) ])
+
+dnl dl lib?
+AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ])
+
+AC_MSG_CHECKING([whether to use libgcc])
+AC_ARG_ENABLE(libgcc,
+AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]),
+[ case "$enableval" in
+  yes)
+        LIBS="$LIBS -lgcc"
+       AC_MSG_RESULT(yes)
+       ;;
+  *)   AC_MSG_RESULT(no)
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+dnl **********************************************************************
+dnl Back to "normal" configuring
+dnl **********************************************************************
+
 dnl Checks for header files.
 AC_HEADER_STDC

@@ -74,6 +217,8 @@ CURL_CHECK_HEADER_WINSOCK
 CURL_CHECK_HEADER_WINSOCK2
 CURL_CHECK_HEADER_WS2TCPIP

+CURL_CHECK_HEADER_MALLOC
+
 dnl check for a few basic system headers we need
 AC_CHECK_HEADERS(
       sys/types.h \
@@ -120,11 +265,8 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
+CURL_CHECK_STRUCT_TIMEVAL

-AC_CHECK_SIZEOF(curl_off_t, ,[
-#include <stdio.h>
-#include "$srcdir/include/curl/curl.h"
-])
 AC_CHECK_SIZEOF(size_t)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(time_t)
@@ -155,6 +297,15 @@ TYPE_IN_ADDR_T

 TYPE_SOCKADDR_STORAGE

+TYPE_SIG_ATOMIC_T
+
+AC_TYPE_SIGNAL
+
+CURL_CHECK_FUNC_RECV
+
+CURL_CHECK_FUNC_SEND
+
+CURL_CHECK_MSG_NOSIGNAL

 dnl check for AF_INET6
 CARES_CHECK_CONSTANT(
@@ -428,7 +579,8 @@ int main()
  }
  ], [
       AC_MSG_RESULT(yes)
-       AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6,1,[Define to 1 if inet_ntop supports IPv6.])
+       AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6,1,
+          [Define to 1 if inet_ntop supports IPv6.])
     ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))
 fi

@@ -494,13 +646,15 @@ dnl and get the types of five of its arguments.
 CURL_CHECK_FUNC_GETNAMEINFO


-dnl God bless non-standardized functions! We need to see which getservbyport_r variant is available
+dnl God bless non-standardized functions! We need to see which getservbyport_r
+dnl variant is available
 CARES_CHECK_GETSERVBYPORT_R

 CURL_CHECK_NONBLOCKING_SOCKET

 AC_C_BIGENDIAN(
-    [AC_DEFINE(ARES_BIG_ENDIAN, 1, [define this if ares is built for a big endian system])],
+    [AC_DEFINE(ARES_BIG_ENDIAN, 1,
+      [define this if ares is built for a big endian system])],
    ,
    [AC_MSG_WARN([couldn't figure out endianess, assuming little endian!])]
 )
--- a/ares/inet_net_pton.c
+++ b/ares/inet_net_pton.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /*
 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1996,1999 by Internet Software Consortium.
@@ -77,14 +79,13 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)

  ch = *src++;
  if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-      && isascii((unsigned char)(src[1]))
-      && isxdigit((unsigned char)(src[1]))) {
+      && ISXDIGIT(src[1])) {
    /* Hexadecimal: Eat nybble string. */
    if (size <= 0U)
      goto emsgsize;
    dirty = 0;
    src++;  /* skip x or X. */
-    while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) {
+    while ((ch = *src++) != '\0' && ISXDIGIT(ch)) {
      if (isupper(ch))
        ch = tolower(ch);
      n = (int)(strchr(xdigits, ch) - xdigits);
@@ -104,7 +105,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
        goto emsgsize;
      *dst++ = (unsigned char) (tmp << 4);
    }
-  } else if (isascii(ch) && isdigit(ch)) {
+  } else if (ISDIGIT(ch)) {
    /* Decimal: eat dotted digit string. */
    for (;;) {
      tmp = 0;
@@ -115,7 +116,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
        if (tmp > 255)
          goto enoent;
      } while ((ch = *src++) != '\0' &&
-               isascii(ch) && isdigit(ch));
+               ISDIGIT(ch));
      if (size-- <= 0U)
        goto emsgsize;
      *dst++ = (unsigned char) tmp;
@@ -124,15 +125,15 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
      if (ch != '.')
        goto enoent;
      ch = *src++;
-      if (!isascii(ch) || !isdigit(ch))
+      if (!ISDIGIT(ch))
        goto enoent;
    }
  } else
    goto enoent;

  bits = -1;
-  if (ch == '/' && isascii((unsigned char)(src[0])) &&
-      isdigit((unsigned char)(src[0])) && dst > odst) {
+  if (ch == '/' &&
+      ISDIGIT(src[0]) && dst > odst) {
    /* CIDR width specifier.  Nothing can follow it. */
    ch = *src++;    /* Skip over the /. */
    bits = 0;
@@ -140,7 +141,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
      n = (int)(strchr(digits, ch) - digits);
      bits *= 10;
      bits += n;
-    } while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
+    } while ((ch = *src++) != '\0' && ISDIGIT(ch));
    if (ch != '\0')
      goto enoent;
    if (bits > 32)
--- a/ares/inet_net_pton.h
+++ b/ares/inet_net_pton.h
@@ -1,3 +1,6 @@
+#ifndef __ARES_INET_NET_PTON_H
+#define __ARES_INET_NET_PTON_H
+
 /* $Id$ */

 /*
@@ -14,9 +17,6 @@
 * without express or implied warranty.
 */

-#ifndef INET_NET_PTON_H
-#define INET_NET_PTON_H
-
 #if defined(HAVE_INET_PTON) && defined(HAVE_INET_PTON_IPV6)
 #define ares_inet_pton(x,y,z) inet_pton(x,y,z)
 #else
@@ -28,4 +28,4 @@ int ares_inet_pton(int af, const char *src, void *dst);
 int ares_inet_net_pton(int af, const char *src, void *dst, size_t size);
 #endif

-#endif /* INET_NET_PTON_H */
+#endif /* __ARES_INET_NET_PTON_H */
--- a/ares/inet_ntop.c
+++ b/ares/inet_ntop.c
@@ -129,9 +129,13 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
   * Keep this in mind if you think this function should have been coded
   * to use pointer overlays.  All the world's not a VAX.
   */
-  char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-  struct { int base, len; } best = { 0,0 }, cur = { 0,0 };
-  unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
+  char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
+  char *tp;
+  struct {
+    long base;
+    long len;
+  } best, cur;
+  unsigned long words[NS_IN6ADDRSZ / NS_INT16SZ];
  int i;

  /*
@@ -139,11 +143,15 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
   *  Copy the input (bytewise) array into a wordwise array.
   *  Find the longest run of 0x00's in src[] for :: shorthanding.
   */
-  memset(words, '\0', sizeof words);
+  memset(words, '\0', sizeof(words));
  for (i = 0; i < NS_IN6ADDRSZ; i++)
      words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+
  best.base = -1;
  cur.base = -1;
+  best.len = 0;
+  cur.len = 0;
+
  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
    {
      if (words[i] == 0)
@@ -192,12 +200,12 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
      if (i == 6 && best.base == 0 &&
          (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
        {
-          if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+          if (!inet_ntop4(src+12, tp, sizeof(tmp) - (tp - tmp)))
            return (NULL);
          tp += strlen(tp);
          break;
        }
-        tp += SPRINTF((tp, "%x", words[i]));
+        tp += SPRINTF((tp, "%lx", words[i]));
    }

  /* Was it a trailing run of 0x00's? */
--- a/ares/inet_ntop.h
+++ b/ares/inet_ntop.h
@@ -1,3 +1,6 @@
+#ifndef __ARES_INET_NTOP_H
+#define __ARES_INET_NTOP_H
+
 /* $Id$ */

 /*
@@ -14,13 +17,10 @@
 * without express or implied warranty.
 */

-#ifndef INET_NTOP_H
-#define INET_NTOP_H
-
-#ifdef HAVE_INET_NTOP
+#if defined(HAVE_INET_NTOP) && defined(HAVE_INET_NTOP_IPV6)
 #define ares_inet_ntop(w,x,y,z) inet_ntop(w,x,y,z)
 #else
 const char *ares_inet_ntop(int af, const void *src, char *dst, size_t size);
 #endif

-#endif /* INET_NET_NTOP_H */
+#endif /* __ARES_INET_NTOP_H */
--- a/ares/nameser.h
+++ b/ares/nameser.h
@@ -7,7 +7,9 @@
   port build */

 #ifndef NETWARE
+#ifndef __CYGWIN__
 #include <windows.h>
+#endif
 #include <process.h> /* for the _getpid() proto */
 #endif  /* !NETWARE */
 #include <sys/types.h>
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -1,6 +1,8 @@
 #ifndef __ARES_SETUP_H
 #define __ARES_SETUP_H

+/* $Id$ */
+
 /* Copyright (C) 2004 - 2005 by Daniel Stenberg et al
 *
 * Permission to use, copy, modify, and distribute this software and its
@@ -43,7 +45,11 @@
 * Include header files for windows builds before redefining anything.
 * Use this preproessor block only to include or exclude windows.h,
 * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independant block.
+ * to any other further and independant block.  Under Cygwin things work
+ * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
+ * never be included when __CYGWIN__ is defined.  configure script takes
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
 */

 #ifdef HAVE_WINDOWS_H
@@ -63,6 +69,22 @@
 #  endif
 #endif

+/*
+ * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
+ * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
+ * undefine USE_WINSOCK.
+ */
+
+#undef USE_WINSOCK
+
+#ifdef HAVE_WINSOCK2_H
+#  define USE_WINSOCK 2
+#else
+#  ifdef HAVE_WINSOCK_H
+#    define USE_WINSOCK 1
+#  endif
+#endif
+
 /*
 * Work-arounds for systems without configure support
 */
@@ -99,7 +121,7 @@
 * Typedef our socket type
 */

-#if defined(WIN32) && !defined(WATT32)
+#ifdef USE_WINSOCK
 typedef SOCKET ares_socket_t;
 #define ARES_SOCKET_BAD INVALID_SOCKET
 #else
@@ -145,4 +167,12 @@ int ares_strcasecmp(const char *s1, const char *s2);
 #endif
 #endif

+/*
+ * Include macros and defines that should only be processed once.
+ */
+
+#ifndef __SETUP_ONCE_H
+#include "setup_once.h"
+#endif
+
 #endif /* __ARES_SETUP_H */
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -0,0 +1,146 @@
+#ifndef __SETUP_ONCE_H
+#define __SETUP_ONCE_H
+
+/* $Id$ */
+
+/* Copyright (C) 2004 - 2007 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.
+ */
+
+
+/********************************************************************
+ *                              NOTICE                              *
+ *                             ========                             *
+ *                                                                  *
+ *  Content of header files lib/setup_once.h and ares/setup_once.h  *
+ *  must be kept in sync. Modify the other one if you change this.  *
+ *                                                                  *
+ ********************************************************************/
+
+
+/*
+ * If we have the MSG_NOSIGNAL define, make sure we use
+ * it as the fourth argument of function send()
+ */
+
+#ifdef HAVE_MSG_NOSIGNAL
+#define SEND_4TH_ARG MSG_NOSIGNAL
+#else
+#define SEND_4TH_ARG 0
+#endif 
+
+
+/*
+ * The definitions for the return type and arguments types
+ * of functions recv() and send() belong and come from the
+ * configuration file. Do not define them in any other place.
+ *
+ * HAVE_RECV is defined if you have a function named recv()
+ * which is used to read incoming data from sockets. If your
+ * function has another name then don't define HAVE_RECV.
+ *
+ * If HAVE_RECV is defined then RECV_TYPE_ARG1, RECV_TYPE_ARG2,
+ * RECV_TYPE_ARG3, RECV_TYPE_ARG4 and RECV_TYPE_RETV must also
+ * be defined.
+ *
+ * HAVE_SEND is defined if you have a function named send()
+ * which is used to write outgoing data on a connected socket.
+ * If yours has another name then don't define HAVE_SEND.
+ *
+ * If HAVE_SEND is defined then SEND_TYPE_ARG1, SEND_QUAL_ARG2,
+ * SEND_TYPE_ARG2, SEND_TYPE_ARG3, SEND_TYPE_ARG4 and
+ * SEND_TYPE_RETV must also be defined.
+ */
+
+#ifdef HAVE_RECV
+#if !defined(RECV_TYPE_ARG1) || \
+    !defined(RECV_TYPE_ARG2) || \
+    !defined(RECV_TYPE_ARG3) || \
+    !defined(RECV_TYPE_ARG4) || \
+    !defined(RECV_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_recv
+  /* */
+#else
+#define sread(x,y,z) (ssize_t)recv((RECV_TYPE_ARG1)(x), \
+                                   (RECV_TYPE_ARG2)(y), \
+                                   (RECV_TYPE_ARG3)(z), \
+                                   (RECV_TYPE_ARG4)(0))
+#endif
+#else /* HAVE_RECV */
+#ifndef sread
+  /* */
+  Error Missing_definition_of_macro_sread
+  /* */
+#endif
+#endif /* HAVE_RECV */
+
+#ifdef HAVE_SEND
+#if !defined(SEND_TYPE_ARG1) || \
+    !defined(SEND_QUAL_ARG2) || \
+    !defined(SEND_TYPE_ARG2) || \
+    !defined(SEND_TYPE_ARG3) || \
+    !defined(SEND_TYPE_ARG4) || \
+    !defined(SEND_TYPE_RETV)
+  /* */
+  Error Missing_definition_of_return_and_arguments_types_of_send
+  /* */
+#else
+#define swrite(x,y,z) (ssize_t)send((SEND_TYPE_ARG1)(x), \
+                                    (SEND_TYPE_ARG2)(y), \
+                                    (SEND_TYPE_ARG3)(z), \
+                                    (SEND_TYPE_ARG4)(SEND_4TH_ARG))
+#endif
+#else /* HAVE_SEND */
+#ifndef swrite
+  /* */
+  Error Missing_definition_of_macro_swrite
+  /* */
+#endif
+#endif /* HAVE_SEND */
+
+
+/*
+ * Uppercase macro versions of ANSI/ISO is*() functions/macros which 
+ * avoid negative number inputs with argument byte codes > 127.
+ */
+
+#define ISSPACE(x)  (isspace((int)  ((unsigned char)x)))
+#define ISDIGIT(x)  (isdigit((int)  ((unsigned char)x)))
+#define ISALNUM(x)  (isalnum((int)  ((unsigned char)x)))
+#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
+#define ISGRAPH(x)  (isgraph((int)  ((unsigned char)x)))
+#define ISALPHA(x)  (isalpha((int)  ((unsigned char)x)))
+#define ISPRINT(x)  (isprint((int)  ((unsigned char)x)))
+
+
+/*
+ * Typedef to 'int' if sig_atomic_t is not an available 'typedefed' type.
+ */
+
+#ifndef HAVE_SIG_ATOMIC_T
+typedef int sig_atomic_t;
+#define HAVE_SIG_ATOMIC_T
+#endif
+
+
+/*
+ * Default return type for signal handlers.
+ */
+
+#ifndef RETSIGTYPE
+#define RETSIGTYPE void
+#endif
+
+
+#endif /* __SETUP_ONCE_H */
+
--- a/ares/vc/areslib/areslib.dsp
+++ b/ares/vc/areslib/areslib.dsp
@@ -129,6 +129,10 @@ SOURCE=..\..\ares_gethostbyname.c
 # End Source File
 # Begin Source File

+SOURCE=..\..\ares_getsock.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\ares_init.c
 # End Source File
 # Begin Source File
--- a/ares/windows_port.c
+++ b/ares/windows_port.c
@@ -1,5 +1,7 @@
 #include "setup.h"

+/* $Id$ */
+
 /* only do the following on windows
 */
 #if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
@@ -100,6 +102,6 @@ ares_writev (ares_socket_t s, const struct iovec *vector, size_t count)
    memcpy (bp, vector[i].iov_base, vector[i].iov_len);
    bp += vector[i].iov_len;
  }
-  return send (s, (const void*)buffer, bytes, 0);
+  return (int)swrite(s, buffer, bytes);
 }
 #endif /* WIN32 builds only */
--- a/4
+++ b/4
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -140,7 +140,7 @@ else
  libtoolize=`findtool $LIBTOOLIZE`
 fi

-lt_pversion=`$libtool --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
+lt_pversion=`$libtool --version 2>/dev/null|head -n 2|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
 if test -z "$lt_pversion"; then
  echo "buildconf: libtool not found."
  echo "            You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -5,7 +5,6 @@ REM $Date$

 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 hugehelp.c
 copy src\hugehelp.c.cvs src\hugehelp.c
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -28,7 +28,7 @@ dnl We don't know the version number "staticly" so we use a dash here
 AC_INIT(curl, [-], [a suitable curl mailing list => http://curl.haxx.se/mail/])

 dnl configure script copyright
-AC_COPYRIGHT([Copyright (c) 1998 - 2005 Daniel Stenberg, <daniel@haxx.se>
+AC_COPYRIGHT([Copyright (c) 1998 - 2006 Daniel Stenberg, <daniel@haxx.se>
 This configure script may be copied, distributed and modified under the 
 terms of the curl license; see COPYING for more details])

@@ -78,6 +78,7 @@ AC_SUBST(PKGADD_VENDOR)
 dnl
 dnl initialize all the info variables
    curl_ssl_msg="no      (--with-ssl / --with-gnutls)"
+    curl_ssh_msg="no      (--with-libssh2)"
   curl_zlib_msg="no      (--with-zlib)"
   curl_krb4_msg="no      (--with-krb4*)"
    curl_gss_msg="no      (--with-gssapi)"
@@ -306,6 +307,13 @@ AC_HELP_STRING([--disable-manual],[Disable built-in manual]),
 dnl The actual use of the USE_MANUAL variable is done much later in this
 dnl script to allow other actions to disable it as well.

+dnl **********************************************************************
+dnl check if this is the Intel ICC compiler, and if so make it stricter
+dnl (convert warning 147 into an error) so that it properly can detect the
+dnl gethostbyname_r() version
+dnl **********************************************************************
+CURL_DETECT_ICC([CFLAGS="$CFLAGS -we 147"])
+
 dnl **********************************************************************
 dnl Checks for libraries.
 dnl **********************************************************************
@@ -366,6 +374,21 @@ then
             )
 fi

+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl This is for eCos with a stubbed DNS implementation
+  AC_MSG_CHECKING([for gethostbyname for eCos])
+  AC_TRY_LINK([
+#include <stdio.h>
+#include <netdb.h>],
+               [gethostbyname("www.dummysite.com");],
+               [ dnl worked!
+               AC_MSG_RESULT([yes])
+               HAVE_GETHOSTBYNAME="1"],
+               AC_MSG_RESULT(no)
+             )
+fi
+
 if test "$HAVE_GETHOSTBYNAME" != "1"
 then
  dnl gethostbyname in the net lib - for BeOS
@@ -465,20 +488,31 @@ dnl **********************************************************************
 dnl Check for the presence of the winmm library.
 dnl **********************************************************************

-AC_MSG_CHECKING([for timeGetTime in winmm])
-my_ac_save_LIBS=$LIBS
-LIBS="-lwinmm $LIBS"
-AC_TRY_LINK([#include <windef.h>
-             #include <mmsystem.h>
-             ],
-             [timeGetTime();],
-             [ dnl worked!
-             AC_MSG_RESULT([yes])
-             ],
-             [ dnl failed, restore LIBS
-             LIBS=$my_ac_save_LIBS
-             AC_MSG_RESULT(no)]
-           )
+case $host in
+  *-*-cygwin*)
+    dnl Under Cygwin, winmm exists but is not needed as WIN32 is not #defined
+    dnl and gettimeofday() will be used regardless of the outcome of this test.
+    dnl Skip this test, otherwise -lwinmm will be needlessly added to LIBS
+    dnl (and recorded as such in the .la file, potentially affecting downstream
+    dnl clients of the library.)
+    ;;
+  *)
+    AC_MSG_CHECKING([for timeGetTime in winmm])
+    my_ac_save_LIBS=$LIBS
+    LIBS="-lwinmm $LIBS"
+    AC_TRY_LINK([#include <windef.h>
+                 #include <mmsystem.h>
+                 ],
+                 [timeGetTime();],
+                 [ dnl worked!
+                 AC_MSG_RESULT([yes])
+                 ],
+                 [ dnl failed, restore LIBS
+                 LIBS=$my_ac_save_LIBS
+                 AC_MSG_RESULT(no)]
+               )
+    ;;
+esac

 dnl **********************************************************************
 dnl Checks for IPv6
@@ -519,10 +553,6 @@ main()

 if test "$ipv6" = "yes"; then
  curl_ipv6_msg="enabled"
-
-  CURL_CHECK_WORKING_GETADDRINFO
-
-  CURL_CHECK_NI_WITHSCOPEID
 fi

 dnl **********************************************************************
@@ -718,7 +748,7 @@ AC_ARG_WITH(gssapi-includes,
 AC_ARG_WITH(gssapi-libs,
  AC_HELP_STRING([--with-gssapi-libs=DIR],
  		 [Specify location of GSSAPI libs]),
-  [ GSSAPI_LIBS="-L$withval"
+  [ GSSAPI_LIB_DIR="-L$withval"
    want_gss="yes" ]
 )

@@ -881,18 +911,26 @@ if test X"$OPT_SSL" != Xno; then
  fi

  dnl This is for Msys/Mingw
-  AC_MSG_CHECKING([for gdi32])
-  my_ac_save_LIBS=$LIBS
-  LIBS="-lgdi32 $LIBS"
-  AC_TRY_LINK([#include <windef.h>
-               #include <wingdi.h>],
-               [GdiFlush();],
-               [ dnl worked!
-               AC_MSG_RESULT([yes])],
-               [ dnl failed, restore LIBS
-               LIBS=$my_ac_save_LIBS
-               AC_MSG_RESULT(no)]
-              )
+  case $host in    
+    *-*-cygwin*)
+      dnl Under Cygwin this is extraneous and causes an unnecessary -lgdi32
+      dnl to be added to LIBS and recorded in the .la file.
+      ;;
+    *)
+      AC_MSG_CHECKING([for gdi32])
+      my_ac_save_LIBS=$LIBS
+      LIBS="-lgdi32 $LIBS"
+      AC_TRY_LINK([#include <windef.h>
+                   #include <wingdi.h>],
+                   [GdiFlush();],
+                   [ dnl worked!
+                   AC_MSG_RESULT([yes])],
+                   [ dnl failed, restore LIBS
+                   LIBS=$my_ac_save_LIBS
+                   AC_MSG_RESULT(no)]
+                  )
+      ;;
+  esac

  AC_CHECK_LIB(crypto, CRYPTO_lock,[
     HAVECRYPTO="yes"
@@ -940,9 +978,18 @@ if test X"$OPT_SSL" != Xno; then
        AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use]))

      if test $ac_cv_header_openssl_x509_h = no; then
-        AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h,
+        dnl we don't use the "action" part of the AC_CHECK_HEADERS macro
+        dnl since 'err.h' might in fact find a krb4 header with the same
+        dnl name
+        AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h)
+
+        if test $ac_cv_header_x509_h = yes && 
+           test $ac_cv_header_crypto_h = yes &&
+           test $ac_cv_header_ssl_h = yes; then
+          dnl three matches
          curl_ssl_msg="enabled (OpenSSL)"
-          OPENSSL_ENABLED=1)
+          OPENSSL_ENABLED=1
+        fi
      fi
    fi

@@ -997,6 +1044,74 @@ if test X"$OPT_SSL" != Xno; then

 fi

+dnl **********************************************************************
+dnl Check for the presence of LIBSSH2 libraries and headers
+dnl **********************************************************************
+
+dnl Default to compiler & linker defaults for LIBSSH2 files & libraries.
+OPT_LIBSSH2=off
+AC_ARG_WITH(libssh2,dnl
+AC_HELP_STRING([--with-libssh2=PATH],[Where to look for libssh2, PATH points to the LIBSSH2 installation (default: /usr/local/lib); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option])
+AC_HELP_STRING([--without-libssh2], [disable LIBSSH2]),
+  OPT_LIBSSH2=$withval)
+
+if test X"$OPT_LIBSSH2" != Xno; then
+  dnl backup the pre-libssh2 variables
+  CLEANLDFLAGS="$LDFLAGS"
+  CLEANCPPFLAGS="$CPPFLAGS"
+  CLEANLIBS="$LIBS"
+
+  case "$OPT_LIBSSH2" in
+  yes)
+    dnl --with-libssh2 (without path) used
+    PREFIX_LIBSSH2=/usr/local/lib
+    LIB_LIBSSH2="$PREFIX_LIBSSH2/lib$libsuff"
+    ;;
+  off)
+    dnl no --with-libssh2 option given, just check default places
+    PREFIX_LIBSSH2=
+    ;;
+  *)
+    dnl use the given --with-libssh2 spot
+    PREFIX_LIBSSH2=$OPT_LIBSSH2
+    LIB_LIBSSH2="$PREFIX_LIBSSH2/lib$libsuff"
+    LDFLAGS="$LDFLAGS -L$LIB_LIBSSH2"
+    CPPFLAGS="$CPPFLAGS -I$PREFIX_LIBSSH2/include"
+    ;;
+  esac
+
+  if test X"$HAVECRYPTO" = X"yes"; then
+    dnl This is only reasonable to do if crypto actually is there: check for
+    dnl LIBSSH2 libs NOTE: it is important to do this AFTER the crypto lib
+
+    AC_CHECK_LIB(ssh2, libssh2_channel_open_ex)
+    
+    AC_CHECK_HEADERS(libssh2.h,
+      curl_ssh_msg="enabled (libSSH2)"
+      LIBSSH2_ENABLED=1
+      AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use]))
+
+    if test X"$OPT_LIBSSH2" != Xoff &&
+       test "$LIBSSH2_ENABLED" != "1"; then
+      AC_MSG_ERROR([libSSH2 libs and/or directories were not found where specified!])
+    fi
+  else
+    AC_MSG_WARN([without the use of OpenSSL libs, libssh2 cannot work])
+  fi
+
+  if test "$LIBSSH2_ENABLED" = "1"; then
+    if test -n "$LIB_LIBSSH2"; then
+       dnl when the libssh2 shared libs were found in a path that the run-time
+       dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
+       dnl to prevent further configure tests to fail due to this
+
+       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_LIBSSH2"
+       export LD_LIBRARY_PATH
+       AC_MSG_NOTICE([Added $LIB_LIBSSH2 to LD_LIBRARY_PATH])
+    fi
+  fi
+fi
+
 dnl **********************************************************************
 dnl Check for the random seed preferences 
 dnl **********************************************************************
@@ -1396,7 +1511,8 @@ if test x$cross_compiling != xyes; then
     AC_MSG_RESULT(no)
    ,
    dnl not invoked when crosscompiling)
-    ])
+     echo "hej"
+    )
  fi
 else
  dnl and for crosscompilings
@@ -1411,6 +1527,7 @@ dnl **********************************************************************
 dnl Checks for header files.
 AC_HEADER_STDC

+CURL_CHECK_HEADER_MALLOC

 dnl Now check for the very most basic headers. Then we can use these
 dnl ones as default-headers when checking for the rest!
@@ -1422,7 +1539,6 @@ AC_CHECK_HEADERS(
        sys/ioctl.h \
        assert.h \
        unistd.h \
-        malloc.h \
        stdlib.h \
        limits.h \
        arpa/inet.h \
@@ -1480,6 +1596,8 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
+CURL_CHECK_STRUCT_TIMEVAL
+CURL_VERIFY_RUNTIMELIBS

 AC_CHECK_SIZEOF(curl_off_t, ,[
 #include <stdio.h>
@@ -1515,11 +1633,21 @@ TYPE_IN_ADDR_T

 TYPE_SOCKADDR_STORAGE

+TYPE_SIG_ATOMIC_T
+
+AC_TYPE_SIGNAL
+
 AC_FUNC_SELECT_ARGTYPES

+CURL_CHECK_FUNC_RECV
+
+CURL_CHECK_FUNC_SEND
+
+CURL_CHECK_MSG_NOSIGNAL
+
 dnl Checks for library functions.
 dnl AC_PROG_GCC_TRADITIONAL
-AC_TYPE_SIGNAL
+
 dnl AC_FUNC_VPRINTF
 case $host in
  *msdosdjgpp)
@@ -1560,8 +1688,10 @@ AC_CHECK_FUNCS( strtoll \
                ftruncate \
                pipe \
                poll \
+                getprotobyname \
                getrlimit \
-                setrlimit,
+                setrlimit \
+                fork,
 dnl if found
 [],
 dnl if not found, $ac_func is the name we check for
@@ -1651,6 +1781,11 @@ dnl Check if the getnameinfo function is available
 dnl and get the types of five of its arguments.
 CURL_CHECK_FUNC_GETNAMEINFO

+if test "$ipv6" = "yes"; then
+  CURL_CHECK_WORKING_GETADDRINFO
+  CURL_CHECK_NI_WITHSCOPEID
+fi
+
 AC_MSG_CHECKING([if we are Mac OS X (to disable poll)])
 disable_poll=no
 case $host in
@@ -1916,6 +2051,52 @@ AC_HELP_STRING([--disable-cookies],[Disable cookies support]),
       AC_MSG_RESULT(yes)
 )

+dnl ************************************************************
+dnl Enable hiding of internal symbols in library to reduce its size and
+dnl speed dynamic linking of applications.  This currently is only supported
+dnl on gcc >= 4.0 and SunPro C.
+dnl
+AC_MSG_CHECKING([whether to enable hidden symbols in the library])
+AC_ARG_ENABLE(hidden-symbols,
+AC_HELP_STRING([--enable-hidden-symbols],[Hide internal symbols in library])
+AC_HELP_STRING([--disable-hidden-symbols],[Leave all symbols with default visibility in library]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   
+       AC_MSG_CHECKING([whether $CC supports it])
+       if test "$GCC" = yes ; then
+         if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null ; then
+	   AC_MSG_RESULT(yes)
+	   AC_DEFINE(CURL_HIDDEN_SYMBOLS, 1, [to enable hidden symbols])
+	   AC_SUBST(CURL_HIDDEN_SYMBOLS)
+	   AC_DEFINE(CURL_EXTERN_SYMBOL, [__attribute__ ((visibility ("default")))], [to make a symbol visible])
+	   AC_SUBST(CURL_EXTERN_SYMBOL)
+	   CFLAGS="$CFLAGS -fvisibility=hidden"
+         else
+            AC_MSG_RESULT(no)
+          fi
+
+       else
+       	 dnl Test for SunPro cc
+       	 if $CC 2>&1 | grep flags >/dev/null && $CC -flags | grep xldscope= >/dev/null ; then
+           AC_MSG_RESULT(yes)
+	   AC_DEFINE(CURL_HIDDEN_SYMBOLS, 1, [to enable hidden symbols])
+	   AC_SUBST(CURL_HIDDEN_SYMBOLS)
+	   AC_DEFINE(CURL_EXTERN_SYMBOL, [__global], [to make a symbol visible])
+	   AC_SUBST(CURL_EXTERN_SYMBOL)
+	   CFLAGS="$CFLAGS -xldscope=hidden"
+         else
+           AC_MSG_RESULT(no)
+         fi
+       fi
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+dnl ************************************************************
 if test "x$ws2" = "xyes"; then

  dnl If ws2_32 is wanted, make sure it is the _last_ lib in LIBS (makes
@@ -1953,6 +2134,9 @@ AC_CONFIG_FILES([Makefile \
           packages/EPM/curl.list \
           packages/EPM/Makefile \
           packages/vms/Makefile \
+           packages/AIX/Makefile \
+           packages/AIX/RPM/Makefile \
+           packages/AIX/RPM/curl.spec \
           curl-config \
           libcurl.pc
 ])
@@ -1965,6 +2149,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl:
  Install prefix:  ${prefix}
  Compiler:        ${CC}
  SSL support:     ${curl_ssl_msg}
+  SSH support:     ${curl_ssh_msg}
  zlib support:    ${curl_zlib_msg}
  krb4 support:    ${curl_krb4_msg}
  GSSAPI support:  ${curl_gss_msg}
--- a/curl-config.in
+++ b/curl-config.in
@@ -1,10 +1,30 @@
 #! /bin/sh
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 2001 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# $Id$
+###########################################################################
 #
 # The idea to this kind of setup info script was stolen from numerous
 # other packages, such as neon, libxml and gnome.
 #
-# $Id$
-#
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
@@ -19,6 +39,7 @@ Available values for OPTION include:
  --ca        ca bundle install path
  --cc        compiler
  --cflags    pre-processor and compiler flags
+  --checkfor [version] check for (lib)curl of the specified version
  --features  newline separated list of enabled features
  --protocols newline separated list of enabled protocols
  --help      display this help and exit
@@ -122,6 +143,26 @@ while test $# -gt 0; do
 	exit 0
 	;;

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

 D

-  Written by Charles Sanders and James Wavro
-  http://www.atari-soldiers.com/libcurl.html
+  Written by Kenneth Bogert
+  http://curl.haxx.se/libcurl/d/

 Dylan

@@ -142,8 +142,8 @@ Rexx

 Ruby

-  Written by Hirotaka Matsuyuki
-  http://www.d1.dion.ne.jp/~matuyuki/ruby.html
+  Written by Ross Bamford
+  http://curb.rubyforge.org/

 Scheme

@@ -155,6 +155,16 @@ S-Lang
  S-Lang binding written by John E Davis
  http://www.jedsoft.org/slang/modules/curl.html

+Smalltalk
+
+  Smalltalk binding written by Danil Osipchuk
+  http://www.squeaksource.com/CurlPlugin/
+
+SPL
+
+  SPL binding written by Clifford Wolf
+  http://www.clifford.at/spl/
+
 Tcl

  Tclcurl is written by Andr<64>s Garc<72>a
@@ -173,3 +183,8 @@ wxWidgets

  Written by Casey O'Donnell
  http://homepage.mac.com/codonnell/wxcurldav/
+
+XBLite
+
+  Written by David Szafranski
+  http://perso.wanadoo.fr/xblite/libraries.html
--- a/docs/DISTRO-DILEMMA
+++ b/docs/DISTRO-DILEMMA
@@ -1,12 +1,12 @@
-  Date: October 27, 2005
+  Date: May 15, 2006
  Author: Daniel Stenberg <daniel@haxx.se>
  URL: http://curl.haxx.se/legal/distro-dilemma.html

 Condition

 This document is written to describe the situation as it is right
- now. libcurl 7.15.0 is currently the latest version available. Things may (or
- perhaps will) of course change in the future.
+ now. libcurl 7.15.3 is currently the latest version available. Things may of
+ course change in the future.

 This document reflects my view and understanding of these things. Please tell
 me where and how you think I'm wrong, and I'll try to correct my mistakes.
@@ -16,11 +16,10 @@ Background
 The Free Software Foundation has deemed the Original BSD license[1] to be
 "incompatible"[2] with GPL[3]. I'd rather say it is the other way around, but
 the point is the same: if you distribute a binary version of a GPL program,
- it MUST NOT be linked with any Original BSD-licensed parts or
- libraries. Doing so will violate the GPL license. For a long time, very many
- GPL licensed programs have avoided this license mess by adding an
- exception[8] to their license. And many others have just closed their eyes
- for this problem.
+ it MUST NOT be linked with any Original BSD-licensed parts or libraries.
+ Doing so will violate the GPL license. For a long time, very many GPL
+ licensed programs have avoided this license mess by adding an exception[8] to
+ their license. And many others have just closed their eyes for this problem.

 libcurl is MIT-style[4] licensed - how on earth did this dilemma fall onto
 our plates?
@@ -49,25 +48,13 @@ Part of the Operating System
 Debian does however not take this stance and has officially(?) claimed that
 OpenSSL is not a required part of the Debian operating system

-Debian-legal
-
- In August 2004 I figured I should start pulling people's attention to this to
- see if anyone has any bright ideas or if they would dismiss my worries based
- on some elegant writing I had missed somewhere:
-
- My post to debian-legal on August 12 2004:
-
-        http://lists.debian.org/debian-legal/2004/08/msg00279.html
-
- Several people agreed then that this is a known and rather big problem, but
- the following discussion didn't result in much.
-
 GnuTLS

- With the release of libcurl 7.14.0 (May 2005), it can now get built to use
- GnuTLS instead of OpenSSL. GnuTLS is a LGPL[7] licensed library that offers a
- matching set of features as OpenSSL does. Now, you can build and distribute
- an SSL capable libcurl without including any Original BSD licensed code.
+ With the release of libcurl 7.14.0 (May 2005), libcurl can now get built to
+ use GnuTLS instead of OpenSSL. GnuTLS is an LGPL[7] licensed library that
+ offers a matching set of features as OpenSSL does. Now, you can build and
+ distribute an TLS/SSL capable libcurl without including any Original BSD
+ licensed code.

 I believe Debian is the first distro to provide libcurl/GnutTLS packages.

@@ -80,23 +67,20 @@ GnuTLS vs OpenSSL
 and it has not been tested nor used very extensively, while the OpenSSL
 equivalent code has been used and thus matured for more than seven (7) years.

- In August 2005, the debian-devel mailing list discovered the license issue as
- a GPL licensed application wanted SSL capabilities from libcurl and thus was
- forced to use the GnuTLS powered libcurl. For a reason that is unknown to me,
- the application authors didn't want to or was unable to add an exception to
- their GPL license. Alas, the license problem hit the fan again.
-
 GnuTLS
   - LGPL licensened
   - supports SRP
   - lacks SSLv2 support
   - lacks MD2 support (used by at least some CA certs)
+   - lacks the crypto functions libcurl uses for NTLM

 OpenSSL
   - Original BSD licensened
   - lacks SRP
   - supports SSLv2
   - older and more widely used
+   - provides crypto functions libcurl uses for NTLM
+   - libcurl can do non-blocking connects with it in 7.15.4 and later

 The Better License, Original BSD or LGPL?

@@ -124,20 +108,21 @@ More SSL Libraries
 Application Angle of this Problem

 libcurl is built to use one SSL/TLS library. It uses a single fixed name (by
- default), and applications are built/linked to use that single lib. Replacing
- one libcurl instance with another one that uses the other SSL/TLS library
- might break one or more applications (due to ABI differences and/or different
- feature set). You want your application to use the libcurl it was built for.
+ default) on the built/created lib file, and applications are built/linked to
+ use that single lib. Replacing one libcurl instance with another one that
+ uses the other SSL/TLS library might break one or more applications (due to
+ ABI differences and/or different feature set). You want your application to
+ use the libcurl it was built for.

 Project cURL Angle of this Problem

- We distribute libcurl and everyone may build libcurl with either library. At
+ We distribute libcurl and everyone may build libcurl with either library at
 their choice. This problem is not directly a problem of ours. It merely
 affects users - GPL application authors only - of our lib as it comes
 included and delivered on some distros.

 libcurl has different ABI when built with different SSL/TLS libraries due to
- two reasons:
+ these reasons:

 1. No one has worked on fixing this. The mutex/lock callbacks should be set
    with a generic libcurl function that should use the proper underlying
@@ -146,25 +131,25 @@ Project cURL Angle of this Problem
 2. The CURLOPT_SSL_CTX_FUNCTION option is not possible to "emulate" on GnuTLS
    but simply requires OpenSSL.

+ 3. There might be some other subtle differences just because nobody has yet
+    tried to make a fixed ABI like this.
+
 Distro Angle of this Problem

- A distro can provide separate libcurls built with different SSL/TLS libraries
- to work around this, but at least Debian seems to be very hostile against
- such an approach, probably since it makes things like devel packages for the
- different libs collide since they would provide the same include files and
- man pages etc.
+ To my knowledge there is only one distro that ships libcurl built with either
+ one of the SSL libs supported.
+
+ Debian Linux is now (since mid September 2005) providing two different
+ libcurl packages, one for libcurl built with OpenSSL and one built with
+ GnuTLS. They use different .so names and can this both be installed in a
+ single system simultaneously. This has been said to be a transitional system
+ not desired to keep in the long run.

 Fixing the Only Problem

 The only problem is thus for distributions that want to offer libcurl
 versions built with more than one SSL/TLS library.

- Debian is now (since mid September 2005) providing two different devel
- packages, one for libcurl built with OpenSSL and one built with GnuTLS. They
- use different .so names and can this both be installed in a single system
- simultaneously. This has previously been said as a transitional system not
- desired to keep in the long run.
-
 Since multiple libcurl binaries using different names are ruled out, we need
 to come up with a way to have one single libcurl that someone uses different
 underlying libraries. The best(?) approach currently suggested involves this:
@@ -194,9 +179,9 @@ Fixing the Only Problem

 When Will This Happen

- Note again that this is not a problem in curl, it doesn't solve any actual
- technical problems in our project. Don't hold your breath for this to happen
- very soon (if at all) unless you step forward and contribute.
+ This is not a problem in curl, it doesn't solve any actual technical problems
+ in our project. Don't hold your breath for this to happen very soon (if at
+ all) unless you step forward and contribute.

 The suggestion that is outlined above is still only a suggestion. Feel free
 to bring a better idea!
@@ -206,7 +191,7 @@ When Will This Happen
 code like today (without the use of lib2), should you decide to ignore the
 problems outlined in this document.

- Update: Work on this has been initiated by Richard Atterer:
+ Work on this was suggested by Richard Atterer:

        http://curl.haxx.se/mail/lib-2005-09/0066.html

--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -87,12 +87,11 @@ 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
- - implicit "AUTH TSL" and "AUTH SSL" usage to "upgrade" plain ftp://
+ - implicit ftps:// support that use SSL on both connections
+ - explicit "AUTH TSL" and "AUTH SSL" usage to "upgrade" plain ftp://
   connection to use SSL for both or one of the connections

 TFTP
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -16,7 +16,6 @@ Installing Binary Packages

 UNIX
 ====
-
   A normal unix installation is made in three or four steps (after you've
   unpacked the source archive):

@@ -52,12 +51,12 @@ UNIX
   path for your compiler/linker, you don't need to do anything special. If
   you have OpenSSL installed in /usr/local/ssl, you can run configure like:

-	./configure --with-ssl
+        ./configure --with-ssl

   If you have OpenSSL installed somewhere else (for example, /opt/OpenSSL,)
   you can run configure like this:

-	./configure --with-ssl=/opt/OpenSSL
+        ./configure --with-ssl=/opt/OpenSSL

   If you insist on forcing a build without SSL support, even though you may
   have OpenSSL installed in your system, you can run configure like this:
@@ -129,6 +128,19 @@ UNIX
     If you're a curl developer and use gcc, you might want to enable more
     debug options with the --enable-debug option.

+     curl can be built to use a whole range of libraries to provide various
+     useful services, and configure will try to auto-detect a decent
+     default. But if you want to alter it, you can select how to deal with
+     each individual library.
+
+     To build with GnuTLS support instead of OpenSSL for SSL/TLS, note that
+     you need to use both --without-ssl and --with-gnutls.
+
+     To build with yassl support instead of OpenSSL or GunTLS, you must build
+     yassl with its OpenSSL emulation enabled and point to that directory root
+     with configure --with-ssl.
+
+
 Win32
 =====

@@ -136,12 +148,21 @@ Win32
   -------

   Run the 'mingw32.bat' file to get the proper environment variables set,
-   then run 'make mingw32' in the root dir. Use  'make mingw32-ssl' to build
+   then run 'make mingw32' in the root dir. Use 'make mingw32-ssl' to build
   curl SSL enabled.

   If you have any problems linking libraries or finding header files, be sure
   to verify that the provided "Makefile.m32" files use the proper paths, and
-   adjust as necessary.
+   adjust as necessary. It is also possible to override these paths with 
+   environment variables, for example:
+
+     set ZLIB_PATH=c:\zlib-1.2.3
+     set OPENSSL_PATH=c:\openssl-0.9.8d
+     set LIBSSH2_PATH=c:\libssh2-0.15
+
+   ATTENTION: if you want to build with libssh2 support you have to use latest
+   sources fetched from CVS - the current 0.14 release will NOT work!
+   Use 'make mingw32-ssh2-ssl' to build curl with SSH2 and SSL enabled.

   Cygwin
   ------
@@ -172,7 +193,7 @@ Win32
   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
+     set ZLIB_PATH=c:\zlib-1.2.3

   Then run 'nmake vc-zlib' in curl's root directory.

@@ -186,7 +207,7 @@ Win32
   Before running nmake define the OPENSSL_PATH environment variable with
   the root/base directory of OpenSSL, for example:

-     set OPENSSL_PATH=c:\openssl-0.9.7d
+     set OPENSSL_PATH=c:\openssl-0.9.8d

   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
@@ -280,7 +301,6 @@ Win32

 IBM OS/2
 ========
-
   Building under OS/2 is not much different from building under unix.
   You need:

@@ -308,6 +328,7 @@ IBM OS/2
   If you're getting huge binaries, probably your makefiles have the -g in
   CFLAGS.

+
 VMS
 ===
   (The VMS section is in whole contributed by the friendly Nico Baggus)
@@ -378,6 +399,7 @@ VMS
   13-jul-2001
   N. Baggus

+
 QNX
 ===
   (This section was graciously brought to us by David Bentham)
@@ -429,17 +451,16 @@ AmigaOS

 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/
+     http://www.gknw.net/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/
+     http://www.gknw.net/mirror/zlib/
   - optional OpenSSL sources (version 0.9.8 or later which builds with BSD);

   Set a search path to your compiler, linker and tools; on Linux make
@@ -453,14 +474,101 @@ NetWare
   with 'OSTYPE=linux-rh9-gnu' and the detection in the Makefile worked...
   Any help in testing appreciated!
   Builds automatically created 8 times a day from current CVS are here:
-   http://www.gknw.com/mirror/curl/autobuilds/
+   http://www.gknw.net/mirror/curl/autobuilds/
   the status of these builds can be viewed at the autobuild table:
   http://curl.haxx.se/auto/


+eCos
+====
+   curl does not use the eCos build system, so you must first build eCos
+   separately, then link curl to the resulting eCos library.  Here's a sample
+   configure line to do so on an x86 Linux box targeting x86:
+
+   GCCLIB=`gcc -print-libgcc-file-name` && \
+   CFLAGS="-D__ECOS=1 -nostdinc -I$ECOS_INSTALL/include \
+    -I`dirname $GCCLIB`/include" \
+   LDFLAGS="-nostdlib -Wl,--gc-sections -Wl,-static \
+    -L$ECOS_INSTALL/lib -Ttarget.ld -ltarget" \
+   ./configure --host=i386 --disable-shared \
+    --without-ssl --without-zlib --disable-manual --disable-ldap
+
+   In most cases, eCos users will be using libcurl from within a custom
+   embedded application.  Using the standard 'curl' executable from
+   within eCos means facing the limitation of the standard eCos C
+   startup code which does not allow passing arguments in main().  To
+   run 'curl' from eCos and have it do something useful, you will need
+   to either modify the eCos startup code to pass in some arguments, or
+   modify the curl application itself to retrieve its arguments from
+   some location set by the bootloader or hard-code them.
+
+   Something like the following patch could be used to hard-code some
+   arguments.  The MTAB_ENTRY line mounts a RAM disk as the root filesystem
+   (without mounting some kind of filesystem, eCos errors out all file
+   operations which curl does not take to well).  The next section synthesizes
+   some command-line arguments for curl to use, in this case to direct curl
+   to read further arguments from a file.  It then creates that file on the
+   RAM disk and places within it a URL to download: a file: URL that
+   just happens to point to the configuration file itself.  The results
+   of running curl in this way is the contents of the configuration file
+   printed to the console.
+
+--- src/main.c	19 Jul 2006 19:09:56 -0000	1.363
+++ src/main.c	24 Jul 2006 21:37:23 -0000
+@@ -4286,11 +4286,31 @@
+ }
+ 
+ 
+#ifdef __ECOS
+#include <cyg/fileio/fileio.h>
+MTAB_ENTRY( testfs_mte1,
+                   "/",
+                   "ramfs",
+                   "",
+                   0);
+#endif
+ 
+ int main(int argc, char *argv[])
+ {
+   int res;
+   struct Configurable config;
+#ifdef __ECOS
+  char *args[] = {"ecos-curl", "-K", "curlconf.txt"};
+  FILE *f;
+  argc = sizeof(args)/sizeof(args[0]);
+  argv = args;
+
+  f = fopen("curlconf.txt", "w");
+  if (f) {
+    fprintf(f, "--url file:curlconf.txt");
+    fclose(f);
+  }
+#endif
+   memset(&config, 0, sizeof(struct Configurable));
+ 
+   config.errors = stderr; /* default errors to stderr */
+
+
+Minix
+=====
+   curl can be compiled on Minix 3 using gcc (ACK has a few problems due
+   to mismatched headers and libraries as of ver. 3.1.2).  The gcc and bash
+   packages must be installed first.  The default heap size allocated to
+   bash is inadequate for running configure and will result in out of memory
+   errors.  Increase it with the command:
+
+     chmem =2048000 /usr/local/bin/bash
+
+   Make sure gcc and bash are in the PATH then configure curl with a
+   command like this:
+
+     ./configure GREP=/usr/bin/grep AR=/usr/gnu/bin/gar --disable-ldap
+
+   Then simply run 'make'.
+
+
 CROSS COMPILE
 =============
-
   (This section was graciously brought to us by Jim Duey, with additions by
   Dan Fandrich)

@@ -506,13 +614,17 @@ CROSS COMPILE

       ./configure --host=ARCH-OS

+
+REDUCING SIZE
+=============
   There are a number of configure options that can be used to reduce the
   size of libcurl for embedded applications where binary size is an
-   important factor.  First, be sure to set the CFLAGS environment variable
-   when configuring with any compiler optimization flags to reduce the
-   size of the binary.  For gcc, this would mean at minimum:
+   important factor.  First, be sure to set the CFLAGS variable when
+   configuring with any relevant compiler optimization flags to reduce the
+   size of the binary.  For gcc, this would mean at minimum the -Os option
+   and probably the -march=X option as well, e.g.:

-      env CFLAGS='-Os' ./configure ...
+      ./configure CFLAGS='-Os' ...

   Be sure to specify as many --disable- and --without- flags on the configure
   command-line as you can to disable all the libcurl features that you
@@ -526,10 +638,24 @@ CROSS COMPILE
     --disable-crypto-auth (disables HTTP cryptographic authentication)
     --disable-ipv6 (disables support for IPv6)
     --disable-verbose (eliminates debugging strings and error code strings)
+     --enable-hidden-symbols (eliminates unneeded symbols in the shared library)
     --without-libidn (disables support for the libidn DNS library)
     --without-ssl (disables support for SSL/TLS)
     --without-zlib (disables support for on-the-fly decompression)

+   The GNU linker has a number of options to reduce the size of the libcurl
+   dynamic libraries on some platforms even further. Specify them by giving
+   the options -Wl,-Bsymbolic and -Wl,-s on the gcc command-line.  
+   Be sure also to strip debugging symbols from your binaries after
+   compiling using 'strip' (or the appropriate variant if cross-compiling).
+   If space is really tight, you may be able to remove some unneeded
+   sections of the shared library using the -R option to objcopy (e.g. the
+   .comment section).
+
+   Using these techniques it is possible to create an HTTP-only shared
+   libcurl library for i386 Linux platforms that is less than 90 KB in
+   size (as of version 7.15.4).
+
   You may find that statically linking libcurl to your application will
   result in a lower total size.

@@ -559,6 +685,7 @@ PORTS
        - PowerPC Linux
        - PowerPC Mac OS 9
        - PowerPC Mac OS X
+        - SuperH4 Linux 2.6.X
        - SINIX-Z v5
        - Sparc Linux
        - Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7, 8, 9, 10
@@ -567,12 +694,15 @@ PORTS
        - StrongARM/ARM7/ARM9 Linux 2.4, 2.6
        - StrongARM NetBSD 1.4.1
        - Ultrix 4.3a
+        - UNICOS 9.0
        - i386 BeOS
        - i386 DOS
+        - i386 eCos 1.3.1
        - i386 Esix 4.1
        - i386 FreeBSD
        - i386 HURD
        - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4, 2.6
+        - i386 MINIX 3.1.2
        - i386 NetBSD
        - i386 Novell NetWare
        - i386 OS/2
@@ -597,3 +727,6 @@ OpenSSL   http://www.openssl.org
 MingW     http://www.mingw.org
 OpenLDAP  http://www.openldap.org
 Zlib      http://www.gzip.org/zlib/
+libssh2   http://www.libssh2.org
+
+
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -3,9 +3,38 @@ 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!

-33. Doing FTP upload and specifying a URL that ends with a slash will cause
-  a filed named "(nil)" get created. The proper fix should most likely be to
-  reject the upload early since there's no target file name specified.
+41. Jeff Pohlmeyer's curl_multi_socket crashing case. Recipe and instructions
+  here: http://curl.haxx.se/mail/lib-2007-01/0022.html
+
+40. HTTP Pipelining, NULL content
+  http://curl.haxx.se/bug/view.cgi?id=1631566
+
+39. Steffen Rumler's Race Condition in Curl_proxyCONNECT:
+  http://curl.haxx.se/mail/lib-2007-01/0045.html
+
+38. Kumar Swamy Bhatt's problem in ftp/ssl "LIST" operation:
+  http://curl.haxx.se/mail/lib-2007-01/0103.html
+
+37. Having more than one connection to the same host when doing NTLM
+  authentication (with performs multiple "passes" and authenticates a
+  connection rather than a HTTP request), and particularly when using the
+  multi interface, there's a risk that libcurl will re-use a wrong connection
+  when doing the different passes in the NTLM negotiation and thus fail to
+  negotiate (in seemingly mysterious ways).
+
+35. Both SOCKS5 and SOCKS4 proxy connections are done blocking, which is very
+  bad when used with the multi interface.
+
+34. The SOCKS4 connection codes don't properly acknowledge (connect) timeouts.
+  Also see #12. According to bug #1556528, even the SOCKS5 connect code does
+  not do it right: http://curl.haxx.se/bug/view.cgi?id=1556528,
+
+33. Doing multi-pass HTTP authentication on a non-default port does not work.
+  This happens because the multi-pass code abuses the redirect following code
+  for doing multiple requests, and when we following redirects to an absolute
+  URL we must use the newly specified port and not the one specified in the
+  original URL. A proper fix to this would need to separate the negotiation
+  "redirect" from an actual redirect.

 32. (At least on Windows) If libcurl is built with c-ares and there's no DNS
  server configured in the system, the ares_init() call fails and thus
@@ -30,24 +59,10 @@ may have been fixed since this was written!

   See http://curl.haxx.se/bug/view.cgi?id=1371118

-28. The TFTP code is not portable and will fail on some architectures.
-
 26. NTLM authentication using SSPI (on Windows) when (lib)curl is running in
  "system context" will make it use wrong(?) user name - at least when compared
  to what winhttp does. See http://curl.haxx.se/bug/view.cgi?id=1281867

-25. When doing a CONNECT request with curl it doesn't properly handle if the
-  proxy closes the connection within the authentication "negotiation phase".
-  Like if you do HTTPS or similar over a proxy and you use perhaps
-  --proxy-anyauth. There's work in progress on this problem, and a recent
-  patch was posted here: http://curl.haxx.se/mail/lib-2005-08/0074.html
-
-24. Harshal Pradhan's Use-after-free with libcurl+ares. This probably occurs
-  because there is a pending ares callback that gets called after the
-  connection struct has been freed in libcurl:
-        http://curl.haxx.se/mail/lib-2005-08/0022.html
-  Fixing this properly most likely requires a new c-ares function.
-
 23. We don't support SOCKS for IPv6. We don't support FTPS over a SOCKS proxy.
  We don't have any test cases for SOCKS proxy. We probably have even more
  bugs and lack of features when a SOCKS proxy is used. And there seem to be a
@@ -69,8 +84,7 @@ may have been fixed since this was written!
     specification).  The receiver will convert the data from the standard
     form to his own internal form.

-19. FTP 3rd party transfers with the multi interface doesn't work. Test:
-  define CURL_MULTIEASY, rebuild curl, run test case 230 - 232.
+   Since 7.15.4 at least line endings are converted.

 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
@@ -93,7 +107,7 @@ may have been fixed since this was written!

 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.
+  phase).

 11. Using configure --disable-[protocol] may cause 'make test' to fail for
  tests using the disabled protocol(s).
@@ -104,10 +118,6 @@ may have been fixed since this was written!
  http://curl.haxx.se/bug/view.cgi?id=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! http://curl.haxx.se/bug/view.cgi?id=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]'.
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -32,7 +32,8 @@ OpenSSL http://www.openssl.org/source/license.html
        are not allowed to ship binaries that link with OpenSSL that includes
        GPL code (unless that specific GPL code includes an exception for
        OpenSSL - a habit that is growing more and more common). If OpenSSL's
-        licensing is a problem for you, consider using GnuTLS instead.
+        licensing is a problem for you, consider using GnuTLS or yassl
+        instead.

 GnuTLS  http://www.gnutls.org/

@@ -41,6 +42,11 @@ GnuTLS  http://www.gnutls.org/
        GnuTLS itself depends on and uses other libs (libgcrypt and
        libgpg-error) and they too are LGPL- or GPL-licensed.

+yassl   http://www.yassl.com/
+
+        (May be used for SSL/TLS support) Uses the GPL[1] license. If this is
+        a problem for you, consider using OpenSSL or GnuTLS instead.
+
 c-ares  http://daniel.haxx.se/projects/c-ares/license.html

        (Used for asynchronous name resolves) Uses an MIT license that is very
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -31,6 +31,15 @@ SIMPLE USAGE

        curl ftp://cool.haxx.se/ http://www.weirdserver.com:8000/

+  Get a file off an FTPS server:
+
+        curl ftps://files.are.secure.com/secrets.txt
+
+  or use the more appropriate FTPS way to get the same file:
+
+        curl --ftp-ssl ftp://files.are.secure.com/secrets.txt
+
+
 DOWNLOAD TO A FILE

  Get a web page and store in a local file:
@@ -64,6 +73,10 @@ USING PASSWORDS
   It is just like for FTP, but you may also want to specify and use
   SSL-specific options for certificates etc.

+   Note that using FTPS:// as prefix is the "implicit" way as described in the
+   standards while the recommended "explicit" way is done by using FTP:// and
+   the --ftp-ssl option.
+
 HTTP

   The HTTP URL doesn't support user and password in the URL string. Curl
@@ -105,6 +118,8 @@ PROXY

        curl -U user:passwd -x my-proxy:888 http://www.get.this/

+ curl also supports SOCKS4 and SOCKS5 proxies with --socks4 and --socks5.
+
 See also the environment variables Curl support that offer further proxy
 control.

@@ -726,7 +741,7 @@ LDAP
  Working with LDAP URLs":
  http://developer.netscape.com/docs/manuals/dirsdk/csdk30/url.htm

-  RFC 2255, "The LDAP URL Format" http://www.rfc-editor.org/rfc/rfc2255.txt
+  RFC 2255, "The LDAP URL Format" http://curl.haxx.se/rfc/rfc2255.txt

  To show you an example, this is now I can get all people from my local LDAP
  server that has a certain sub-domain in their email address:
@@ -846,6 +861,22 @@ PERSISTENT CONNECTIONS
  transfers faster. If you use a http proxy for file transfers, practically
  all transfers will be persistent.

+MULTIPLE TRANSFERS WITH A SINGLE COMMAND LINE
+
+  As is mentioned above, you can download multiple files with one command line
+  by simply adding more URLs. If you want those to get saved to a local file
+  instead of just printed to stdout, you need to add one save option for each
+  URL you specify. Note that this also goes for the -O option.
+
+  For example: get two files and use -O for the first and a custom file
+  name for the second:
+
+    curl -O http://url.com/file.txt ftp://ftp.com/moo.exe -o moo.jpg
+
+  You can also upload multiple files in a similar fashion:
+
+    curl -T local1 ftp://ftp.com/moo.exe -T local2 ftp://ftp.com/moo2.txt
+
 MAILING LISTS

  For your convenience, we have several open mailing lists to discuss curl,
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -8,20 +8,26 @@ Adrian Schuur
 Alan Pinstein
 Albert Chin-A-Young
 Albert Choy
+Ale Vesely
 Aleksandar Milivojevic
 Alex Neblett
 Alex Suykov
 Alex aka WindEagle
 Alexander Kourakos
 Alexander Krasnostavsky
+Alexander Lazic
 Alexander Zhuravlev
+Alexey Simak
 Alexis Carvalho
 Amol Pattekar
 Andi Jahja
 Andreas Damm
+Andreas Ntaflos
 Andreas Olsson
 Andreas Rieke
 Andres Garcia
+Andrew Benham
+Andrew Biggs
 Andrew Bushnell
 Andrew Francis
 Andrew Fuller
@@ -32,22 +38,29 @@ Angus Mackay
 Antoine Calando
 Anton Kalmykov
 Arkadiusz Miskiewicz
+Armel Asselin
+Arve Knudsen
+Ates Goral
 Augustus Saunders
 Avery Fay
 Ben Greear
 Ben Madsen
 Benjamin Gerard
+Bernard Leak
 Bertrand Demiddelaer
 Bjorn Reese
 Bj<EFBFBD>rn Stenberg
 Bob Schader
+Bogdan Nicula
 Brad Burdick
 Bradford Bruce
+Brendan Jurd
 Brent Beardsley
 Brian Akins
+Brian Dessent
 Brian R Duffy
 Bruce Mitchener
-Bryan Henderson 
+Bryan Henderson
 Bryan Kemp
 Caolan McNamara
 Casey O'Donnell
@@ -61,6 +74,7 @@ Christian Robottom Reis
 Christophe Demory
 Christophe Legry
 Christopher R. Palmer
+Ciprian Badescu
 Clarence Gardner
 Clifford Wolf
 Cody Jones
@@ -75,6 +89,7 @@ Damien Adant
 Dan Becker
 Dan C
 Dan Fandrich
+Dan Nelson
 Dan Torop
 Dan Zitter
 Daniel Stenberg
@@ -94,6 +109,7 @@ David James
 David Kimdon
 David Lang
 David LeBlanc
+David McCreedy
 David Odin
 David Phillips
 David Shaw
@@ -107,7 +123,9 @@ Dimitris Sarris
 Dinar
 Dirk Eddelbuettel
 Dirk Manske
+Dmitriy Sergeyev
 Dmitry Bartsevich
+Dmitry Rechkin
 Dolbneff A.V
 Domenico Andreoli
 Dominick Meglio
@@ -115,6 +133,8 @@ Doug Kaufman
 Doug Porter
 Douglas E. Wegscheid
 Douglas R. Horner
+Dov Murik
+Duane Cathey
 Dustin Boswell
 Dylan Ellicott
 Dylan Salisbury
@@ -184,6 +204,8 @@ Ian Wilkes
 Ignacio Vazquez-Abrams
 Igor Polyakov
 Ilguiz Latypov
+Ilja van Sprundel
+Ingmar Runge
 Ingo Ralf Blum
 Ingo Wilken
 Jacky Lam
@@ -193,13 +215,17 @@ James Clancy
 James Cone
 James Gallagher
 James Griffiths
+James Housley
 James MacMillan
 Jamie Lokier
 Jamie Newton
 Jamie Wilkinson
 Jan Kunder
+Jared Lundell
+Jari Sundell
 Jason S. Priebe
 Jaz Fresh
+Jean Jacques Drouin
 Jean-Claude Chauve
 Jean-Louis Lemaire
 Jean-Marc Ranger
@@ -241,11 +267,14 @@ J
 Kai Sommerfeld
 Kai-Uwe Rommel
 Kang-Jin Lee
+Karl Moerder
 Karol Pietrzak
+Katie Wang
 Keith MacDonald
 Keith McGuigan
 Ken Hirsch
 Ken Rastatter
+Kent Boortz
 Kevin Fisk
 Kevin Lussier
 Kevin Roth
@@ -278,6 +307,7 @@ Lucas Adamski
 Lukasz Czekierda
 Luke Call
 Luong Dinh Dung
+Maciej Karpiuk
 Maciej W. Rozycki
 Marc Boucher
 Marcelo Juchem 
@@ -286,17 +316,22 @@ Marco G. Salvagno
 Marcus Webster
 Mario Schroeder
 Mark Butler
+Mark Eichin
+Mark Lentczner
+Markus Koetter
 Markus Moeller
 Markus Oberhumer
 Martijn Koster
 Martin C. Martin
 Martin Hedenfalk
+Martin Skinner
 Marty Kuhrt
 Maruko
 Massimiliano Ziccardi
 Mathias Axelsson
 Mats Lidell
 Matt Veenstra
+Matt Witherspoon
 Matthew Blain
 Matthew Clarke
 Maurice Barnum
@@ -304,18 +339,25 @@ Mekonikum
 Mettgut Jamalla
 Michael Benedict
 Michael Curtis
+Michael Jahn
+Michael Jerris
 Michael Mealling
 Michael Wallner
 Michal Bonino
+Michal Marek
+Michele Bini
 Mihai Ionescu
+Mikael Sennerholm
 Mike Bytnar
 Mike Dobbs
+Mike Protts
 Miklos Nemeth
 Mitz Wark
 Mohamed Lrhazi
 Mohun Biswas
 Moonesamy
 Nathan O'Sullivan
+Nathanael Nerode
 Naveen Noel
 Neil Dunbar
 Neil Spring
@@ -328,10 +370,13 @@ Nicolas Croiset
 Nicolas Fran<61>ois
 Niels van Tongeren
 Nikita Schmidt
+Nir Soffer
 Nis Jorgensen
 Nodak Sodak
 Norbert Novotny
 Ofer
+Olaf Stueben
+Olaf St<53>ben
 Oren Tirosh
 P R Schaffner
 Patrick Bihan-Faou
@@ -340,6 +385,7 @@ Paul Harrington
 Paul Marquis
 Paul Moore
 Paul Nolan
+Paul Querna
 Pavel Cenek
 Pavel Orehov
 Pawel A. Gajda
@@ -347,7 +393,10 @@ Pedro Neves
 Pete Su
 Peter Bray
 Peter Forret
+Peter Heuchert
 Peter Pentchev
+Peter Silva
+Peter Su
 Peter Sylvester
 Peter Todd
 Peter Verhas
@@ -357,6 +406,7 @@ Phil Karn
 Philip Gladstone
 Philippe Hameau
 Philippe Raoult
+Philippe Vaucher
 Pierre
 Puneet Pawaia
 Quagmire
@@ -365,6 +415,7 @@ Ralph Beckmann
 Ralph Mitchell
 Ramana Mokkapati
 Randy McMurchy
+Ravi Pratap
 Reinout van Schouwen
 Renaud Chaillat
 Renaud Duhaut
@@ -383,10 +434,13 @@ Rick Jones
 Rick Richardson
 Rob Stanzel
 Robert D. Young
+Robert Foreman
 Robert Olson
 Robert Weaver
 Robin Kay
+Robson Braga Araujo
 Rodney Simmons
+Roland Blom
 Roland Krikava
 Roland Zimmermann
 Roman Koifman
@@ -407,8 +461,10 @@ Scott Davis
 Sebastien Willemijns
 Sergio Ballestrero
 Seshubabu Pasam
+Sh Diao
 Shard
 Shawn Poulson
+Shmulik Regev
 Siddhartha Prakash Jain
 Simon Dick
 Simon Josefsson
@@ -416,6 +472,7 @@ Simon Liu
 Spiridonoff A.V
 Stadler Stephan
 Stefan Esser
+Stefan Krause
 Stefan Ulrich
 Stephan Bergmann
 Stephen Kick
@@ -433,6 +490,7 @@ S
 T. Bharath
 T. Yamada
 Temprimus
+Thomas Klausner
 Thomas Schwinge
 Thomas Tonino
 Tim Baker
@@ -441,6 +499,7 @@ Tim Costello
 Tim Sneddon
 Toby Peterson
 Todd Kulesza
+Todd Vierling
 Tom Benoist
 Tom Lee
 Tom Mattison
@@ -451,6 +510,7 @@ Tomas Szepe
 Tomasz Lacki
 Tommy Tam
 Ton Voon
+Toon Verwaest
 Tor Arntsen
 Torsten Foertsch
 Toshiyuki Maezawa
@@ -458,7 +518,10 @@ Traian Nicolescu
 Troels Walsted Hansen
 Troy Engel
 Tupone Alfredo
+Ulf H<>rnhammar
 Ulrich Zadow
+Venkat Akella
+Victor Snezhko
 Vilmos Nebehaj
 Vincent Bronner
 Vincent Penquerc'h
@@ -472,8 +535,10 @@ Wesley Laxton
 Wez Furlong
 Wilfredo Sanchez
 Wojciech Zwiefka
+Xavier Bouchoux
 Yang Tse
 Yarram Sunil
+Yves Lejeune
 Zvi Har'El 
 nk
 swalkaus at yahoo.com
--- a/docs/TODO
+++ b/docs/TODO
@@ -14,12 +14,6 @@ TODO

 LIBCURL

- * Introduce an interface to libcurl that allows applications to easier get to
-   know what cookies that are received. CURLINFO_COOKIELIST to get a
-   curl_slist with cookies (netscape/mozilla cookie file formatted), and
-   CURLOPT_COOKIELIST to set a list of cookies (using the same format).
-   http://curl.haxx.se/mail/lib-2004-12/0195.html
-
 * Introduce another callback interface for upload/download that makes one
   less copy of data and thus a faster operation.
   [http://curl.haxx.se/dev/no_copy_callbacks.txt]
@@ -49,10 +43,6 @@ TODO
   powered libcurl the default build (which of course would require that we'd
   bundle the c-ares source code in the libcurl source code releases).

- * Support CONNECT 407 responses that kill the connection and expect the
-   client to reconnect to complete the authentication. Currently libcurl
-   assumes that a proxy connection will be kept alive.
-
 * Make the curl/*.h headers include the proper system includes based on what
   was present at the time when configure was run. Currently, the sys/select.h
   header is for example included by curl/multi.h only on specific platforms
@@ -64,13 +54,8 @@ TODO

 LIBCURL - multi interface

- * Add a curl_multi_fdset() alternative. this allows apps to avoid the
-   FD_SETSIZE problem with select().
-
- * Add curl_multi_timeout() to make libcurl's ares-functionality better.
-
 * Make sure we don't ever loop because of non-blocking sockets return
-   EWOULDBLOCK or similar. This FTP command sending, the SSL connection etc.
+   EWOULDBLOCK or similar. The GnuTLS connection etc.

 * Make transfers treated more carefully. We need a way to tell libcurl we
   have data to write, as the current system expects us to upload data each
@@ -80,10 +65,6 @@ TODO
   ready to accept read data. Today libcurl feeds the data as soon as it is
   available for reading, no matter what.

- * Add curl_multi_socket() and family 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.
-
 * 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
@@ -130,10 +111,6 @@ TODO

 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.
@@ -150,6 +127,10 @@ TODO

 SSL

+ * Provide a libcurl API for setting mutex callbacks in the underlying SSL
+   library, so that the same application code can use mutex-locking
+   independently of OpenSSL or GnutTLS being used.
+
 * Anton Fedorov's "dumpcert" patch:
   http://curl.haxx.se/mail/lib-2004-03/0088.html

@@ -201,6 +182,11 @@ TODO
 * Work out a common method with Peter Sylvester's OpenSSL-patch for SRP
   on the TLS to provide name and password

+ * Fix the connection phase to be non-blocking when multi interface is used
+
+ * Add a way to check if the connection seems to be alive, to correspond to
+   the SSL_peak() way we use with OpenSSL.
+
 LDAP

 * Look over the implementation. The looping will have to "go away" from the
@@ -211,9 +197,6 @@ TODO

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

@@ -282,6 +265,10 @@ TODO

 TEST SUITE

+ * Make our own version of stunnel for simple port forwarding to enable HTTPS
+   and FTP-SSL tests without the stunnel dependency, and it could allow us to
+   provide test tools built with either OpenSSL or GnuTLS
+
 * Make the test servers able to serve multiple running test suites. Like if
   two users run 'make test' at once.

--- a/docs/curl-config.1
+++ b/docs/curl-config.1
@@ -5,7 +5,7 @@
 .\" *                            | (__| |_| |  _ <| |___
 .\" *                             \___|\___/|_| \_\_____|
 .\" *
-.\" * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
 .\" *
 .\" * This software is licensed as described in the file COPYING, which
 .\" * you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH curl-config 1 "25 Jan 2004" "Curl 7.13.0" "curl-config manual"
+.TH curl-config 1 "25 Jan 2004" "Curl 7.15.4" "curl-config manual"
 .SH NAME
 curl-config \- Get information about a libcurl installation
 .SH SYNOPSIS
@@ -37,6 +37,11 @@ Displays the compiler used to build libcurl.
 .IP "--cflags"
 Set of compiler options (CFLAGS) to use when compiling files that use
 libcurl. Currently that is only thw include path to the curl include files.
+.IP "--checkfor [version]"
+Specify the oldest possible libcurl version string you want, and this 
+script will return 0 if the current installation is new enough or it 
+returns 1 and outputs a text saying that the current version is not new 
+enough. (Added in 7.15.4)
 .IP "--feature"
 Lists what particular main features the installed libcurl was built with. At
 the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -5,7 +5,7 @@
 .\" *                            | (__| |_| |  _ <| |___
 .\" *                             \___|\___/|_| \_\_____|
 .\" *
-.\" * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
 .\" *
 .\" * This software is licensed as described in the file COPYING, which
 .\" * you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH curl 1 "21 Feb 2006" "Curl 7.15.2" "Curl Manual"
+.TH curl 1 "3 Nov 2006" "Curl 7.16.1" "Curl Manual"
 .SH NAME
 curl \- transfer a URL
 .SH SYNOPSIS
@@ -30,20 +30,20 @@ curl \- transfer a URL
 .SH DESCRIPTION
 .B curl
 is a tool to transfer data from or to a server, using one of the supported
-protocols (HTTP, HTTPS, FTP, FTPS, TFTP, DICT, TELNET, LDAP or FILE).
-The command is designed to work without user interaction.
+protocols (HTTP, HTTPS, FTP, FTPS, SCP, SFTP, TFTP, DICT, TELNET, LDAP or
+FILE).  The command is designed to work without user interaction.

 curl offers a busload of useful tricks like proxy support, user
-authentication, ftp upload, HTTP post, SSL (https:) connections, cookies, file
-transfer resume and more. As you will see below, the amount of features will
-make your head spin!
+authentication, ftp upload, HTTP post, SSL connections, cookies, file transfer
+resume and more. As you will see below, the amount of features will make your
+head spin!

 curl is powered by libcurl for all transfer-related features. See
 .BR libcurl (3)
 for details.
 .SH URL
 The URL syntax is protocol dependent. You'll find a detailed description in
-RFC 2396.
+RFC 3986.

 You can specify multiple URLs or parts of URLs by writing part sets within
 braces as in:
@@ -80,6 +80,24 @@ getting many files from the same server will not do multiple connects /
 handshakes. This improves speed. Of course this is only done on files
 specified on a single command line and cannot be used between separate curl
 invokes.
+.SH "PROGRESS METER"
+curl normally displays a progress meter during operations, indicating amount
+of transfered data, transfer speeds and estimated time left etc.
+
+However, since curl displays data to the terminal by default, if you invoke
+curl to do an operation and it is about to write data to the terminal, it
+\fIdisables\fP the progress meter as otherwise it would mess up the output
+mixing progress meter and response data.
+
+If you want a progress meter for HTTP POST or PUT requests, you need to
+redirect the response output to a file, using shell redirect (>), -o [file] or
+similar.
+
+It is not the same case for FTP upload as that operation is not spitting out
+any response data to the terminal.
+
+If you prefer a progress "bar" instead of the regular meter, \fI-#\fP is your
+friend.
 .SH OPTIONS
 .IP "-a/--append"
 (FTP) When used in an FTP upload, this will tell curl to append to the target
@@ -294,25 +312,25 @@ run curl.

 If this option is used several times, each occurrence will toggle this on/off.
 .IP "--egd-file <file>"
-(HTTPS) Specify the path name to the Entropy Gathering Daemon socket. The
-socket is used to seed the random engine for SSL connections. See also the
+(SSL) Specify the path name to the Entropy Gathering Daemon socket. The socket
+is used to seed the random engine for SSL connections. See also the
 \fI--random-file\fP option.
 .IP "-E/--cert <certificate[:password]>"
-(HTTPS)
-Tells curl to use the specified certificate file when getting a file
-with HTTPS. The certificate must be in PEM format.
-If the optional password isn't specified, it will be queried for on
-the terminal. Note that this certificate is the private key and the private
-certificate concatenated!
+(SSL) Tells curl to use the specified certificate file when getting a file
+with HTTPS or FTPS. The certificate must be in PEM format.  If the optional
+password isn't specified, it will be queried for on the terminal. Note that
+this option assumes a \&"certificate" file that is the private key and the
+private certificate concatenated! See \fI--cert\fP and \fI--key\fP to specify
+them independently.

 If this option is used several times, the last one will be used.
 .IP "--cert-type <type>"
 (SSL) Tells curl what certificate type the provided certificate is in. PEM,
-DER and ENG are recognized types.
+DER and ENG are recognized types.  If not specified, PEM is assumed.

 If this option is used several times, the last one will be used.
 .IP "--cacert <CA certificate>"
-(HTTPS) Tells curl to use the specified certificate file to verify the
+(SSL) Tells curl to use the specified certificate file to verify the
 peer. The file may contain multiple CA certificates. The certificate(s) must
 be in PEM format.

@@ -326,10 +344,10 @@ Current Working Directory, or in any folder along your PATH.

 If this option is used several times, the last one will be used.
 .IP "--capath <CA certificate directory>"
-(HTTPS) Tells curl to use the specified certificate directory to verify the
+(SSL) Tells curl to use the specified certificate directory to verify the
 peer. The certificates must be in PEM format, and the directory must have been
 processed using the c_rehash utility supplied with openssl. Using
-\fI--capath\fP can allow curl to make https connections much more efficiently
+\fI--capath\fP can allow curl to make SSL-connections much more efficiently
 than using \fI--cacert\fP if the \fI--cacert\fP file contains many CA
 certificates.

@@ -337,9 +355,13 @@ If this option is used several times, the last one will be used.
 .IP "-f/--fail"
 (HTTP) Fail silently (no output at all) on server errors. This is mostly done
 like this to better enable scripts etc to better deal with failed attempts. In
-normal cases when a HTTP server fails to deliver a document, it returns a HTML
-document stating so (which often also describes why and more). This flag will
-prevent curl from outputting that and fail silently instead.
+normal cases when a HTTP server fails to deliver a document, it returns an
+HTML document stating so (which often also describes why and more). This flag
+will prevent curl from outputting that and return error 22.
+
+This method is not fail-safe and there are occasions where non-succesful
+response codes will slip through, especially when authentication is involved
+(response codes 401 and 407).

 If this option is used twice, the second will again disable silent failure.
 .IP "--ftp-account [data]"
@@ -354,6 +376,22 @@ the server, the standard behavior of curl is to fail. Using this option, curl
 will instead attempt to create missing directories.

 If this option is used twice, the second will again disable directory creation.
+.IP "--ftp-method [method]"
+(FTP) Control what method curl should use to reach a file on a FTP(S)
+server. The method argument should be one of the following alternatives:
+.RS
+.IP multicwd
+curl does a single CWD operation for each path part in the given URL. For deep
+hierarchies this means very many commands. This is how RFC1738 says it should
+be done. This is the default but the slowest behavior.
+.IP nocwd
+curl does no CWD at all. curl will do SIZE, RETR, STOR etc and give a full
+path to the server for all these commands. This is the fastest behavior.
+.IP singlecwd
+curl does one CWD with the full target directory and then operates on the file
+\&"normally" (like in the multicwd case). This is somewhat more standards
+compliant than 'nocwd' but without the full penalty of 'multicwd'.
+.RE
 .IP "--ftp-pasv"
 (FTP) Use PASV when transferring. PASV is the internal default behavior, but
 using this option can be used to override a previous --ftp-port option. (Added
@@ -361,7 +399,11 @@ in 7.11.0)

 If this option is used several times, the following occurrences make no
 difference.
-
+.IP "--ftp-alternative-to-user <command>"
+(FTP) If authenticating with the USER and PASS commands fails, send this
+command.  When connecting to Tumbleweed's Secure Transport server over FTPS
+using a client certificate, using "SITE AUTH" will tell the server to retrieve
+the username from the certificate. (Added in 7.15.5)
 .IP "--ftp-skip-pasv-ip"
 (FTP) Tell curl to not use the IP address the server suggests in its response
 to curl's PASV command when curl connects the data connection. Instead curl
@@ -373,7 +415,30 @@ This option has no effect if PORT, EPRT or EPSV is used instead of PASV.
 If this option is used twice, the second will again use the server's suggested
 address.
 .IP "--ftp-ssl"
-(FTP) Make the FTP connection switch to use SSL/TLS. (Added in 7.11.0)
+(FTP) Try to use SSL/TLS for the FTP connection.  Reverts to a non-secure
+connection if the server doesn't support SSL/TLS.  See also
+\fI--ftp-ssl-control\fP and \fI--ftp-ssl-reqd\fP for different levels of
+encryption required. (Added in 7.11.0)
+
+If this option is used twice, the second will again disable this.
+.IP "--ftp-ssl-control"
+(FTP) Require SSL/TLS for the ftp login, clear for transfer.  Allows secure
+authentication, but non-encrypted data transfers for efficiency.  Fails the
+transfer if the server doesn't support SSL/TLS.  (Added in 7.16.0)
+
+If this option is used twice, the second will again disable this.
+.IP "--ftp-ssl-reqd"
+(FTP) Require SSL/TLS for the FTP connection.
+Terminates the connection if the server doesn't support SSL/TLS.
+(Added in 7.15.5)
+
+If this option is used twice, the second will again disable this.
+.IP "--ftp-ssl-ccc"
+(FTP) Use CCC (Clear Command Channel)
+Shuts down the SSL/TLS layer after authenticating. The rest of the
+control channel communication will be unencrypted. This allows
+NAT routers to follow the FTP transaction.
+(Added in 7.16.1)

 If this option is used twice, the second will again disable this.
 .IP "-F/--form <name=content>"
@@ -442,9 +507,9 @@ of extra headers. Note that if you should add a custom header that has the
 same name as one of the internal ones curl would use, your externally set
 header will be used instead of the internal one. This allows you to make even
 trickier stuff than curl would normally do. You should not replace internally
-set headers without knowing perfectly well what you're doing. Replacing an
-internal header with one without content on the right side of the colon will
-prevent that header from appearing.
+set headers without knowing perfectly well what you're doing. Remove an
+internal header by giving a replacement without content on the right side of
+the colon, as in: -H \&"Host:".

 curl will make sure that each header you add/replace get sent with the proper
 end of line marker, you should thus \fBnot\fP add that as a part of the header
@@ -493,6 +558,9 @@ and transfers. All SSL connections are attempted to be made secure by using
 the CA certificate bundle installed by default. This makes all connections
 considered "insecure" to fail unless \fI-k/--insecure\fP is used.

+See this online resource for further details:
+\fBhttp://curl.haxx.se/docs/sslcerts.html\fP
+
 If this option is used twice, the second time will again disable it.
 .IP "--key <key>"
 (SSL) Private key file name. Allows you to provide your private key in this
@@ -501,7 +569,8 @@ separate file.
 If this option is used several times, the last one will be used.
 .IP "--key-type <type>"
 (SSL) Private key file type. Specify which type your \fI--key\fP provided
-private key is. DER, PEM and ENG are supported.
+private key is. DER, PEM and ENG are supported. If not specified, PEM is
+assumed.

 If this option is used several times, the last one will be used.
 .IP "--krb4 <level>"
@@ -530,7 +599,7 @@ line. So, it could look similar to this:

 url = "http://curl.haxx.se/docs/"

-This option can be used multiple times.
+This option can be used multiple times to load multiple config files.

 When curl is invoked, it always (unless \fI-q\fP is used) checks for a default
 config file and uses it if found. The default config file is checked for in
@@ -545,6 +614,12 @@ resort the '%USERPROFILE%\Application Data'.
 2) On windows, if there is no _curlrc file in the home dir, it checks for one
 in the same dir the executable curl is placed. On unix-like systems, it will
 simply try to load .curlrc from the determined home dir.
+.IP "--libcurl <file>"
+Append this option to any ordinary curl command line, and you will get a
+libcurl-using source code written to the file that does the equivalent
+operation of what your command line operation does!
+
+If this option is used several times, the last given file name will be used.
 .IP "--limit-rate <speed>"
 Specify the maximum transfer rate you want curl to use. This feature is useful
 if you have a limited pipe and you'd like your transfer not use your entire
@@ -554,6 +629,10 @@ The given speed is measured in bytes/second, unless a suffix is appended.
 Appending 'k' or 'K' will count the number as kilobytes, 'm' or M' makes it
 megabytes while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G.

+The given rate is the average speed, counted during the entire transfer. It
+means that curl might use higher transfer speeds in short bursts, but over
+time it uses no more than the given rate.
+
 If you are also using the \fI-Y/--speed-limit\fP option, that option will take
 precedence and might cripple the rate-limiting slightly, to help keeping the
 speed-limit logic working.
@@ -658,6 +737,15 @@ will output the data in chunks, not necessarily exactly when the data arrives.
 Using this option will disable that buffering.

 If this option is used twice, the second will again switch on buffering.
+.IP "--no-sessionid"
+(SSL) Disable curl's use of SSL session-ID caching.  By default all transfers
+are done using the cache. Note that while nothing ever should get hurt by
+attempting to reuse SSL session-IDs, there seem to be broken SSL
+implementations in the wild that may require you to disable this in order for
+you to succeed. (Added in 7.16.0)
+
+If this option is used twice, the second will again switch on use of the
+session cache.
 .IP "--ntlm"
 (HTTP) Enables NTLM authentication. The NTLM authentication method was
 designed by Microsoft and is used by IIS web servers. It is a proprietary
@@ -771,7 +859,7 @@ must send syntactically correct FTP commands as RFC959 defines.

 This option can be used multiple times.
 .IP "--random-file <file>"
-(HTTPS) Specify the path name to file containing what will be considered as
+(SSL) Specify the path name to file containing what will be considered as
 random data. The data is used to seed the random engine for SSL connections.
 See also the \fI--egd-file\fP option.
 .IP "-r/--range <range>"
@@ -1097,6 +1185,10 @@ 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)
+.TP
+.B ftp_entry_path
+The initial path libcurl ended up in when logging on to the remote FTP
+server. (Added in 7.15.4)
 .RE

 If this option is used several times, the last one will be used.
@@ -1145,7 +1237,7 @@ not set.

 If this option is used several times, the last one will be used.
 .IP "-z/--time-cond <date expression>"
-(HTTP) Request a file that has been modified later than the given time and
+(HTTP/FTP) 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
@@ -1167,25 +1259,14 @@ If this option is used several times, the last one will be used.
 (HTTP) Forces curl to issue its requests using HTTP 1.0 instead of using its
 internally preferred: HTTP 1.1.
 .IP "-1/--tlsv1"
-(HTTPS)
+(SSL)
 Forces curl to use TSL version 1 when negotiating with a remote TLS server.
 .IP "-2/--sslv2"
-(HTTPS)
+(SSL)
 Forces curl to use SSL version 2 when negotiating with a remote SSL server.
 .IP "-3/--sslv3"
-(HTTPS)
+(SSL)
 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
@@ -1202,7 +1283,7 @@ If this option is used twice, the second will again disable the progress bar.
 .SH FILES
 .I ~/.curlrc
 .RS
-Default config file.
+Default config file, see \fI-K/--config\fP for details.

 .SH ENVIRONMENT
 .IP "http_proxy [protocol://]<host>[:port]"
@@ -1355,6 +1436,32 @@ Unrecognized transfer encoding
 Invalid LDAP URL
 .IP 63
 Maximum file size exceeded
+.IP 64
+Requested FTP SSL level failed
+.IP 65
+Sending the data requires a rewind that failed
+.IP 66
+Failed to initialise SSL Engine
+.IP 67
+User, password or similar was not accepted and curl failed to login
+.IP 68
+File not found on TFTP server
+.IP 69
+Permission problem on TFTP server
+.IP 70
+Out of disk space on TFTP server
+.IP 71
+Illegal TFTP operation
+.IP 72
+Unknown TFTP transfer ID
+.IP 73
+File already exists (TFTP)
+.IP 74
+No such user (TFTP)
+.IP 75
+Character conversion failed
+.IP 76
+Character conversion functions required
 .IP XX
 There will appear more error codes here in future releases. The existing ones
 are meant to never change.
--- a/docs/examples/10-at-a-time.c
+++ b/docs/examples/10-at-a-time.c
@@ -0,0 +1,166 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Example application source code using the multi interface to download many
+ * files, but with a capped maximum amount of simultaneous transfers.
+ *
+ * Written by Michael Wallner
+ */
+
+#include <stdlib.h>
+#include <curl/multi.h>
+
+static const char *urls[] = {
+  "http://www.microsoft.com",
+  "http://www.opensource.org",
+  "http://www.google.com",
+  "http://www.yahoo.com",
+  "http://www.ibm.com",
+  "http://www.mysql.com",
+  "http://www.oracle.com",
+  "http://www.ripe.net",
+  "http://www.iana.org",
+  "http://www.amazon.com",
+  "http://www.netcraft.com",
+  "http://www.heise.de",
+  "http://www.chip.de",
+  "http://www.ca.com",
+  "http://www.cnet.com",
+  "http://www.news.com",
+  "http://www.cnn.com",
+  "http://www.wikipedia.org",
+  "http://www.dell.com",
+  "http://www.hp.com",
+  "http://www.cert.org",
+  "http://www.mit.edu",
+  "http://www.nist.gov",
+  "http://www.ebay.com",
+  "http://www.playstation.com",
+  "http://www.uefa.com",
+  "http://www.ieee.org",
+  "http://www.apple.com",
+  "http://www.sony.com",
+  "http://www.symantec.com",
+  "http://www.zdnet.com",
+  "http://www.fujitsu.com",
+  "http://www.supermicro.com",
+  "http://www.hotmail.com",
+  "http://www.ecma.com",
+  "http://www.bbc.co.uk",
+  "http://news.google.com",
+  "http://www.foxnews.com",
+  "http://www.msn.com",
+  "http://www.wired.com",
+  "http://www.sky.com",
+  "http://www.usatoday.com",
+  "http://www.cbs.com",
+  "http://www.nbc.com",
+  "http://slashdot.org",
+  "http://www.bloglines.com",
+  "http://www.techweb.com",
+  "http://www.newslink.org",
+  "http://www.un.org",
+};
+
+#define MAX 10 /* number of simultaneous transfers */
+#define CNT sizeof(urls)/sizeof(char*) /* total number of transfers to do */
+
+static int cb(char *d, size_t n, size_t l, void *p)
+{
+  /* take care of the data here, ignored in this example */
+  (void)d;
+  (void)p;
+  return n*l;
+}
+
+static void init(CURLM *cm, int i)
+{
+  CURL *eh = curl_easy_init();
+
+  curl_easy_setopt(eh, CURLOPT_WRITEFUNCTION, cb);
+  curl_easy_setopt(eh, CURLOPT_HEADER, 0);
+  curl_easy_setopt(eh, CURLOPT_URL, urls[i]);
+  curl_easy_setopt(eh, CURLOPT_PRIVATE, urls[i]);
+  curl_easy_setopt(eh, CURLOPT_VERBOSE, 0);
+
+  curl_multi_add_handle(cm, eh);
+}
+
+int main(void)
+{
+  CURLM *cm;
+  CURLMsg *msg;
+  long L;
+  unsigned int C=0;
+  int M, Q, U = -1;
+  fd_set R, W, E;
+  struct timeval T;
+
+  curl_global_init(CURL_GLOBAL_ALL);
+
+  cm = curl_multi_init();
+
+  for (C = 0; C < MAX; ++C) {
+    init(cm, C);
+  }
+
+  while (U) {
+    while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(cm, &U));
+
+    if (U) {
+      FD_ZERO(&R);
+      FD_ZERO(&W);
+      FD_ZERO(&E);
+
+      if (curl_multi_fdset(cm, &R, &W, &E, &M)) {
+        fprintf(stderr, "E: curl_multi_fdset\n");
+        return EXIT_FAILURE;
+      }
+
+      /* In a real-world program you OF COURSE check the return that maxfd is
+         bigger than -1 so that the call to select() below makes sense! */
+
+      if (curl_multi_timeout(cm, &L)) {
+        fprintf(stderr, "E: curl_multi_timeout\n");
+        return EXIT_FAILURE;
+      }
+
+      T.tv_sec = L/1000;
+      T.tv_usec = (L%1000)*1000;
+
+      if (0 > select(M+1, &R, &W, &E, &T)) {
+        fprintf(stderr, "E: select\n");
+        return EXIT_FAILURE;
+      }
+    }
+
+    while ((msg = curl_multi_info_read(cm, &Q))) {
+      if (msg->msg == CURLMSG_DONE) {
+        char *url;
+        CURL *e = msg->easy_handle;
+        curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &url);
+        fprintf(stderr, "R: %d - %s <%s>\n",
+                msg->data.result, curl_easy_strerror(msg->data.result), url);
+        curl_multi_remove_handle(cm, e);
+        curl_easy_cleanup(e);
+      }
+      else {
+        fprintf(stderr, "E: CURLMsg (%d)\n", msg->msg);
+      }
+      if (C < CNT) {
+        init(cm, C++);
+      }
+    }
+  }
+
+  curl_multi_cleanup(cm);
+  curl_global_cleanup();
+
+  return EXIT_SUCCESS;
+}
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -11,7 +11,8 @@ EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.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 htmltidy.c opensslthreadlock.c		\
- cookie_interface.c cacertinmem.c synctime.c
+ cookie_interface.c cacertinmem.c synctime.c sampleconv.c ftpuploadresume.c \
+ 10-at-a-time.c hiperfifo.c ghiper.c

 all:
 	@echo "done"
--- a/docs/examples/README
+++ b/docs/examples/README
@@ -26,9 +26,9 @@ want you do reorganize them like:
  $ `curl-config --cc` -o example example.c `curl-config --cflags --libs`

 *PLEASE* do not use the curl.haxx.se site as a test target for your libcurl
-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.
+applications/experiments. Even if some of the examples use that site as a 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

@@ -43,9 +43,13 @@ 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
+ftpupload.c    - upload a file to an FTP server
+ftpuploadresume.c - resume an upload to an FTP server
 getinfo.c      - get the Content-Type from the recent transfer
 getinmemory.c  - download a file to memory only
+ghiper.c       - curl_multi_socket() using code with glib-2
+hiperfifo.c    - downloads all URLs written to the fifo, using
+                 curl_multi_socket() and libevent
 htmltitle.cc   - download a HTML file and extract the <title> tag from a HTML
                 page using libxml
 http-post.c    - HTTP POST
@@ -61,8 +65,12 @@ opensslthreadlock.c - show how to do locking when using OpenSSL multi-threaded
 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
+sampleconv.c   - showing how a program on a non-ASCII platform would invoke
+                 callbacks to do its own codeset conversions instead of using
+                 the built-in iconv functions in libcurl
 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
 synctime.c     - Sync local time by extracing date from remote HTTP servers
+10-at-a-time.c - Download many files simultaneously, 10 at a time.
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -114,6 +114,13 @@ static char *curlx_usage[]={

 */

+/* 
+ * We use this ZERO_NULL to avoid picky compiler warnings,
+ * when assigning a NULL pointer to a function pointer var.
+ */
+
+#define ZERO_NULL 0
+
 /* This is a context that we pass to all callbacks */

 typedef struct sslctxparm_st {
@@ -236,7 +243,7 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) {

  SSL_CTX_set_verify_depth(ctx,2);

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

  SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);

--- a/docs/examples/debug.c
+++ b/docs/examples/debug.c
@@ -84,6 +84,9 @@ int my_trace(CURL *handle, curl_infotype type,
  case CURLINFO_DATA_OUT:
    text = "=> Send data";
    break;
+  case CURLINFO_SSL_DATA_OUT:
+    text = "=> Send SSL data";
+    break;
  case CURLINFO_HEADER_IN:
    text = "<= Recv header";
    break;
@@ -93,9 +96,6 @@ int my_trace(CURL *handle, curl_infotype type,
  case CURLINFO_SSL_DATA_IN:
    text = "<= Recv SSL data";
    break;
-  case CURLINFO_SSL_DATA_OUT:
-    text = "<= Send SSL data";
-    break;
  }

  dump(text, stderr, data, size, config->trace_ascii);
--- a/docs/examples/fopen.c
+++ b/docs/examples/fopen.c
@@ -153,6 +153,10 @@ fill_buffer(URL_FILE *file,int want,int waittime)
        /* get file descriptors from the transfers */
        curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);

+        /* In a real-world program you OF COURSE check the return code of the
+           function calls, *and* you make sure that maxfd is bigger than -1
+           so that the call to select() below makes sense! */
+
        rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);

        switch(rc) {
--- a/docs/examples/ftpuploadresume.c
+++ b/docs/examples/ftpuploadresume.c
@@ -0,0 +1,154 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Upload to FTP, resuming failed transfers
+ *
+ * Compile for MinGW like this:
+ *  gcc -Wall -pedantic -std=c99 ftpuploadwithresume.c -o ftpuploadresume.exe
+ *  -lcurl -lmsvcr70
+ *
+ * Written by Philip Bock
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <curl/curl.h>
+
+
+/* The MinGW headers are missing a few Win32 function definitions,
+   you shouldn't need this if you use VC++ */
+int __cdecl _snscanf(const char * input, size_t length, const char * format, ...);
+
+
+/* parse headers for Content-Length */
+size_t getcontentlengthfunc(void *ptr, size_t size, size_t nmemb, void *stream) {
+	int r;
+	long len = 0;
+
+	/* _snscanf() is Win32 specific */
+	r = _snscanf(ptr, size * nmemb, "Content-Length: %ld\n", &len);
+
+	if (r) /* Microsoft: we don't read the specs */
+		*((long *) stream) = len;
+
+	return size * nmemb;
+}
+
+/* discard downloaded data */
+size_t discardfunc(void *ptr, size_t size, size_t nmemb, void *stream) {
+	return size * nmemb;
+}
+
+/* read data to upload */
+size_t readfunc(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+	FILE *f = stream;
+	size_t n;
+
+	if (ferror(f))
+		return CURL_READFUNC_ABORT;
+
+	n = fread(ptr, size, nmemb, f) * size;
+
+	return n;
+}
+
+
+int upload(CURL *curlhandle, const char * remotepath, const char * localpath,
+           long timeout, long tries)
+{
+	FILE *f;
+	long uploaded_len = 0;
+	CURLcode r = CURLE_GOT_NOTHING;
+	int c;
+
+	f = fopen(localpath, "rb");
+	if (f == NULL) {
+		perror(NULL);
+		return 0;
+	}
+
+	curl_easy_setopt(curlhandle, CURLOPT_UPLOAD, TRUE);
+
+	curl_easy_setopt(curlhandle, CURLOPT_URL, remotepath);
+
+	if (timeout)
+		curl_easy_setopt(curlhandle, CURLOPT_FTP_RESPONSE_TIMEOUT, timeout);
+
+	curl_easy_setopt(curlhandle, CURLOPT_HEADERFUNCTION, getcontentlengthfunc);
+	curl_easy_setopt(curlhandle, CURLOPT_HEADERDATA, &uploaded_len);
+
+	curl_easy_setopt(curlhandle, CURLOPT_WRITEFUNCTION, discardfunc);
+
+	curl_easy_setopt(curlhandle, CURLOPT_READFUNCTION, readfunc);
+	curl_easy_setopt(curlhandle, CURLOPT_READDATA, f);
+
+	curl_easy_setopt(curlhandle, CURLOPT_FTPPORT, "-"); /* disable passive mode */
+	curl_easy_setopt(curlhandle, CURLOPT_FTP_CREATE_MISSING_DIRS, TRUE);
+
+	curl_easy_setopt(curlhandle, CURLOPT_VERBOSE, TRUE);
+
+	for (c = 0; (r != CURLE_OK) && (c < tries); c++) {
+		/* are we resuming? */
+		if (c) { /* yes */
+			/* determine the length of the file already written */
+
+			/*
+			 * With NOBODY and NOHEADER, libcurl will issue a SIZE
+			 * command, but the only way to retrieve the result is
+			 * to parse the returned Content-Length header. Thus,
+			 * getcontentlengthfunc(). We need discardfunc() above
+			 * because HEADER will dump the headers to stdout
+			 * without it.
+			 */
+			curl_easy_setopt(curlhandle, CURLOPT_NOBODY, TRUE);
+			curl_easy_setopt(curlhandle, CURLOPT_HEADER, TRUE);
+
+			r = curl_easy_perform(curlhandle);
+			if (r != CURLE_OK)
+				continue;
+
+			curl_easy_setopt(curlhandle, CURLOPT_NOBODY, FALSE);
+			curl_easy_setopt(curlhandle, CURLOPT_HEADER, FALSE);
+
+			fseek(f, uploaded_len, SEEK_SET);
+
+			curl_easy_setopt(curlhandle, CURLOPT_FTPAPPEND, TRUE);
+		}
+		else { /* no */
+			curl_easy_setopt(curlhandle, CURLOPT_FTPAPPEND, FALSE);
+		}
+
+		r = curl_easy_perform(curlhandle);
+	}
+
+	fclose(f);
+
+	if (r == CURLE_OK)
+		return 1;
+	else {
+		fprintf(stderr, "%s\n", curl_easy_strerror(r));
+		return 0;
+	}
+}
+
+int main(int c, char **argv) {
+	CURL *curlhandle = NULL;
+
+	curl_global_init(CURL_GLOBAL_ALL);
+	curlhandle = curl_easy_init();
+
+	upload(curlhandle, "ftp://user:pass@host/path/file", "C:\\file", 0, 3);
+
+	curl_easy_cleanup(curlhandle);
+	curl_global_cleanup();
+
+	return 0;
+}
--- a/docs/examples/ghiper.c
+++ b/docs/examples/ghiper.c
@@ -0,0 +1,461 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Example application source code using the multi socket interface to
+ * download many files at once.
+ *
+ * Written by Jeff Pohlmeyer
+
+Requires glib-2.x and a (POSIX?) system that has mkfifo().
+
+This is an adaptation of libcurl's "hipev.c" and libevent's "event-test.c"
+sample programs, adapted to use glib's g_io_channel in place of libevent.
+
+When running, the program creates the named pipe "hiper.fifo"
+
+Whenever there is input into the fifo, the program reads the input as a list
+of URL's and creates some new easy handles to fetch each URL via the
+curl_multi "hiper" API.
+
+
+Thus, you can try a single URL:
+  % echo http://www.yahoo.com > hiper.fifo
+
+Or a whole bunch of them:
+  % cat my-url-list > hiper.fifo
+
+The fifo buffer is handled almost instantly, so you can even add more URL's
+while the previous requests are still being downloaded.
+
+This is purely a demo app, all retrieved data is simply discarded by the write
+callback.
+
+*/
+
+
+#include <glib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <curl/curl.h>
+
+
+#define MSG_OUT g_print   /* Change to "g_error" to write to stderr */
+#define SHOW_VERBOSE 0    /* Set to non-zero for libcurl messages */
+#define SHOW_PROGRESS 0   /* Set to non-zero to enable progress callback */
+
+
+
+/* Global information, common to all connections */
+typedef struct _GlobalInfo {
+  CURLM *multi;
+  guint timer_event;
+  int prev_running;
+  int still_running;
+  int requested; /* count: curl_easy_init() */
+  int completed; /* count: curl_easy_cleanup() */
+} GlobalInfo;
+
+
+
+/* Information associated with a specific easy handle */
+typedef struct _ConnInfo {
+  CURL *easy;
+  char *url;
+  GlobalInfo *global;
+  char error[CURL_ERROR_SIZE];
+} ConnInfo;
+
+
+/* Information associated with a specific socket */
+typedef struct _SockInfo {
+  curl_socket_t sockfd;
+  CURL *easy;
+  int action;
+  long timeout;
+  GIOChannel *ch;
+  guint ev;
+  GlobalInfo *global;
+} SockInfo;
+
+
+
+
+/* Die if we get a bad CURLMcode somewhere */
+static void mcode_or_die(char *where, CURLMcode code) {
+  if ( CURLM_OK != code ) {
+    char *s;
+    switch (code) {
+      case     CURLM_CALL_MULTI_PERFORM: s="CURLM_CALL_MULTI_PERFORM"; break;
+      case     CURLM_OK:                 s="CURLM_OK";                 break;
+      case     CURLM_BAD_HANDLE:         s="CURLM_BAD_HANDLE";         break;
+      case     CURLM_BAD_EASY_HANDLE:    s="CURLM_BAD_EASY_HANDLE";    break;
+      case     CURLM_OUT_OF_MEMORY:      s="CURLM_OUT_OF_MEMORY";      break;
+      case     CURLM_INTERNAL_ERROR:     s="CURLM_INTERNAL_ERROR";     break;
+      case     CURLM_BAD_SOCKET:         s="CURLM_BAD_SOCKET";         break;
+      case     CURLM_UNKNOWN_OPTION:     s="CURLM_UNKNOWN_OPTION";     break;
+      case     CURLM_LAST:               s="CURLM_LAST";               break;
+      default: s="CURLM_unknown";
+    }
+    MSG_OUT("ERROR: %s returns %s\n", where, s);
+    exit(code);
+  }
+}
+
+
+
+/* Check for completed transfers, and remove their easy handles */
+static void check_run_count(GlobalInfo *g)
+{
+  if (g->prev_running > g->still_running) {
+    char *eff_url=NULL;
+    CURLMsg *msg;
+    int msgs_left;
+    ConnInfo *conn=NULL;
+    CURL*easy;
+    CURLcode res;
+
+    MSG_OUT("REMAINING: %d\n", g->still_running);
+    /*
+      I am still uncertain whether it is safe to remove an easy handle
+      from inside the curl_multi_info_read loop, so here I will search
+      for completed transfers in the inner "while" loop, and then remove
+      them in the outer "do-while" loop...
+   */
+    do {
+      easy=NULL;
+      while ((msg = curl_multi_info_read(g->multi, &msgs_left))) {
+        if (msg->msg == CURLMSG_DONE) {
+          easy=msg->easy_handle;
+          res=msg->data.result;
+          break;
+        }
+      }
+      if (easy) {
+          curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn);
+          curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url);
+          MSG_OUT("DONE: %s => (%d) %s\n", eff_url, res, conn->error);
+          curl_multi_remove_handle(g->multi, easy);
+          g_free(conn->url);
+          curl_easy_cleanup(easy);
+          g_free(conn);
+          g->completed++;
+      }
+    } while ( easy );
+    MSG_OUT("Requested: %d Completed:%d\n", g->requested, g->completed);
+  }
+  g->prev_running = g->still_running;
+}
+
+
+
+
+/* Called by glib when our timeout expires */
+static gboolean timer_cb(gpointer data)
+{
+  GlobalInfo *g = (GlobalInfo *)data;
+  CURLMcode rc;
+
+  do {
+    rc = curl_multi_socket(g->multi, CURL_SOCKET_TIMEOUT, &g->still_running);
+  } while (rc == CURLM_CALL_MULTI_PERFORM);
+  mcode_or_die("timer_cb: curl_multi_socket", rc);
+  check_run_count(g);
+  return FALSE;
+}
+
+
+
+/* Update the event timer after curl_multi library calls */
+static int update_timeout_cb(CURLM *multi, long timeout_ms, void *userp)
+{
+  struct timeval timeout;
+  GlobalInfo *g=(GlobalInfo *)userp;
+  timeout.tv_sec = timeout_ms/1000;
+  timeout.tv_usec = (timeout_ms%1000)*1000;
+
+  MSG_OUT("*** update_timeout_cb %ld => %ld:%ld ***\n",
+              timeout_ms, timeout.tv_sec, timeout.tv_usec);
+
+  g->timer_event = g_timeout_add(timeout_ms, timer_cb, g);
+  return 0;
+}
+
+
+
+
+/* Called by glib when we get action on a multi socket */
+static gboolean event_cb(GIOChannel *ch, GIOCondition condition, gpointer data)
+{
+  GlobalInfo *g = (GlobalInfo*) data;
+  CURLMcode rc;
+  int fd=g_io_channel_unix_get_fd(ch);
+  do {
+    rc = curl_multi_socket(g->multi, fd, &g->still_running);
+  } while (rc == CURLM_CALL_MULTI_PERFORM);
+  mcode_or_die("event_cb: curl_multi_socket", rc);
+  check_run_count(g);
+  if(g->still_running) {
+    return TRUE;
+  } else {
+    MSG_OUT("last transfer done, kill timeout\n");
+    if (g->timer_event) { g_source_remove(g->timer_event); }
+    return FALSE;
+  }
+}
+
+
+
+/* Clean up the SockInfo structure */
+static void remsock(SockInfo *f)
+{
+  if (!f) { return; }
+  if (f->ev) { g_source_remove(f->ev); }
+  g_free(f);
+}
+
+
+
+/* Assign information to a SockInfo structure */
+static void setsock(SockInfo*f, curl_socket_t s, CURL*e, int act, GlobalInfo*g)
+{
+  GIOCondition kind =
+     (act&CURL_POLL_IN?G_IO_IN:0)|(act&CURL_POLL_OUT?G_IO_OUT:0);
+
+  f->sockfd = s;
+  f->action = act;
+  f->easy = e;
+  if (f->ev) { g_source_remove(f->ev); }
+  f->ev=g_io_add_watch(f->ch, kind, event_cb,g);
+
+}
+
+
+
+/* Initialize a new SockInfo structure */
+static void addsock(curl_socket_t s, CURL *easy, int action, GlobalInfo *g)
+{
+  SockInfo *fdp = g_malloc0(sizeof(SockInfo));
+
+  fdp->global = g;
+  fdp->ch=g_io_channel_unix_new(s);
+  setsock(fdp, s, easy, action, g);
+  curl_multi_assign(g->multi, s, fdp);
+}
+
+
+
+/* CURLMOPT_SOCKETFUNCTION */
+static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp)
+{
+  GlobalInfo *g = (GlobalInfo*) cbp;
+  SockInfo *fdp = (SockInfo*) sockp;
+  char *whatstr[]={ "none", "IN", "OUT", "INOUT", "REMOVE" };
+
+  MSG_OUT("socket callback: s=%d e=%p what=%s ", s, e, whatstr[what]);
+  if (what == CURL_POLL_REMOVE) {
+    MSG_OUT("\n");
+    remsock(fdp);
+  } else {
+    if (!fdp) {
+      MSG_OUT("Adding data: %s%s\n",
+             what&CURL_POLL_IN?"READ":"",
+             what&CURL_POLL_OUT?"WRITE":"" );
+      addsock(s, e, what, g);
+    }
+    else {
+      MSG_OUT(
+        "Changing action from %d to %d\n", fdp->action, what);
+      setsock(fdp, s, e, what, g);
+    }
+  }
+  return 0;
+}
+
+
+
+/* CURLOPT_WRITEFUNCTION */
+static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *data)
+{
+  size_t realsize = size * nmemb;
+  ConnInfo *conn = (ConnInfo*) data;
+  (void)ptr;
+  (void)conn;
+  return realsize;
+}
+
+
+
+/* CURLOPT_PROGRESSFUNCTION */
+static int prog_cb (void *p, double dltotal, double dlnow, double ult, double uln)
+{
+  ConnInfo *conn = (ConnInfo *)p;
+  MSG_OUT("Progress: %s (%g/%g)\n", conn->url, dlnow, dltotal);
+  return 0;
+}
+
+
+
+/* Create a new easy handle, and add it to the global curl_multi */
+static void new_conn(char *url, GlobalInfo *g )
+{
+  ConnInfo *conn;
+  CURLMcode rc;
+
+  conn = g_malloc0(sizeof(ConnInfo));
+
+  conn->error[0]='\0';
+
+  conn->easy = curl_easy_init();
+  if (!conn->easy) {
+    MSG_OUT("curl_easy_init() failed, exiting!\n");
+    exit(2);
+  }
+  conn->global = g;
+  conn->url = g_strdup(url);
+  curl_easy_setopt(conn->easy, CURLOPT_URL, conn->url);
+  curl_easy_setopt(conn->easy, CURLOPT_WRITEFUNCTION, write_cb);
+  curl_easy_setopt(conn->easy, CURLOPT_WRITEDATA, &conn);
+  curl_easy_setopt(conn->easy, CURLOPT_VERBOSE, SHOW_VERBOSE);
+  curl_easy_setopt(conn->easy, CURLOPT_ERRORBUFFER, conn->error);
+  curl_easy_setopt(conn->easy, CURLOPT_PRIVATE, conn);
+  curl_easy_setopt(conn->easy, CURLOPT_NOPROGRESS, SHOW_PROGRESS?0:1);
+  curl_easy_setopt(conn->easy, CURLOPT_PROGRESSFUNCTION, prog_cb);
+  curl_easy_setopt(conn->easy, CURLOPT_PROGRESSDATA, conn);
+  curl_easy_setopt(conn->easy, CURLOPT_FOLLOWLOCATION, 1);
+  curl_easy_setopt(conn->easy, CURLOPT_CONNECTTIMEOUT, 30);
+  curl_easy_setopt(conn->easy, CURLOPT_LOW_SPEED_LIMIT, 1);
+  curl_easy_setopt(conn->easy, CURLOPT_LOW_SPEED_TIME, 30);
+
+  MSG_OUT("Adding easy %p to multi %p (%s)\n", conn->easy, g->multi, url);
+  rc =curl_multi_add_handle(g->multi, conn->easy);
+  mcode_or_die("new_conn: curl_multi_add_handle", rc);
+  g->requested++;
+  do {
+    rc = curl_multi_socket_all(g->multi, &g->still_running);
+  } while (CURLM_CALL_MULTI_PERFORM == rc);
+  mcode_or_die("new_conn: curl_multi_socket_all", rc);
+  check_run_count(g);
+}
+
+
+/* This gets called by glib whenever data is received from the fifo */
+static gboolean fifo_cb (GIOChannel *ch, GIOCondition condition, gpointer data)
+{
+  #define BUF_SIZE 1024
+  gsize len, tp;
+  gchar *buf, *tmp, *all=NULL;
+  GIOStatus rv;
+
+  do {
+    GError *err=NULL;
+    rv = g_io_channel_read_line (ch,&buf,&len,&tp,&err);
+    if ( buf ) {
+      if (tp) { buf[tp]='\0'; }
+      new_conn(buf,(GlobalInfo*)data);
+      g_free(buf);
+    } else {
+      buf = g_malloc(BUF_SIZE+1);
+      while (TRUE) {
+        buf[BUF_SIZE]='\0';
+        g_io_channel_read_chars(ch,buf,BUF_SIZE,&len,&err);
+        if (len) {
+          buf[len]='\0';
+          if (all) {
+            tmp=all;
+            all=g_strdup_printf("%s%s", tmp, buf);
+            g_free(tmp);
+          } else {
+            all = g_strdup(buf);
+          }
+        } else {
+           break;
+        }
+      }
+      if (all) {
+        new_conn(all,(GlobalInfo*)data);
+        g_free(all);
+      }
+      g_free(buf);
+    }
+    if ( err ) {
+      g_error("fifo_cb: %s", err->message);
+      g_free(err);
+      break;
+    }
+  } while ( (len) && (rv == G_IO_STATUS_NORMAL) );
+  return TRUE;
+}
+
+
+
+
+int init_fifo(void)
+{
+ struct stat st;
+ char *fifo = "hiper.fifo";
+ int socket;
+
+ if (lstat (fifo, &st) == 0) {
+  if ((st.st_mode & S_IFMT) == S_IFREG) {
+   errno = EEXIST;
+   perror("lstat");
+   exit (1);
+  }
+ }
+
+ unlink (fifo);
+ if (mkfifo (fifo, 0600) == -1) {
+  perror("mkfifo");
+  exit (1);
+ }
+
+ socket = open (fifo, O_RDWR | O_NONBLOCK, 0);
+
+ if (socket == -1) {
+  perror("open");
+  exit (1);
+ }
+ MSG_OUT("Now, pipe some URL's into > %s\n", fifo);
+
+ return socket;
+
+}
+
+
+
+
+int main(int argc, char **argv)
+{
+  GlobalInfo *g;
+  CURLMcode rc;
+  GMainLoop*gmain;
+  int fd;
+  GIOChannel* ch;
+  g=g_malloc0(sizeof(GlobalInfo));
+
+  fd=init_fifo();
+  ch=g_io_channel_unix_new(fd);
+  g_io_add_watch(ch,G_IO_IN,fifo_cb,g);
+  gmain=g_main_loop_new(NULL,FALSE);
+  g->multi = curl_multi_init();
+  curl_multi_setopt(g->multi, CURLMOPT_SOCKETFUNCTION, sock_cb);
+  curl_multi_setopt(g->multi, CURLMOPT_SOCKETDATA, g);
+  curl_multi_setopt(g->multi, CURLMOPT_TIMERFUNCTION, update_timeout_cb);
+  curl_multi_setopt(g->multi, CURLMOPT_TIMERDATA, g);
+  do {
+    rc = curl_multi_socket_all(g->multi, &g->still_running);
+  } while (CURLM_CALL_MULTI_PERFORM == rc);
+  g_main_loop_run(gmain);
+  curl_multi_cleanup(g->multi);
+  return 0;
+}
--- a/docs/examples/hiperfifo.c
+++ b/docs/examples/hiperfifo.c
@@ -0,0 +1,416 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Example application source code using the multi socket interface to
+ * download many files at once.
+ *
+ * Written by Jeff Pohlmeyer
+
+Requires libevent and a (POSIX?) system that has mkfifo().
+
+This is an adaptation of libcurl's "hipev.c" and libevent's "event-test.c"
+sample programs.
+
+When running, the program creates the named pipe "hiper.fifo"
+
+Whenever there is input into the fifo, the program reads the input as a list
+of URL's and creates some new easy handles to fetch each URL via the
+curl_multi "hiper" API.
+
+
+Thus, you can try a single URL:
+  % echo http://www.yahoo.com > hiper.fifo
+
+Or a whole bunch of them:
+  % cat my-url-list > hiper.fifo
+
+The fifo buffer is handled almost instantly, so you can even add more URL's
+while the previous requests are still being downloaded.
+
+Note:
+  For the sake of simplicity, URL length is limited to 1023 char's !
+
+This is purely a demo app, all retrieved data is simply discarded by the write
+callback.
+
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/poll.h>
+#include <curl/curl.h>
+#include <event.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+
+#define MSG_OUT stdout /* Send info to stdout, change to stderr if you want */
+
+
+/* Global information, common to all connections */
+typedef struct _GlobalInfo {
+  struct event fifo_event;
+  struct event timer_event;
+  CURLM *multi;
+  int prev_running;
+  int still_running;
+  FILE* input;
+} GlobalInfo;
+
+
+/* Information associated with a specific easy handle */
+typedef struct _ConnInfo {
+  CURL *easy;
+  char *url;
+  GlobalInfo *global;
+  char error[CURL_ERROR_SIZE];
+} ConnInfo;
+
+
+/* Information associated with a specific socket */
+typedef struct _SockInfo {
+  curl_socket_t sockfd;
+  CURL *easy;
+  int action;
+  long timeout;
+  struct event ev;
+  int evset;
+  GlobalInfo *global;
+} SockInfo;
+
+
+
+/* Update the event timer after curl_multi library calls */
+static void update_timeout(GlobalInfo *g)
+{
+  long timeout_ms;
+  struct timeval timeout;
+
+  curl_multi_timeout(g->multi, &timeout_ms);
+  if(timeout_ms < 0)
+    return;
+
+  timeout.tv_sec = timeout_ms/1000;
+  timeout.tv_usec = (timeout_ms%1000)*1000;
+  evtimer_add(&g->timer_event, &timeout);
+}
+
+
+
+/* Die if we get a bad CURLMcode somewhere */
+void mcode_or_die(char *where, CURLMcode code) {
+  if ( CURLM_OK != code ) {
+    char *s;
+    switch (code) {
+      case     CURLM_CALL_MULTI_PERFORM: s="CURLM_CALL_MULTI_PERFORM"; break;
+      case     CURLM_OK:                 s="CURLM_OK";                 break;
+      case     CURLM_BAD_HANDLE:         s="CURLM_BAD_HANDLE";         break;
+      case     CURLM_BAD_EASY_HANDLE:    s="CURLM_BAD_EASY_HANDLE";    break;
+      case     CURLM_OUT_OF_MEMORY:      s="CURLM_OUT_OF_MEMORY";      break;
+      case     CURLM_INTERNAL_ERROR:     s="CURLM_INTERNAL_ERROR";     break;
+      case     CURLM_BAD_SOCKET:         s="CURLM_BAD_SOCKET";         break;
+      case     CURLM_UNKNOWN_OPTION:     s="CURLM_UNKNOWN_OPTION";     break;
+      case     CURLM_LAST:               s="CURLM_LAST";               break;
+      default: s="CURLM_unknown";
+    }
+    fprintf(MSG_OUT, "ERROR: %s returns %s\n", where, s);
+    exit(code);
+  }
+}
+
+
+
+/* Check for completed transfers, and remove their easy handles */
+static void check_run_count(GlobalInfo *g)
+{
+  if (g->prev_running > g->still_running) {
+    char *eff_url=NULL;
+    CURLMsg *msg;
+    int msgs_left;
+    ConnInfo *conn=NULL;
+    CURL*easy;
+    CURLcode res;
+
+    fprintf(MSG_OUT, "REMAINING: %d\n", g->still_running);
+    /*
+      I am still uncertain whether it is safe to remove an easy handle
+      from inside the curl_multi_info_read loop, so here I will search
+      for completed transfers in the inner "while" loop, and then remove
+      them in the outer "do-while" loop...
+   */
+    do {
+      easy=NULL;
+      while ((msg = curl_multi_info_read(g->multi, &msgs_left))) {
+        if (msg->msg == CURLMSG_DONE) {
+          easy=msg->easy_handle;
+          res=msg->data.result;
+          break;
+        }
+      }
+      if (easy) {
+          curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn);
+          curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url);
+          fprintf(MSG_OUT, "DONE: %s => (%d) %s\n", eff_url, res, conn->error);
+          curl_multi_remove_handle(g->multi, easy);
+          free(conn->url);
+          curl_easy_cleanup(easy);
+          free(conn);
+      }
+    } while ( easy );
+  }
+  g->prev_running = g->still_running;
+}
+
+
+
+/* Called by libevent when we get action on a multi socket */
+static void event_cb(int fd, short kind, void *userp)
+{
+  GlobalInfo *g = (GlobalInfo*) userp;
+  CURLMcode rc;
+
+  do {
+    rc = curl_multi_socket(g->multi, fd, &g->still_running);
+  } while (rc == CURLM_CALL_MULTI_PERFORM);
+  mcode_or_die("event_cb: curl_multi_socket", rc);
+  check_run_count(g);
+  if(g->still_running) {
+    update_timeout(g);
+  } else {
+    fprintf(MSG_OUT, "last transfer done, kill timeout\n");
+    if (evtimer_pending(&g->timer_event, NULL)) {
+      evtimer_del(&g->timer_event);
+    }
+  }
+}
+
+
+
+/* Called by libevent when our timeout expires */
+static void timer_cb(int fd, short kind, void *userp)
+{
+  (void)fd;
+  (void)kind;
+  GlobalInfo *g = (GlobalInfo *)userp;
+  CURLMcode rc;
+
+  do {
+    rc = curl_multi_socket(g->multi, CURL_SOCKET_TIMEOUT, &g->still_running);
+  } while (rc == CURLM_CALL_MULTI_PERFORM);
+  mcode_or_die("timer_cb: curl_multi_socket", rc);
+  check_run_count(g);
+  if ( g->still_running ) { update_timeout(g); }
+}
+
+
+
+/* Clean up the SockInfo structure */
+static void remsock(SockInfo *f)
+{
+  if (!f) { return; }
+  if (f->evset) { event_del(&f->ev); }
+  free(f);
+}
+
+
+
+/* Assign information to a SockInfo structure */
+static void setsock(SockInfo*f, curl_socket_t s, CURL*e, int act, GlobalInfo*g)
+{
+  int kind =
+     (act&CURL_POLL_IN?EV_READ:0)|(act&CURL_POLL_OUT?EV_WRITE:0)|EV_PERSIST;
+
+  f->sockfd = s;
+  f->action = act;
+  f->easy = e;
+  if (f->evset) { event_del(&f->ev); }
+  event_set( &f->ev, f->sockfd, kind, event_cb, g);
+  f->evset=1;
+  event_add(&f->ev, NULL);
+}
+
+
+
+/* Initialize a new SockInfo structure */
+static void addsock(curl_socket_t s, CURL *easy, int action, GlobalInfo *g) {
+  SockInfo *fdp = calloc(sizeof(SockInfo), 1);
+
+  fdp->global = g;
+  setsock(fdp, s, easy, action, g);
+  curl_multi_assign(g->multi, s, fdp);
+}
+
+
+
+/* CURLMOPT_SOCKETFUNCTION */
+static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp)
+{
+  GlobalInfo *g = (GlobalInfo*) cbp;
+  SockInfo *fdp = (SockInfo*) sockp;
+  char *whatstr[]={ "none", "IN", "OUT", "INOUT", "REMOVE" };
+
+  fprintf(MSG_OUT,
+          "socket callback: s=%d e=%p what=%s ", s, e, whatstr[what]);
+  if (what == CURL_POLL_REMOVE) {
+    fprintf(MSG_OUT, "\n");
+    remsock(fdp);
+  } else {
+    if (!fdp) {
+      fprintf(MSG_OUT, "Adding data: %s%s\n",
+             what&CURL_POLL_IN?"READ":"",
+             what&CURL_POLL_OUT?"WRITE":"" );
+      addsock(s, e, what, g);
+    }
+    else {
+      fprintf(MSG_OUT,
+        "Changing action from %d to %d\n", fdp->action, what);
+      setsock(fdp, s, e, what, g);
+    }
+  }
+  return 0;
+}
+
+
+
+/* CURLOPT_WRITEFUNCTION */
+static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *data)
+{
+  size_t realsize = size * nmemb;
+  ConnInfo *conn = (ConnInfo*) data;
+  (void)ptr;
+  (void)conn;
+  return realsize;
+}
+
+
+/* CURLOPT_PROGRESSFUNCTION */
+int prog_cb (void *p, double dltotal, double dlnow, double ult, double uln)
+{
+  ConnInfo *conn = (ConnInfo *)p;
+  fprintf(MSG_OUT, "Progress: %s (%g/%g)\n", conn->url, dlnow, dltotal);
+  return 0;
+}
+
+
+/* Create a new easy handle, and add it to the global curl_multi */
+void new_conn(char *url, GlobalInfo *g ) {
+  ConnInfo *conn;
+  CURLMcode rc;
+
+  conn = calloc(1, sizeof(ConnInfo));
+  memset(conn, 0, sizeof(ConnInfo));
+  conn->error[0]='\0';
+
+  conn->easy = curl_easy_init();
+  if (!conn->easy) {
+    fprintf(MSG_OUT, "curl_easy_init() failed, exiting!\n");
+    exit(2);
+  }
+  conn->global = g;
+  conn->url = strdup(url);
+  curl_easy_setopt(conn->easy, CURLOPT_URL, conn->url);
+  curl_easy_setopt(conn->easy, CURLOPT_WRITEFUNCTION, write_cb);
+  curl_easy_setopt(conn->easy, CURLOPT_WRITEDATA, &conn);
+  curl_easy_setopt(conn->easy, CURLOPT_VERBOSE, 0);
+  curl_easy_setopt(conn->easy, CURLOPT_ERRORBUFFER, conn->error);
+  curl_easy_setopt(conn->easy, CURLOPT_PRIVATE, conn);
+  curl_easy_setopt(conn->easy, CURLOPT_NOPROGRESS, 0);
+  curl_easy_setopt(conn->easy, CURLOPT_PROGRESSFUNCTION, prog_cb);
+  curl_easy_setopt(conn->easy, CURLOPT_PROGRESSDATA, conn);
+  fprintf(MSG_OUT,
+          "Adding easy %p to multi %p (%s)\n", conn->easy, g->multi, url);
+  rc =curl_multi_add_handle(g->multi, conn->easy);
+  mcode_or_die("new_conn: curl_multi_add_handle", rc);
+  do {
+    rc = curl_multi_socket_all(g->multi, &g->still_running);
+  } while (CURLM_CALL_MULTI_PERFORM == rc);
+  mcode_or_die("new_conn: curl_multi_socket_all", rc);
+  check_run_count(g);
+}
+
+
+
+/* This gets called whenever data is received from the fifo */
+void fifo_cb(int fd, short event, void *arg) {
+  char s[1024];
+  long int rv=0;
+  int n=0;
+  GlobalInfo *g = (GlobalInfo *)arg;
+
+  do {
+    s[0]='\0';
+    rv=fscanf(g->input, "%1023s%n", s, &n);
+    s[n]='\0';
+    if ( n && s[0] ) {
+      new_conn(s,arg);  /* if we read a URL, go get it! */
+    } else break;
+  } while ( rv != EOF);
+}
+
+
+
+/* Create a named pipe and tell libevent to monitor it */
+int init_fifo (GlobalInfo *g) {
+  struct stat st;
+  char *fifo = "hiper.fifo";
+  int socket;
+
+  fprintf(MSG_OUT, "Creating named pipe \"%s\"\n", fifo);
+  if (lstat (fifo, &st) == 0) {
+    if ((st.st_mode & S_IFMT) == S_IFREG) {
+      errno = EEXIST;
+      perror("lstat");
+      exit (1);
+    }
+  }
+  unlink(fifo);
+  if (mkfifo (fifo, 0600) == -1) {
+    perror("mkfifo");
+    exit (1);
+  }
+  socket = open(fifo, O_RDWR | O_NONBLOCK, 0);
+  if (socket == -1) {
+     perror("open");
+     exit (1);
+  }
+  g->input = fdopen(socket, "r");
+
+  fprintf(MSG_OUT, "Now, pipe some URL's into > %s\n", fifo);
+  event_set(&g->fifo_event, socket, EV_READ | EV_PERSIST, fifo_cb, g);
+  event_add(&g->fifo_event, NULL);
+  return (0);
+}
+
+
+
+int main(int argc, char **argv)
+{
+  GlobalInfo g;
+  CURLMcode rc;
+
+  memset(&g, 0, sizeof(GlobalInfo));
+  event_init();
+  init_fifo(&g);
+  g.multi = curl_multi_init();
+  evtimer_set(&g.timer_event, timer_cb, &g);
+  curl_multi_setopt(g.multi, CURLMOPT_SOCKETFUNCTION, sock_cb);
+  curl_multi_setopt(g.multi, CURLMOPT_SOCKETDATA, &g);
+  do {
+    rc = curl_multi_socket_all(g.multi, &g.still_running);
+  } while (CURLM_CALL_MULTI_PERFORM == rc);
+  update_timeout(&g);
+  event_dispatch();
+  curl_multi_cleanup(g.multi);
+  return 0;
+}
--- a/docs/examples/httpput.c
+++ b/docs/examples/httpput.c
@@ -87,8 +87,10 @@ int main(int argc, char **argv)
    /* now specify which file to upload */
    curl_easy_setopt(curl, CURLOPT_READDATA, hd_src);

-    /* and give the size of the upload */
-    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, file_info.st_size);
+    /* provide the size of the upload, we specicially typecast the value
+       to curl_off_t since we must be sure to use the correct data size */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE,
+                     (curl_off_t)file_info.st_size);

    /* Now run off and do what you've been told! */
    res = curl_easy_perform(curl);
--- a/docs/examples/makefile.dj
+++ b/docs/examples/makefile.dj
@@ -15,13 +15,13 @@ endif

 LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a

-PROGRAMS  = fopen.exe ftpget.exe ftpgetresp.exe ftpupload.exe \
-            getinmemory.exe http-post.exe httpput.exe multi-app.exe \
-            multi-double.exe multi-post.exe multi-single.exe \
-            persistant.exe post-callback.exe postit2.exe \
-            sepheaders.exe simple.exe simplessl.exe https.exe \
-            ftp3rdparty.exe getinfo.exe anyauthput.exe \
-            cookie_interface.exe
+CSOURCES = fopen.c ftpget.c ftpgetresp.c ftpupload.c getinmemory.c \
+           http-post.c httpput.c multi-app.c multi-double.c multi-post.c \
+           multi-single.c persistant.c post-callback.c postit2.c \
+           sepheaders.c simple.c simplessl.c https.c ftp3rdparty.c \
+           getinfo.c anyauthput.c cookie_interface.c 10-at-a-time.c
+
+PROGRAMS = $(CSOURCES:.c=.exe)

 all: $(PROGRAMS)

@@ -32,3 +32,5 @@ all: $(PROGRAMS)
 clean:
 	rm -f $(PROGRAMS)

+# DO NOT DELETE THIS LINE
+
--- a/docs/examples/multi-app.c
+++ b/docs/examples/multi-app.c
@@ -80,6 +80,10 @@ int main(int argc, char **argv)
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);

+    /* In a real-world program you OF COURSE check the return code of the
+       function calls, *and* you make sure that maxfd is bigger than -1 so
+       that the call to select() below makes sense! */
+
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);

    switch(rc) {
--- a/docs/examples/multi-debugcallback.c
+++ b/docs/examples/multi-debugcallback.c
@@ -153,6 +153,10 @@ int main(int argc, char **argv)
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);

+    /* In a real-world program you OF COURSE check the return code of the
+       function calls, *and* you make sure that maxfd is bigger than -1
+       so that the call to select() below makes sense! */
+
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);

    switch(rc) {
--- a/docs/examples/multi-double.c
+++ b/docs/examples/multi-double.c
@@ -71,6 +71,10 @@ int main(int argc, char **argv)
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);

+    /* In a real-world program you OF COURSE check the return code of the
+       function calls, *and* you make sure that maxfd is bigger than -1 so
+       that the call to select() below makes sense! */
+
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);

    switch(rc) {
--- a/docs/examples/multi-post.c
+++ b/docs/examples/multi-post.c
@@ -24,12 +24,13 @@ int main(int argc, char *argv[])
  CURLM *multi_handle;
  int still_running;

-  struct HttpPost *formpost=NULL;
-  struct HttpPost *lastptr=NULL;
+  struct curl_httppost *formpost=NULL;
+  struct curl_httppost *lastptr=NULL;
  struct curl_slist *headerlist=NULL;
  char buf[] = "Expect:";

-  /* Fill in the file upload field */
+  /* Fill in the file upload field. This makes libcurl load data from  
+     the given file name when curl_easy_perform() is called. */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "sendfile",
@@ -43,7 +44,6 @@ int main(int argc, char *argv[])
               CURLFORM_COPYCONTENTS, "postit2.c",
               CURLFORM_END);

-
  /* Fill in the submit field too, even if this is rarely needed */
  curl_formadd(&formpost,
               &lastptr,
@@ -93,6 +93,10 @@ int main(int argc, char *argv[])
      /* get file descriptors from the transfers */
      curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);

+      /* In a real-world program you OF COURSE check the return code of the
+         function calls, *and* you make sure that maxfd is bigger than -1
+         so that the call to select() below makes sense! */
+
      rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);

      switch(rc) {
--- a/docs/examples/multi-single.c
+++ b/docs/examples/multi-single.c
@@ -65,6 +65,10 @@ int main(int argc, char **argv)
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);

+    /* In a real-world program you OF COURSE check the return code of the
+       function calls, *and* you make sure that maxfd is bigger than -1 so
+       that the call to select() below makes sense! */
+
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);

    switch(rc) {
--- a/docs/examples/sampleconv.c
+++ b/docs/examples/sampleconv.c
@@ -0,0 +1,95 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+/*
+   This is a simple example showing how a program on a non-ASCII platform
+   would invoke callbacks to do its own codeset conversions instead of 
+   using the built-in iconv functions in libcurl.
+
+   The IBM-1047 EBCDIC codeset is used for this example but the code
+   would be similar for other non-ASCII codesets.
+
+   Three callback functions are created below:
+        my_conv_from_ascii_to_ebcdic,
+        my_conv_from_ebcdic_to_ascii, and
+        my_conv_from_utf8_to_ebcdic
+
+   The "platform_xxx" calls represent platform-specific conversion routines.
+
+ */
+
+#include <stdio.h>
+#include <curl/curl.h>
+
+CURLcode my_conv_from_ascii_to_ebcdic(char *buffer, size_t length)
+{
+    char *tempptrin, *tempptrout;
+    size_t bytes = length;
+    int rc;
+    tempptrin = tempptrout = buffer;
+    rc = platform_a2e(&tempptrin, &bytes, &tempptrout, &bytes);
+    if (rc == PLATFORM_CONV_OK) {
+      return(CURLE_OK);
+    } else {
+      return(CURLE_CONV_FAILED);
+    }
+}
+
+CURLcode my_conv_from_ebcdic_to_ascii(char *buffer, size_t length)
+{
+    char *tempptrin, *tempptrout;
+    size_t bytes = length;
+    int rc;
+    tempptrin = tempptrout = buffer;
+    rc = platform_e2a(&tempptrin, &bytes, &tempptrout, &bytes);
+    if (rc == PLATFORM_CONV_OK) {
+      return(CURLE_OK);
+    } else {
+      return(CURLE_CONV_FAILED);
+    }
+}
+
+CURLcode my_conv_from_utf8_to_ebcdic(char *buffer, size_t length)
+{
+    char *tempptrin, *tempptrout;
+    size_t bytes = length;
+    int rc;
+    tempptrin = tempptrout = buffer;
+    rc = platform_u2e(&tempptrin, &bytes, &tempptrout, &bytes);
+    if (rc == PLATFORM_CONV_OK) {
+      return(CURLE_OK);
+    } else {
+      return(CURLE_CONV_FAILED);
+    }
+}
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(curl) {
+    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
+
+    /* use platform-specific functions for codeset conversions */
+    curl_easy_setopt(curl, CURLOPT_CONV_FROM_NETWORK_FUNCTION,
+                     my_conv_from_ascii_to_ebcdic);
+    curl_easy_setopt(curl, CURLOPT_CONV_TO_NETWORK_FUNCTION,
+                     my_conv_from_ebcdic_to_ascii);
+    curl_easy_setopt(curl, CURLOPT_CONV_FROM_UTF8_FUNCTION,
+                     my_conv_from_utf8_to_ebcdic);
+
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}
--- a/docs/examples/sepheaders.c
+++ b/docs/examples/sepheaders.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
@@ -41,9 +41,6 @@ int main(int argc, char **argv)
  /* no progress meter please */
  curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1);

-  /* shut up completely */
-  curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1);
-
  /* send all data to this function  */
  curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_data);

--- a/docs/examples/synctime.c
+++ b/docs/examples/synctime.c
@@ -9,6 +9,18 @@
 *
 * This example code only builds as-is on Windows.
 *
+ * While Unix/Linux user, you do not need this software.
+ * You can achieve the same result as synctime using curl, awk and date.
+ * Set proxy as according to your network, but beware of proxy Cache-Control.
+ *
+ * To set your system clock, root access is required.
+ * # date -s "`curl -sI http://nist.time.gov/timezone.cgi?UTC/s/0 \
+ *        | awk -F': ' '/Date: / {print $2}'`"
+ *
+ * To view remote webserver date and time.
+ * $ curl -sI http://nist.time.gov/timezone.cgi?UTC/s/0 \
+ *        | awk -F': ' '/Date: / {print $2}'
+ *
 * Synchronising your computer clock via Internet time server usually relies
 * on DAYTIME, TIME, or NTP protocols. These protocols provide good accurate
 * time synchronisation but it does not work very well through a
@@ -59,7 +71,9 @@

 #include <stdio.h>
 #include <time.h>
+#ifndef __CYGWIN__
 #include <windows.h>
+#endif
 #include <curl/curl.h>


@@ -298,10 +312,11 @@ int main(int argc, char *argv[])
             MthStr[LOCALTime.wMonth-1], LOCALTime.wYear,
             LOCALTime.wHour, LOCALTime.wMinute, LOCALTime.wSecond,
             LOCALTime.wMilliseconds);
-    fprintf(stderr, "\nBefore HTTP. Date: %s%s\n\n", timeBuf, tzoneBuf);
+
+    fprintf(stderr, "Fetch: %s\n\n", conf->timeserver);
+    fprintf(stderr, "Before HTTP. Date: %s%s\n\n", timeBuf, tzoneBuf);

    /* HTTP HEAD command to the Webserver */
-    fprintf(stderr, "Fetch: %s\n", conf->timeserver);
    SyncTime_CURL_Fetch(curl, conf->timeserver, "index.htm",
                        HTTP_COMMAND_HEAD);

--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -4,51 +4,56 @@

 AUTOMAKE_OPTIONS = foreign no-dependencies

-man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3	\
- curl_easy_perform.3 curl_easy_setopt.3 curl_easy_duphandle.3		\
- curl_formadd.3 curl_formfree.3 curl_getdate.3 curl_getenv.3		\
- curl_slist_append.3 curl_slist_free_all.3 curl_version.3		\
- curl_version_info.3 curl_escape.3 curl_unescape.3 curl_free.3		\
- curl_strequal.3 curl_mprintf.3 curl_global_init.3			\
- curl_global_cleanup.3 curl_multi_add_handle.3 curl_multi_cleanup.3	\
- curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3		\
- curl_multi_perform.3 curl_multi_remove_handle.3 curl_share_cleanup.3	\
- curl_share_init.3 curl_share_setopt.3 libcurl.3 libcurl-easy.3		\
- libcurl-multi.3 libcurl-share.3 libcurl-errors.3 curl_easy_strerror.3	\
- curl_multi_strerror.3 curl_share_strerror.3 curl_global_init_mem.3	\
- libcurl-tutorial.3 curl_easy_reset.3
+man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3	 \
+ curl_easy_perform.3 curl_easy_setopt.3 curl_easy_duphandle.3		 \
+ curl_formadd.3 curl_formfree.3 curl_getdate.3 curl_getenv.3		 \
+ curl_slist_append.3 curl_slist_free_all.3 curl_version.3		 \
+ curl_version_info.3 curl_escape.3 curl_unescape.3 curl_free.3		 \
+ curl_strequal.3 curl_mprintf.3 curl_global_init.3 curl_global_cleanup.3 \
+ curl_multi_add_handle.3 curl_multi_cleanup.3 curl_multi_fdset.3	 \
+ curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3		 \
+ curl_multi_remove_handle.3 curl_share_cleanup.3 curl_share_init.3	 \
+ curl_share_setopt.3 libcurl.3 libcurl-easy.3 libcurl-multi.3		 \
+ libcurl-share.3 libcurl-errors.3 curl_easy_strerror.3			 \
+ curl_multi_strerror.3 curl_share_strerror.3 curl_global_init_mem.3	 \
+ libcurl-tutorial.3 curl_easy_reset.3 curl_easy_escape.3		 \
+ curl_easy_unescape.3 curl_multi_setopt.3 curl_multi_socket.3		 \
+ curl_multi_timeout.3 curl_formget.3 curl_multi_assign.3

-HTMLPAGES = curl_easy_cleanup.html curl_easy_getinfo.html		\
- curl_easy_init.html curl_easy_perform.html curl_easy_setopt.html	\
- curl_easy_duphandle.html curl_formadd.html curl_formfree.html		\
- curl_getdate.html curl_getenv.html curl_slist_append.html		\
- curl_slist_free_all.html curl_version.html curl_version_info.html	\
- curl_escape.html curl_unescape.html curl_free.html curl_strequal.html	\
- curl_mprintf.html curl_global_init.html curl_global_cleanup.html	\
- curl_multi_add_handle.html curl_multi_cleanup.html			\
- curl_multi_fdset.html curl_multi_info_read.html curl_multi_init.html	\
- curl_multi_perform.html curl_multi_remove_handle.html			\
- curl_share_cleanup.html curl_share_init.html curl_share_setopt.html	\
- libcurl.html libcurl-multi.html libcurl-easy.html libcurl-share.html	\
- libcurl-errors.html curl_easy_strerror.html curl_multi_strerror.html	\
- curl_share_strerror.html curl_global_init_mem.html			\
- libcurl-tutorial.html curl_easy_reset.html
+HTMLPAGES = curl_easy_cleanup.html curl_easy_getinfo.html		  \
+ curl_easy_init.html curl_easy_perform.html curl_easy_setopt.html	  \
+ curl_easy_duphandle.html curl_formadd.html curl_formfree.html		  \
+ curl_getdate.html curl_getenv.html curl_slist_append.html		  \
+ curl_slist_free_all.html curl_version.html curl_version_info.html	  \
+ curl_escape.html curl_unescape.html curl_free.html curl_strequal.html	  \
+ curl_mprintf.html curl_global_init.html curl_global_cleanup.html	  \
+ curl_multi_add_handle.html curl_multi_cleanup.html curl_multi_fdset.html \
+ curl_multi_info_read.html curl_multi_init.html curl_multi_perform.html	  \
+ curl_multi_remove_handle.html curl_share_cleanup.html			  \
+ curl_share_init.html curl_share_setopt.html libcurl.html		  \
+ libcurl-multi.html libcurl-easy.html libcurl-share.html		  \
+ libcurl-errors.html curl_easy_strerror.html curl_multi_strerror.html	  \
+ curl_share_strerror.html curl_global_init_mem.html libcurl-tutorial.html \
+ curl_easy_reset.html curl_easy_escape.html curl_easy_unescape.html	  \
+ curl_multi_setopt.html curl_multi_socket.html curl_multi_timeout.html	  \
+ curl_formget.html curl_multi_assign.html

-PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.pdf			\
- curl_easy_init.pdf curl_easy_perform.pdf curl_easy_setopt.pdf		\
- curl_easy_duphandle.pdf curl_formadd.pdf curl_formfree.pdf		\
- curl_getdate.pdf curl_getenv.pdf curl_slist_append.pdf			\
- curl_slist_free_all.pdf curl_version.pdf curl_version_info.pdf		\
- curl_escape.pdf curl_unescape.pdf curl_free.pdf curl_strequal.pdf	\
- curl_mprintf.pdf curl_global_init.pdf curl_global_cleanup.pdf		\
- curl_multi_add_handle.pdf curl_multi_cleanup.pdf curl_multi_fdset.pdf	\
- curl_multi_info_read.pdf curl_multi_init.pdf curl_multi_perform.pdf	\
- curl_multi_remove_handle.pdf curl_share_cleanup.pdf			\
- curl_share_init.pdf curl_share_setopt.pdf libcurl.pdf			\
- libcurl-multi.pdf libcurl-easy.pdf libcurl-share.pdf			\
- libcurl-errors.pdf curl_easy_strerror.pdf curl_multi_strerror.pdf	\
- curl_share_strerror.pdf curl_global_init_mem.pdf libcurl-tutorial.pdf	\
- curl_easy_reset.pdf
+PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.pdf curl_easy_init.pdf \
+ curl_easy_perform.pdf curl_easy_setopt.pdf curl_easy_duphandle.pdf	  \
+ curl_formadd.pdf curl_formfree.pdf curl_getdate.pdf curl_getenv.pdf	  \
+ curl_slist_append.pdf curl_slist_free_all.pdf curl_version.pdf		  \
+ curl_version_info.pdf curl_escape.pdf curl_unescape.pdf curl_free.pdf	  \
+ curl_strequal.pdf curl_mprintf.pdf curl_global_init.pdf		  \
+ curl_global_cleanup.pdf curl_multi_add_handle.pdf curl_multi_cleanup.pdf \
+ curl_multi_fdset.pdf curl_multi_info_read.pdf curl_multi_init.pdf	  \
+ curl_multi_perform.pdf curl_multi_remove_handle.pdf			  \
+ curl_share_cleanup.pdf curl_share_init.pdf curl_share_setopt.pdf	  \
+ libcurl.pdf libcurl-multi.pdf libcurl-easy.pdf libcurl-share.pdf	  \
+ libcurl-errors.pdf curl_easy_strerror.pdf curl_multi_strerror.pdf	  \
+ curl_share_strerror.pdf curl_global_init_mem.pdf libcurl-tutorial.pdf	  \
+ curl_easy_reset.pdf curl_easy_escape.pdf curl_easy_unescape.pdf	  \
+ curl_multi_setopt.pdf curl_multi_socket.pdf curl_multi_timeout.pdf	  \
+ curl_formget.pdf curl_multi_assign.pdf

 CLEANFILES = $(HTMLPAGES) $(PDFPAGES)

--- a/docs/libcurl/curl_easy_cleanup.3
+++ b/docs/libcurl/curl_easy_cleanup.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_easy_cleanup 3 "13 Nov 2002" "libcurl 7.7" "libcurl Manual"
+.TH curl_easy_cleanup 3 "12 Oct 2006" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_easy_cleanup - End a libcurl easy session
 .SH SYNOPSIS
@@ -21,6 +21,9 @@ more files.

 When you've called this, you can safely remove all the strings you've
 previously told libcurl to use, as it won't use them anymore now.
+
+Any uses of the \fBhandle\fP after this function has been called are
+illegal. This kills the handle and all memory associated with it!
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
--- a/docs/libcurl/curl_easy_escape.3
+++ b/docs/libcurl/curl_easy_escape.3
@@ -0,0 +1,47 @@
+.\" **************************************************************************
+.\" *                                  _   _ ____  _
+.\" *  Project                     ___| | | |  _ \| |
+.\" *                             / __| | | | |_) | |
+.\" *                            | (__| |_| |  _ <| |___
+.\" *                             \___|\___/|_| \_\_____|
+.\" *
+.\" * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" *
+.\" * This software is licensed as described in the file COPYING, which
+.\" * you should have received as part of this distribution. The terms
+.\" * are also available at http://curl.haxx.se/docs/copyright.html.
+.\" *
+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+.\" * copies of the Software, and permit persons to whom the Software is
+.\" * furnished to do so, under the terms of the COPYING file.
+.\" *
+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+.\" * KIND, either express or implied.
+.\" *
+.\" * $Id$
+.\" **************************************************************************
+.\"
+.TH curl_easy_escape 3 "7 April 2006" "libcurl 7.15.4" "libcurl Manual"
+.SH NAME
+curl_easy_escape - URL encodes the given string
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_easy_escape( CURL *" curl ", char *" url ", int "length " );"
+.ad
+.SH DESCRIPTION
+This function converts the given input string to an URL encoded string and
+returns that as a new allocated string. All input characters that are not a-z,
+A-Z or 0-9 are converted to their "URL escaped" version (%NN where NN is a
+two-digit hexadecimal number).
+
+If the \fBlength\fP argument is set to 0 (zero), curl_easy_escape() uses
+strlen() on the input \fBurl\fP to find out the size.
+
+You must \fIcurl_free(3)\fP the returned string when you're done with it.
+.SH AVAILABILITY
+Added in 7.15.4 and replaces the old curl_escape() function.
+.SH RETURN VALUE
+A pointer to a zero terminated string or NULL if it failed.
+.SH "SEE ALSO"
+.BR curl_easy_unescape "(3), " curl_free "(3), " RFC 2396
--- a/docs/libcurl/curl_easy_getinfo.3
+++ b/docs/libcurl/curl_easy_getinfo.3
@@ -1,8 +1,27 @@
-.\" You can view this file with:
-.\" nroff -man [file]
-.\" $Id$
+.\" **************************************************************************
+.\" *                                  _   _ ____  _
+.\" *  Project                     ___| | | |  _ \| |
+.\" *                             / __| | | | |_) | |
+.\" *                            | (__| |_| |  _ <| |___
+.\" *                             \___|\___/|_| \_\_____|
+.\" *
+.\" * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" *
+.\" * This software is licensed as described in the file COPYING, which
+.\" * you should have received as part of this distribution. The terms
+.\" * are also available at http://curl.haxx.se/docs/copyright.html.
+.\" *
+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+.\" * copies of the Software, and permit persons to whom the Software is
+.\" * furnished to do so, under the terms of the COPYING file.
+.\" *
+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+.\" * KIND, either express or implied.
+.\" *
+.\" * $Id$
+.\" **************************************************************************
 .\"
-.TH curl_easy_getinfo 3 "6 Oct 2005" "libcurl 7.12.3" "libcurl Manual"
+.TH curl_easy_getinfo 3 "21 Mar 2006" "libcurl 7.15.4" "libcurl Manual"
 .SH NAME
 curl_easy_getinfo - extract information from a curl handle
 .SH SYNOPSIS
@@ -44,10 +63,8 @@ information before the transfer is made, by using the CURLOPT_FILETIME option
 to \fIcurl_easy_setopt(3)\fP or you will unconditionally get a -1 back. (Added
 in 7.5)
 .IP CURLINFO_TOTAL_TIME
-Pass a pointer to a double to receive the total transaction time in seconds
-for the previous transfer. This time does not include the connect time, so if
-you want the complete operation time, you should add the
-CURLINFO_CONNECT_TIME.
+Pass a pointer to a double to receive the total time in seconds for the
+previous transfer, including name resolving, TCP connect etc.
 .IP CURLINFO_NAMELOOKUP_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the name resolving was completed.
@@ -148,17 +165,22 @@ working with the socket, you must call curl_easy_cleanup() as usual and let
 libcurl close the socket and cleanup other resources associated with the
 handle. This is typically used in combination with \fICURLOPT_CONNECT_ONLY\fP.
 (Added in 7.15.2)
+.IP CURLINFO_FTP_ENTRY_PATH
+Pass a pointer to a 'char *' to receive a pointer to a string holding the path
+of the entry path. That is the initial path libcurl ended up in when logging
+on to the remote FTP server. This stores a NULL as pointer if something is
+wrong. (Added in 7.15.4)
 .SH TIMES
 .NF
 An overview of the six time values available from curl_easy_getinfo()

-curk_easy_perform()
+curl_easy_perform()
    |
    |--NT
    |--|--CT
    |--|--|--PT
    |--|--|--|--ST
-          |--|--|--TT
+    |--|--|--|--|--TT
    |--|--|--|--|--RT
 .FI
 .IP NT
@@ -175,9 +197,7 @@ and negotiations that are specific to the particular protocol(s) involved.
 \fICURLINFO_STARTTRANSFER_TIME\fP. The time it took from the start until the
 first byte is just about to be transferred.
 .IP TT
-\fICURLINFO_TOTAL_TIME\fP. Time of the previous transfer. This time does not
-include the connect time (CT), so if you want the complete operation time, you
-should add that.
+\fICURLINFO_TOTAL_TIME\fP. Total time of the previous request.
 .IP RT
 \fICURLINFO_REDIRECT_TIME\fP. The time it took for all redirection steps
 include name lookup, connect, pretransfer and transfer before final
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -5,7 +5,7 @@
 .\" *                            | (__| |_| |  _ <| |___
 .\" *                             \___|\___/|_| \_\_____|
 .\" *
-.\" * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
 .\" *
 .\" * This software is licensed as described in the file COPYING, which
 .\" * you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH curl_easy_setopt 3 "21 Feb 2006" "libcurl 7.15.2" "libcurl Manual"
+.TH curl_easy_setopt 3 "2 Nov 2006" "libcurl 7.16.1" "libcurl Manual"
 .SH NAME
 curl_easy_setopt \- set options for a curl easy handle
 .SH SYNOPSIS
@@ -160,20 +160,37 @@ found in \fI<curl/curl.h>\fP. This function gets called by libcurl when
 something special I/O-related needs to be done that the library can't do by
 itself. For now, rewinding the read data stream is the only action it can
 request. The rewinding of the read data stream may be necessary when doing a
-HTTP PUT or POST with a multi-pass authentication method.  (Opion added in
+HTTP PUT or POST with a multi-pass authentication method.  (Option added in
 7.12.3)
 .IP CURLOPT_IOCTLDATA
 Pass a pointer that will be untouched by libcurl and passed as the 3rd
 argument in the ioctl callback set with \fICURLOPT_IOCTLFUNCTION\fP.  (Option
 added in 7.12.3)
+.IP CURLOPT_SOCKOPTFUNCTION
+Function pointer that should match the \fIcurl_sockopt_callback\fP prototype
+found in \fI<curl/curl.h>\fP. This function gets called by libcurl after the
+socket() call but before the connect() call. The callback's \fIpurpose\fP
+argument identifies the exact purpose for this particular socket, and
+currently only one value is supported: \fICURLSOCKTYPE_IPCXN\fP for the
+primary connection (meaning the control connection in the FTP case). Future
+versions of libcurl may support more purposes. It passes the newly created
+socket descriptor so additional setsockopt() calls can be done at the user's
+discretion.  A non-zero return code from the callback function will signal an
+unrecoverable error to the library and it will close the socket and return
+\fICURLE_COULDNT_CONNECT\fP.  (Option added in 7.15.6.)
+.IP CURLOPT_SOCKOPTDATA
+Pass a pointer that will be untouched by libcurl and passed as the first
+argument in the sockopt callback set with \fICURLOPT_SOCKOPTFUNCTION\fP.
+(Option added in 7.15.6.)
 .IP CURLOPT_PROGRESSFUNCTION
 Function pointer that should match the \fIcurl_progress_callback\fP prototype
 found in \fI<curl/curl.h>\fP. This function gets called by libcurl instead of
-its internal equivalent with a frequent interval during data transfer (roughly
-once per second).  Unknown/unused argument values pass to the callback will be
-set to zero (like if you only download data, the upload size will remain
-0). Returning a non-zero value from this callback will cause libcurl to abort
-the transfer and return \fICURLE_ABORTED_BY_CALLBACK\fP.
+its internal equivalent with a frequent interval during operation (roughly
+once per second) no matter if data is being transfered or not.  Unknown/unused
+argument values passed to the callback will be set to zero (like if you only
+download data, the upload size will remain 0). Returning a non-zero value from
+this callback will cause libcurl to abort the transfer and return
+\fICURLE_ABORTED_BY_CALLBACK\fP.

 If you transfer data with the multi interface, this function will not be
 called during periods of idleness unless you call the appropriate libcurl
@@ -263,6 +280,51 @@ and trust file settings.
 Data pointer to pass to the ssl context callback set by the option
 \fICURLOPT_SSL_CTX_FUNCTION\fP, this is the pointer you'll get as third
 parameter, otherwise \fBNULL\fP. (Added in 7.11.0)
+.IP CURLOPT_CONV_TO_NETWORK_FUNCTION
+.IP CURLOPT_CONV_FROM_NETWORK_FUNCTION
+.IP CURLOPT_CONV_FROM_UTF8_FUNCTION
+Function pointers that should match the following prototype: CURLcode
+function(char *ptr, size_t length);
+
+These three options apply to non-ASCII platforms only.  They are available
+only if \fBCURL_DOES_CONVERSIONS\fP was defined when libcurl was built. When
+this is the case, \fIcurl_version_info(3)\fP will return the CURL_VERSION_CONV
+feature bit set.
+
+The data to be converted is in a buffer pointed to by the ptr parameter.  The
+amount of data to convert is indicated by the length parameter.  The converted
+data overlays the input data in the buffer pointed to by the ptr parameter.
+CURLE_OK should be returned upon successful conversion.  A CURLcode return
+value defined by curl.h, such as CURLE_CONV_FAILED, should be returned if an
+error was encountered.
+
+\fBCURLOPT_CONV_TO_NETWORK_FUNCTION\fP and
+\fBCURLOPT_CONV_FROM_NETWORK_FUNCTION\fP convert between the host encoding and
+the network encoding.  They are used when commands or ASCII data are
+sent/received over the network.
+
+\fBCURLOPT_CONV_FROM_UTF8_FUNCTION\fP is called to convert from UTF8 into the
+host encoding.  It is required only for SSL processing.
+
+If you set a callback pointer to NULL, or don't set it at all, the built-in
+libcurl iconv functions will be used.  If HAVE_ICONV was not defined when
+libcurl was built, and no callback has been established, conversion will
+return the CURLE_CONV_REQD error code.
+
+If HAVE_ICONV is defined, CURL_ICONV_CODESET_OF_HOST must also be defined.
+For example:
+
+ \&#define CURL_ICONV_CODESET_OF_HOST "IBM-1047"
+
+The iconv code in libcurl will default the network and UTF8 codeset names as
+follows:
+
+ \&#define CURL_ICONV_CODESET_OF_NETWORK "ISO8859-1"
+
+ \&#define CURL_ICONV_CODESET_FOR_UTF8   "UTF-8"
+
+You will need to override these definitions if they are different on your
+system.
 .SH ERROR OPTIONS
 .IP CURLOPT_ERRORBUFFER
 Pass a char * to a buffer that the libcurl may store human readable error
@@ -282,6 +344,14 @@ when showing the progress meter and displaying \fICURLOPT_VERBOSE\fP data.
 A non-zero parameter tells the library to fail silently if the HTTP code
 returned is equal to or larger than 400. The default action would be to return
 the page normally, ignoring that code.
+
+This method is not fail-safe and there are occasions where non-succesful
+response codes will slip through, especially when authentication is involved
+(response codes 401 and 407).
+
+You might get some amounts of headers transferred before this situation is
+detected, like for when a "100-continue" is received as a response to a
+POST/PUT and a 401 or 407 is received immediately afterwards.
 .SH NETWORK OPTIONS
 .IP CURLOPT_URL
 The actual URL to deal with. The parameter should be a char * to a zero
@@ -295,7 +365,10 @@ given protocol of the set URL is not supported, libcurl will return on error
 \fIcurl_multi_perform(3)\fP. Use \fIcurl_version_info(3)\fP for detailed info
 on which protocols that are supported.

-\fICURLOPT_URL\fP is the only option that must be set before
+The string given to CURLOPT_URL must be url-encoded and following the RFC 2396
+(http://curl.haxx.se/rfc/rfc2396.txt).
+
+\fICURLOPT_URL\fP is the only option that \fBmust\fP be set before
 \fIcurl_easy_perform(3)\fP is called.
 .IP CURLOPT_PROXY
 Set HTTP proxy to use. The parameter should be a char * to a zero terminated
@@ -316,9 +389,10 @@ libcurl respects the environment variables \fBhttp_proxy\fP, \fBftp_proxy\fP,
 \fBall_proxy\fP etc, if any of those is set. The \fICURLOPT_PROXY\fP option
 does however override any possibly set environment variables.

-Starting with 7.14.1, the proxy host string can be specified the exact same
-way as the proxy environment variables, include protocol prefix (http://) and
-embedded user + password.
+Starting with 7.14.1, the proxy host string given in environment variables can
+be specified the exact same way as the proxy can be set with
+\fICURLOPT_PROXY\fP, include protocol prefix (http://) and embedded user +
+password.
 .IP CURLOPT_PROXYPORT
 Pass a long with this option to set the proxy port to connect to unless it is
 specified in the proxy string \fICURLOPT_PROXY\fP.
@@ -714,6 +788,8 @@ Pass a char * to a cookie string. Cookie can be either in Netscape / Mozilla
 format or just regular HTTP-style header (Set-Cookie: ...) format. If cURL
 cookie engine was not enabled it will enable its cookie engine.  Passing a
 magic string \&"ALL" will erase all cookies known by cURL. (Added in 7.14.1)
+Passing the special string \&"SESS" will only erase all session cookies known
+by cURL. (Added in 7.15.4)
 .IP CURLOPT_HTTPGET
 Pass a long. If the long is non-zero, this forces the HTTP request to get back
 to GET. usable if a POST, HEAD, PUT or a custom request have been used
@@ -770,7 +846,8 @@ Pass a pointer to a linked list of FTP commands to pass to the server after
 the transfer type is set. The linked list should be a fully valid list of
 struct curl_slist structs properly filled in as described for
 \fICURLOPT_QUOTE\fP. Disable this operation again by setting a NULL to this
-option.
+option. Before version 7.15.6, if you also set \fICURLOPT_NOBODY\fP non-zero,
+this option didn't work.
 .IP CURLOPT_FTPLISTONLY
 A non-zero parameter tells the library to just list the names of an ftp
 directory, instead of doing a full directory listing that would include file
@@ -809,6 +886,12 @@ waiting for a response, this value overrides \fICURLOPT_TIMEOUT\fP. It is
 recommended that if used in conjunction with \fICURLOPT_TIMEOUT\fP, you set
 \fICURLOPT_FTP_RESPONSE_TIMEOUT\fP to a value smaller than
 \fICURLOPT_TIMEOUT\fP.  (Added in 7.10.8)
+.IP CURLOPT_FTP_ALTERNATIVE_TO_USER
+Pass a char * as parameter, pointing to a string which will be used to
+authenticate if the usual FTP "USER user" and "PASS password" negotiation
+fails. This is currently only known to be required when connecting to
+Tumbleweed's Secure Transport FTPS server using client certificates for
+authentication. (Added in 7.15.5)
 .IP CURLOPT_FTP_SKIP_PASV_IP
 Pass a long. If set to a non-zero value, it instructs libcurl to not use the
 IP address the server suggests in its 227-response to libcurl's PASV command
@@ -842,22 +925,33 @@ Try "AUTH SSL" first, and only if that fails try "AUTH TLS"
 .IP CURLFTPAUTH_TLS
 Try "AUTH TLS" first, and only if that fails try "AUTH SSL"
 .RE
-.IP CURLOPT_SOURCE_URL
-When set, it enables a FTP third party transfer, using the set URL as source,
-while \fICURLOPT_URL\fP is the target.
-.IP CURLOPT_SOURCE_USERPWD
-Set "username:password" to use for the source connection when doing FTP third
-party transfers.
-.IP CURLOPT_SOURCE_QUOTE
-Exactly like \fICURLOPT_QUOTE\fP, but for the source host.
-.IP CURLOPT_SOURCE_PREQUOTE
-Exactly like \fICURLOPT_PREQUOTE\fP, but for the source host.
-.IP CURLOPT_SOURCE_POSTQUOTE
-Exactly like \fICURLOPT_POSTQUOTE\fP, but for the source host.
+.IP CURLOPT_FTP_SSL_CCC
+Pass a long that is set to 0 to disable and 1 to enable. If enabled, this
+option makes libcurl use CCC (Clear Command Channel). It shuts down the
+SSL/TLS layer after authenticating. The rest of the control channel
+communication will be unencrypted. This allows NAT routers to follow the FTP
+transaction.  (Added in 7.16.1)
 .IP CURLOPT_FTP_ACCOUNT
 Pass a pointer to a zero-terminated string (or NULL to disable). When an FTP
 server asks for "account data" after user name and password has been provided,
 this data is sent off using the ACCT command. (Added in 7.13.0)
+.IP CURLOPT_FTP_FILEMETHOD
+Pass a long that should have one of the following values. This option controls
+what method libcurl should use to reach a file on a FTP(S) server. The
+argument should be one of the following alternatives:
+.RS
+.IP CURLFTPMETHOD_MULTICWD
+libcurl does a single CWD operation for each path part in the given URL. For
+deep hierarchies this means very many commands. This is how RFC1738 says it
+should be done. This is the default but the slowest behavior.
+.IP CURLFTPMETHOD_NOCWD
+libcurl does no CWD at all. libcurl will do SIZE, RETR, STOR etc and give a
+full path to the server for all these commands. This is the fastest behavior.
+.IP CURLFTPMETHOD_SINGLECWD
+libcurl does one CWD with the full target directory and then operates on the
+file \&"normally" (like in the multicwd case). This is somewhat more standards
+compliant than 'nocwd' but without the full penalty of 'multicwd'.
+.RE
 .SH PROTOCOL OPTIONS
 .IP CURLOPT_TRANSFERTEXT
 A non-zero parameter tells the library to use ASCII mode for ftp transfers,
@@ -881,7 +975,9 @@ techniques). Pass a NULL to this option to disable the use of ranges.
 .IP CURLOPT_RESUME_FROM
 Pass a long as parameter. It contains the offset in number of bytes that you
 want the transfer to start from. Set this option to 0 to make the transfer
-start from the beginning (effectively disabling resume).
+start from the beginning (effectively disabling resume). For FTP, set this
+option to -1 to make the transfer start from the end of the target file
+(useful to continue an interrupted upload).
 .IP CURLOPT_RESUME_FROM_LARGE
 Pass a curl_off_t as parameter. It contains the offset in number of bytes that
 you want the transfer to start from. (Added in 7.11.0)
@@ -918,15 +1014,21 @@ to POST with \fICURLOPT_POST\fP etc.
 When uploading a file to a remote site, this option should be used to tell
 libcurl what the expected size of the infile is. This value should be passed
 as a long. See also \fICURLOPT_INFILESIZE_LARGE\fP.
+
+Note that this option does not limit how much data libcurl will actually send,
+as that is controlled entirely by what the read callback returns.
 .IP CURLOPT_INFILESIZE_LARGE
 When uploading a file to a remote site, this option should be used to tell
 libcurl what the expected size of the infile is.  This value should be passed
 as a curl_off_t. (Added in 7.11.0)
+
+Note that this option does not limit how much data libcurl will actually send,
+as that is controlled entirely by what the read callback returns.
 .IP CURLOPT_UPLOAD
 A non-zero parameter tells the library to prepare for an upload. The
-\fICURLOPT_READDATA\fP and \fICURLOPT_INFILESIZEE\fP or
-\fICURLOPT_INFILESIZE_LARGE\fP are also interesting for uploads. If the
-protocol is HTTP, uploading means using the PUT request unless you tell
+\fICURLOPT_READDATA\fP and \fICURLOPT_INFILESIZE\fP or
+\fICURLOPT_INFILESIZE_LARGE\fP options are also interesting for uploads. If
+the protocol is HTTP, uploading means using the PUT request unless you tell
 libcurl otherwise.

 Using PUT with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
@@ -984,6 +1086,16 @@ for the library to consider it too slow and abort.
 Pass a long as parameter. It contains the time in seconds that the transfer
 should be below the \fICURLOPT_LOW_SPEED_LIMIT\fP for the library to consider
 it too slow and abort.
+.IP CURLOPT_MAX_SEND_SPEED_LARGE
+Pass a curl_off_t as parameter.  If an upload exceeds this speed on cumulative
+average during the transfer, the transfer will pause to keep the average rate
+less than or equal to the parameter value.  Defaults to unlimited
+speed. (Added in 7.15.5)
+.IP CURLOPT_MAX_RECV_SPEED_LARGE
+Pass a curl_off_t as parameter.  If an upload exceeds this speed on cumulative
+average during the transfer, the transfer will pause to keep the average rate
+less than or equal to the parameter value. Defaults to unlimited speed. (Added
+in 7.15.5)
 .IP CURLOPT_MAXCONNECTS
 Pass a long. The set number will be the persistent connection cache size. The
 set amount will be the maximum amount of simultaneously open connections that
@@ -992,23 +1104,14 @@ value unless you are perfectly aware of how this work and changes libcurl's
 behaviour. This concerns connection using any of the protocols that support
 persistent connections.

-When reaching the maximum limit, curl uses the \fICURLOPT_CLOSEPOLICY\fP to
-figure out which of the existing connections to close to prevent the number of
-open connections to increase.
+When reaching the maximum limit, curl closes the oldest one in the cache to
+prevent the number of open connections to increase.

 If you already have performed transfers with this curl handle, setting a
 smaller MAXCONNECTS than before may cause open connections to get closed
 unnecessarily.
 .IP CURLOPT_CLOSEPOLICY
-Pass a long. This option sets what policy libcurl should use when the
-connection cache is filled and one of the open connections has to be closed to
-make room for a new connection. This must be one of the CURLCLOSEPOLICY_*
-defines. Use \fICURLCLOSEPOLICY_LEAST_RECENTLY_USED\fP to make libcurl close
-the connection that was least recently used, that connection is also least
-likely to be capable of re-use. Use \fICURLCLOSEPOLICY_OLDEST\fP to make
-libcurl close the oldest connection, the one that was created first among the
-ones in the connection cache. The other close policies are not support
-yet.
+(Obsolete) This option does nothing.
 .IP CURLOPT_FRESH_CONNECT
 Pass a long. Set to non-zero to make the next transfer use a new (fresh)
 connection by force. If the connection cache is full before this connection,
@@ -1044,7 +1147,7 @@ Resolve to ipv4 addresses.
 .IP CURL_IPRESOLVE_V6
 Resolve to ipv6 addresses.
 .RE
-.SH CURLOPT_CONNECT_ONLY
+.IP CURLOPT_CONNECT_ONLY
 Pass a long. A non-zero parameter tells the library to perform any required
 proxy authentication and connection setup, but no data transfer.

@@ -1142,15 +1245,18 @@ certificates to verify the peer with.  This makes sense only when used in
 combination with the \fICURLOPT_SSL_VERIFYPEER\fP option.  If
 \fICURLOPT_SSL_VERIFYPEER\fP is zero, \fICURLOPT_CAINFO\fP need not
 even indicate an accessible file.
+
+Note that option is by default set to the system path where libcurl's cacert
+bundle is assumed to be stored, as established at build time.
 .IP CURLOPT_CAPATH
-Pass a char * to a zero terminated string naming a directory holding
-multiple CA certificates to verify the peer with. The certificate
-directory must be prepared using the openssl c_rehash utility. This
-makes sense only when used in combination with the
-\fICURLOPT_SSL_VERIFYPEER\fP option.  If \fICURLOPT_SSL_VERIFYPEER\fP
-is zero, \fICURLOPT_CAPATH\fP need not even indicate an accessible
-path.  The \fICURLOPT_CAPATH\fP function apparently does not work in
-Windows due to some limitation in openssl. (Added in 7.9.8)
+Pass a char * to a zero terminated string naming a directory holding multiple
+CA certificates to verify the peer with. The certificate directory must be
+prepared using the openssl c_rehash utility. This makes sense only when used
+in combination with the \fICURLOPT_SSL_VERIFYPEER\fP option.  If
+\fICURLOPT_SSL_VERIFYPEER\fP is zero, \fICURLOPT_CAPATH\fP need not even
+indicate an accessible path.  The \fICURLOPT_CAPATH\fP function apparently
+does not work in Windows due to some limitation in openssl. This option is
+OpenSSL-specific and does nothing if libcurl is built to use GnuTLS.
 .IP CURLOPT_RANDOM_FILE
 Pass a char * to a zero terminated file name. The file will be used to read
 from to seed the random engine for SSL. The more random the specified file is,
@@ -1197,12 +1303,29 @@ compile OpenSSL.

 You'll find more details about cipher lists on this URL:
 \fIhttp://www.openssl.org/docs/apps/ciphers.html\fP
+.IP CURLOPT_SSL_SESSIONID_CACHE
+Pass a long set to 0 to disable libcurl's use of SSL session-ID caching. Set
+this to 1 to enable it. By default all transfers are done using the
+cache. Note that while nothing ever should get hurt by attempting to reuse SSL
+session-IDs, there seem to be broken SSL implementations in the wild that may
+require you to disable this in order for you to succeed. (Added in 7.16.0)
 .IP CURLOPT_KRB4LEVEL
 Pass a char * as parameter. Set the krb4 security level, this also enables
 krb4 awareness.  This is a string, 'clear', 'safe', 'confidential' or
 \&'private'.  If the string is set but doesn't match one of these, 'private'
 will be used. Set the string to NULL to disable kerberos4. The kerberos
 support only works for FTP.
+.SH SSH OPTIONS
+.IP CURLOPT_SSH_AUTH_TYPES
+Pass a long set to a bitmask consisting of one or more of
+CURLSSH_AUTH_PUBLICKEY, CURLSSH_AUTH_PASSWORD, CURLSSH_AUTH_HOST,
+CURLSSH_AUTH_KEYBOARD. Set CURLSSH_AUTH_ANY to let libcurl pick one.
+.IP CURLOPT_SSH_PUBLIC_KEYFILE
+Pass a char * pointing to a file name for your public key. If not used,
+libcurl defaults to using \fB~/.ssh/id_dsa.pub\fP.
+.IP CURLOPT_SSH_PRIVATE_KEYFILE
+Pass a char * pointing to a file name for your private key. If not used,
+libcurl defaults to using \fB~/.ssh/id_dsa\fP.
 .SH OTHER OPTIONS
 .IP CURLOPT_PRIVATE
 Pass a char * as parameter, pointing to data that should be associated with
--- a/Show More
+++ b/Show More