7.12.2

fine even for third party transfers.

CHANGES

@@ -6,6 +6,550 @@
 
                                   Changelog
 
+Version 7.12.2 (18 October 2004)
+
+Daniel (16 October 2004)
+- Alexander Krasnostavsky made the CURLOPT_FTP_CREATE_MISSING_DIRS option work
+  fine even for third party transfers.
+
+- runekl at opoint.com found out (and provided a fix) that libcurl leaked
+  memory for cookies with the "max-age" field set.
+
+Gisle (16 October 2004)
+- Issue 50 in TODO-RELEASE; Added Traian Nicolescu's patches for threaded
+  resolver on Windows. Plugged some potential handle and memory leaks.
+
+Daniel (14 October 2004)
+- Eric Vergnaud pointed out that libcurl didn't treat ?-letters in the user
+  name and password fields properly in URLs, like
+  ftp://us?er:pass?word@site.com/. Added test 191 to verify the fix.
+
+Daniel (11 October 2004)
+- libcurl now uses SO_NOSIGPIPE for systems that support it (Mac OS X 10.2 or
+  later is one) to inhibit the SIGPIPE signal when writing to a socket while
+  the peer dies. The same effect is provide by the MSG_NOSIGNAL parameter to
+  send() on other systems. Alan Pinstein verified the fix.
+
+Daniel (10 October 2004)
+- Systems with 64bit longs no longeruse strtoll() or our strtoll- replacement
+  to parse 64 bit numbers. strtol() works fine. Added a configure check to
+  detect if [constant]LL works and if so, use that in the strtoll replacement
+  code to work around compiler warnings reported by Andy Cedilnik.
+
+Gisle (6 October 2004)
+- For USE_LIBIDN builds: Added Top-Level-Domain (TLD) check of host-name
+  used in fix_hostname(). Checks if characters in 'host->name' (indirectly
+  via 'ace_hostname') are legal according to the TLD tables in libidn.
+
+Daniel (6 October 2004)
+- Chih-Chung Chang reported that if you use CURLOPT_RESUME_FROM and enabled
+  CURLOPT_FOLLOWLOCATION, libcurl reported error if a redirect happened even
+  if the new URL would provide the resumed file. Test case 188 added to verify
+  the fix (together with existing test 99).
+
+- Dan Fandrich fixed a configure flaw for systems that need both nsl and socket
+  libs to use gethostbyname().
+
+- Removed tabs and trailing whitespace from lots of source files.
+
+Daniel (5 October 2004)
+- Made configure --with-libidn=PATH try the given PATH before the default
+  paths to make it possible to override.
+
+- If idna_strerror() is present in libidn, we can use that instead of our
+  internal replacement. This function was added by Simon in libidn 0.5.6 and
+  is detected by configure.
+
+- It seems basename() on IRIX is in the libgen library and since we don't use
+  that, configure finds libgen.h but not basename and then we get a compiler
+  error because our basename() replacement doesn't match the proto in
+  libgen.h. Starting now, we don't include the file if basename wasn't found
+  as well.
+
+Daniel (4 October 2004)
+- Chris found a race condition resulting in CURLE_COULDNT_RESOLVE_HOST and
+  potential crash, in the windows threaded name resolver code.
+
+Daniel (3 October 2004)
+- Replaced the use of isspace() in cookie.c with our own version instead since
+  we have most data as 'char *' and that makes us pass in negative values if
+  there is 8bit data in the string. Changing to unsigned causes too much
+  warnings or too many required typecasts to the normal string functions.
+  Harshal Pradhan identified this problem.
+
+Daniel (2 October 2004)
+- Bertrand Demiddelaer found a case where libcurl could read already freed
+  data when CURLOPT_VERBOSE is used and a (very) persistent connection. It
+  happened when the dns cache entry for the connection was pruned while the
+  connection was still alive and then again re-used. We worked together on
+  this fix.
+
+- Gisle Vanem provided code that displays an error message when the (libidn
+  based) IDN conversion fails. This is really due to a missing suitable
+  function in the libidn API that I hope we can remove once libidn gets a
+  function like this.
+
+Daniel (1 October 2004)
+- Aleksandar Milivojevic reported a problem in the Redhat bugzilla (see
+  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=134133) and not to
+  anyone involved in the curl project! This happens when you try to curl a
+  file from a proftpd site using SSL. It seems proftpd sends a somewhat
+  unorthodox response code (232 instead of 230). I relaxed the response code
+  check to deal with this and similar cases.
+
+- Based on Fedor Karpelevitch's formpost path basename patch, file parts in
+  formposts no longer include the path part. If you _really_ want them, you
+  must provide your preferred full file name with CURLFORM_FILENAME.
+
+  Added detection for libgen.h and basename() to configure. My custom
+  basename() replacement function for systems without it, might be a bit too
+  naive...
+
+  Updated 6 test cases to make them work with the stripped paths.
+
+Daniel (30 September 2004)
+- Larry Campbell added CURLINFO_OS_ERRNO to curl_easy_getinfo() that allows an
+  app to retrieve the errno variable after a (connect) failure. It will make
+  sense to provide this for more failures in a more generic way, but let's
+  start like this.
+
+- G<>nter Knauf and Casey O'Donnell worked out an extra #if condition for the
+  curl/multi.h header to work better in winsock-using apps.
+
+- Jean-Philippe Barrette-LaPierre made buildconf run better on Mac OS X by
+  properly using glibtoolize instead of plain libtoolize. (This is made if
+  glibtool was found and used instead of plain libtool.)
+
+Daniel (29 September 2004)
+- Bertrand Demiddelaer fixed curl_easy_reset() so that it doesn't mistakingly
+  enable the progress meter.
+
+Daniel (28 September 2004)
+- "Mekonikum" found out that if you built curl without SSL support, although
+  your current SSL installation supports Engine, the compile fails.
+
+Daniel (27 September 2004)
+- When --with-ssl=PATH is used to the configure script, it no longer uses
+  pkg-config to figure out extra details. That is now only done if no PATH is
+  included or if SSL is checked for by default without the --with-ssl option.
+
+Daniel (25 September 2004)
+- Peter Sylvester pointed out that CURLOPT_SSLENGINE couldn't even be set to
+  NULL when no engine was supported. It can now.
+
+Daniel (22 September 2004)
+- Dan Fandrich fixed three test cases to no longer use "localhost" but instead
+  use "127.0.0.1" to avoid requiring that localhost resolves nicely.
+
+- Jean-Claude Chauve fixed an LDAP crash when more than one record was
+  retrieved.
+
+Daniel (19 September 2004)
+- Andreas Rieke pointed out that when attempting to connect to a host without
+  a service on the specified port, curl_easy_perform() didn't properly provide
+  an error message in the CURLOPT_ERRORBUFFER buffer.
+
+Daniel (16 September 2004)
+- Daniel at touchtunes uses the FTP+SSL server "BSDFTPD-SSL from
+  http://bsdftpd-ssl.sc.ru/" which accordingly doesn't properly work with curl
+  when "AUTH SSL" is issued (although the server responds fine and everything)
+  but requires that curl issues "AUTH TLS" instead. See
+  http://curl.haxx.se/feedback/display.cgi?id=10951944937603&support=yes
+
+  Introducing CURLOPT_FTPSSLAUTH that allows the application to select which
+  of the AUTH strings to attempt first.
+
+- Anonymous filed bug report #1029478 which identified a bug when you 1) used
+  a URL without properly seperating the host name and the parameters with a
+  slash. 2) the URL had parameters to the right of a ? that contains a slash
+  3) curl was told to follow Location:s 4) the request got a response that
+  contained a Location: to redirect to "/dir". curl then appended the new path
+  on the wrong position of the original URL.
+
+  Test case 187 was added to verify that this was fixed properly.
+
+Daniel (11 September 2004)
+- Added parsedate.c that contains a rewrite of the date parser currently
+  provided by getdate.y. The new one is MUCH smaller and will allow us to run
+  away from the yacc/bison jungle. It is also slightly lacking in features
+  compared to the old one, but it supports parsing of all date formats HTTP
+  involves (and a fair bunch of others).
+
+Daniel (10 September 2004)
+- As found out by Jonas Forsman, curl didn't allow -F to set Content-Type on
+  text-parts. Starting now, we can do -F "name=daniel;type=text/extra". Added
+  test case 186 to verify.
+
+- Bug report #1025986. When following a Location: with a custom Host: header
+  replacement, curl only replaced the Host: header on the initial request
+  and didn't replace it on the following ones. This resulted in requests with
+  two Host: headers.
+
+  Now, curl checks if the location is on the same host as the initial request
+  and then continues to replace the Host: header. And when it moves to another
+  host, it doesn't replace the Host: header but it also doesn't make the
+  second Host: header get used in the request.
+
+  This change is verified by the two new test cases 184 and 185.
+
+Daniel (8 September 2004)
+- Modified the test suite to be able to use and run with customized port
+  numbers. This was always intended but never before possible. Now a simple
+  change in the runtests.pl script can make all tests use different ports.
+  The default ports in use from now on are 8990 to 8993.
+
+Daniel (2 September 2004)
+- Minor modification of an SSL-related error message.
+
+Daniel (31 August 2004)
+- David Tarendash found out that curl_multi_add_handle() returned
+  CURLM_CALL_MULTI_PERFORM instead of CURLM_OK.
+
+Daniel (30 August 2004)
+- Make "Proxy-Connection: close" close the current proxy connection, as Roman
+  Koifman found out.
+
+Daniel (24 August 2004)
+- Fixed a getdate problem by post-replacing the getdate.c file after the
+  bison/yacc process to add the fix Harshal Pradhan suggested. The problem
+  caused a crash on Windows when parsing some dates.
+
+Daniel (23 August 2004)
+- Roman Koifman pointed out that libcurl send Expect: 100-continue on POSTs
+  even when told to use HTTP 1.0, which is not correct. Test case 180 and
+  181 verify this.
+
+- Added test case 182 to verify that zero byte transfers call the callback
+  properly.
+
+Daniel (20 August 2004)
+- Alexander Krasnostavsky made the write callback get called even when a zero
+  byte file is downloaded.
+
+Daniel (18 August 2004)
+- Ling Thio pointed out that when libcurl is built ipv6-enabled, it still did
+  reverse DNS lookups when fed with a numerical IP-address (like
+  http://127.0.0.1/), although it doesn't when built ipv6-disabled. libcurl
+  should never do reverse lookups.
+
+Daniel (17 August 2004)
+- Kjetil Jacobsen noticed that when transferring a file:// URL pointing to an
+  empty file, libcurl would return with the file still open.
+
+- Alexander Krasnostavsky pointed out that the configure script needs to define
+  _THREAD_SAFE for AIX systems to make libcurl built really thread-safe.
+
+  Also added a check for the xlc compiler on AIX, and if that is detect we use
+  the -qthreaded compiler option
+
+Daniel (16 August 2004)
+- libcurl now allows a custom "Accept-Encoding:" header override the
+  internally set one that gets set with CURLOPT_ENCODING. Pointed out by Alex.
+
+- Roland Krikava found and fixed a cookie problem when using a proxy (the
+  path matching was wrong). I added test case 179 to verify that we now do
+  right.
+
+Daniel (15 August 2004)
+- Casey O'Donnell fixed some MSVC makefile targets to link properly.
+
+Daniel (11 August 2004)
+- configure now defines _XOPEN_SOURCE to 500 on systems that need it to build
+  warning-free (the only known one so far is non-gcc builds on 64bit SGI
+  IRIX). (Reverted this change later as it caused compiler errors.)
+
+- the FTP code now includes the server response in the error message when the
+  server gives back a 530 after the password is provided, as it isn't
+  necessary because of a bad user name or password.
+
+Version 7.12.1 (10 August 2004)
+
+Daniel (10 August 2004)
+- In OpenSSL 0.9.7d and earlier, ASN1_STRING_to_UTF8 fails if the input is
+  already UTF-8 encoded. This made the certificate verification fail if the
+  remote server used a certificate with the name UTF-8 encoded.
+
+  Work-around brought by Alexis S. L. Carvalho.
+
+Daniel (9 August 2004)
+- I fixed the configure script for krb4 to use -lcom_err as well, as I started
+  to get link problems with it unless I did that on my Solaris 2.7 box. I
+  don't understand why I started to get problems with this now!
+
+Daniel (5 August 2004)
+- Enrico Scholz fixed the HTTP-Negotiate service name to be uppercase as
+  reported in bug report #1004105
+
+Daniel (4 August 2004)
+- Gisle Vanem provided a fix for the multi interface and connecting to a host
+  using multiple IP (bad) addresses.
+
+- Dylan Salisbury made libcurl no longer accept cookies set to a TLD only (it
+  previously allowed that on the seven three-letter domains).
+
+Daniel (31 July 2004)
+- Joel Chen reported that the digest code assumed quotes around the contents a
+  bit too much.
+
+Daniel (28 July 2004)
+- Bertrand Demiddelaer fixed the host name to get setup properly even when a
+  connection is re-used, when a proxy is in use. Previously the wrong Host:
+  header could get sent when re-using a proxy connection to a different target
+  host.
+
+- Fixed Brian Akins' reported problems with duplicate Host: headers on re-used
+  connections. If you attempted to replace the Host: header in the second
+  request, you got two such headers!
+
+- src/Makefile.am now includes the Makefile.inc file to get info about files
+
+Daniel (26 July 2004)
+- Made "curl [URL] -o name#2" work as expected. If there's no globbing for the
+  #-number, it will simply be used as #2 in the file name.
+
+- Bertrand Demiddelaer fixed testing with valgrind 2.1.x and added two missing
+  newlines in the cookie informationals.
+
+Daniel (24 July 2004)
+- I fixed the autobuilds with ares, since they now need to have buildconf run
+  in the ares dir before the configure script is run.
+
+- Added Casey O'Donnell's curl_easy_reset() function. It has a proto in
+  curl/curl.h but we have no man page yet.
+
+Daniel (20 July 2004)
+- Added buildconf and buildconf.bat to the release archives, since they are
+  handy for rebuilding curl when using a daily snapshot (and not a pure CVS
+  checkout).
+
+Daniel (16 July 2004)
+- As suggested by Toby Peterson, libcurl now ignores Content-Length data if the
+  given size is a negative number. Test case 178 verifies this.
+
+Daniel (14 July 2004)
+- G<>nter Knauf has made the Netware builds do without the config-netware.h
+  files, so they are now removed from the dist packages.
+
+- G<>nter Knauf made curl and libcurl build with Borland again.
+
+- Andres Garcia fixed the common test 505 failures on windows.
+
+Daniel (6 July 2004)
+- Andr<64>s Garc<72>a found out why the windows tests failed on file:// "uploads".
+
+Daniel (2 July 2004)
+- Andr<64>s Garc<72>a reported a curl_share_cleanup() crash that occurs when no
+  lock/unlock callbacks have been set and the share is cleaned up.
+
+Daniel (1 July 2004)
+- When using curl --trace or --trace-ascii, no trace messages that were sent
+  by curl_easy_cleanup() were included in the trace file. This made the
+  message "Closing connection #0" never appear in trace dumps.
+
+Daniel (30 June 2004)
+- Niels van Tongeren found that setting CURLOPT_NOBODY to TRUE doesn't disable
+  a previously set POST request, making a very odd request get sent (unless
+  you disabled the POST) a HEAD request with a POST request-body. I've now
+  made CURLOPT_NOBODY enforce a proper HEAD. Added test case 514 for this.
+
+Daniel (29 June 2004)
+- G<>nter Knauf made the testcurl.pl script capable of using a custom setup
+  file to easier run multiple autobuilds on the same source tree.
+
+- Gisle fixed the djgpp build and fixed a memory problem in some of the
+  reorged name resolved code.
+
+- Fixed code to allow connects done using the multi interface to attempt the
+  next IP when connecting to a host that resolves to multiple IPs and a
+  connect attempt fails.
+
+Daniel (27 June 2004)
+- Based on Rob Stanzel's bug report #979480, I wrote a configure check that
+  checks if poll() can be used to wait on NULL as otherwise select() should be
+  used to do it. The select() usage was also fixed according to his report.
+
+  Mac OS X 10.3 says "poll() functionality for Mac OS X is implemented via an
+  emulation layer on top of select(), not in the kernel directly. It is
+  recommended that programs running under OS X 10.3 prefer select() over
+  poll(). Configure scripts should look for the _POLL_EMUL_H_ define (instead
+  of _POLL_H_ or _SYS_POLL_H_) and avoid implementations where poll is not
+  implemented in the kernel."
+
+  Yes, we can probably use select() on most platforms but today I prefered to
+  leave the code unaltered.
+
+Daniel (24 June 2004)
+- The standard curl_version() string now only includes version info about
+  involved libraries and not about particular features. Thus it will no longer
+  include info about ipv6 nor GSS. That info is of course still available in
+  the feature bitmask curl_version_info() offers.
+
+- Replaced all occurances of sprintf() with snprintf(). This is mostly because
+  it is "A Good Thing" rather than actually fixing any known problem. This
+  will help preventing future possible mistakes to cause buffer overflows.
+
+- Major reorganization in the host resolve code (again). This time, I've
+  modified the code to now always use a linked list of Curl_addrinfo structs
+  to return resolved info in, no matter what resolver method or support that
+  is available on the platform. It makes it a lot easier to write code that
+  uses or depends on resolved data.
+
+  Internally, this means amongst other things that we can stop doing the weird
+  "increase buffer size until it works" trick when resolving hosts on
+  ipv4-only with gethostbyname_r(), we support socks even on libcurls built
+  with ipv6 enabled (but only to socks servers that resolve to an ipv4
+  address) and we no longer deep-copy or relocate hostent structs (we create
+  Curl_addrinfo chains instead).
+
+  The new "hostent to Curl_addrinfo" converter function is named Curl_he2ai()
+  and is slightly naive and simple, yet I believe it is functional enough to
+  work for libcurl.
+
+Daniel (22 June 2004)
+- David Cohen pointed out that RFC2109 says clients should allow cookies to
+  contain least 4096 bytes while libcurl only allowed 2047. I raised the limit
+  to 4999 now and made the used buffer get malloc()ed instead of simply
+  allocated on stack as before. Extended test case 46 to include a cookie with
+  very huge content to verify the fix.
+
+- G<>nter Knauf fixed getdate.y to remove a few warnings. I removed the
+  ifdef'ed test we never ever use anyway.
+
+- Gisle Vanem fixed the certificate wildcard checks to support a '*'-letter
+  anywhere in the wildcard string, support multiple '*'-letters in the
+  wildcard and to allow the '*'-letter to match a string that includes a dot.
+
+Daniel (21 June 2004)
+- testcurl.sh is now removed completely, tests/testcurl.pl is the script to
+  use when autobuilding curl!
+
+- Kjetil Jacobsen brought my attention to the fact that you cannot properly
+  abort an upload with the readfunction callback, since returning 0 or -1 only
+  stops the upload and libcurl will continue waiting for downloaded data and
+  the server often waits for the rest of the upload data to arrive.
+
+  Thus, I've now added the ability for read callbacks to return
+  CURL_READFUNC_ABORT to abort an upload from a read callback. This will stop
+  the transfer immediately with a CURLE_ABORTED_BY_CALLBACK return code.
+
+  Test case 513 was added to verify that it works. I had to improve the test
+  HTTP server too to dump the request to a file even when the client
+  disconnects prematurely.
+
+Daniel (19 June 2004)
+- Luca Alteas provided a test case with a failing curl operation: when we POST
+  to a site with --digest (or similar) set, and the server responded with a 302
+  Location: to the "authprobe" request, it was not treated correctly. We still
+  will behave badly if FOLLOWLOCATION is enabled for this case, but I'm not
+  in the mood to dive into this right now and will leave it as-is for now.
+  Verified my fix with test case 177.
+
+Daniel (18 June 2004)
+- Gisle Vanem's patch that provides more details from the SSL layers (if you
+  use an OpenSSL version that supports it). It also introduces two new types
+  of data that can be sent to the debug callback: CURLINFO_SSL_DATA_IN and
+  CURLINFO_SSL_DATA_OUT.
+
+- With David Byron's test server I could repeat his problem and make sure that
+  POSTing over HTTPS:// with NTLM works fine now. There was a general problem
+  with multi-pass authentication with non-GET operations with CONNECT.
+
+Daniel (16 June 2004)
+- Modified to keep the upload byte counter in an curl_off_t, not an int as
+  before. 32bits is not enough. This is most likely the bug Jean-Louis Lemaire
+  reported that makes 2GB FTP uploads to report error ("unaligned file sizes")
+  when completed.
+
+Daniel (15 June 2004)
+- Luca Alteas reported a problem that I fixed: if you did a POST with
+  CURLAUTH_DIGEST set but the server didn't require any authentication,
+  libcurl would repeatedly send HEAD lots of times until it gives up. This was
+  actually the case for all multi-pass authentications. Added test case 174,
+  175 and 176 to verify this.
+
+Daniel (14 June 2004)
+- Multipart formposts uploading files no longer inserts the files themselves
+  into the huge prebuilt chunk. This enables libcurl to formpost files that is
+  larger than the amount of system memory. When the file given is passed on
+  stdin, libcurl still uses the old method of reading the full fill before the
+  upload takes place. This approach was selected in order to not alter the
+  behavior for existing applications, as when using stdin libcurl can't know
+  the size of the upload and chunked transfer-encoding can only be used on
+  HTTP 1.1 servers.
+
+Daniel (13 June 2004)
+- Gisle found out that we did wildcard cert name checks wrong, so that parts
+  of the check wrongly was case sensitive.
+
+Daniel (11 June 2004)
+- Tim Sneddon brought a minor VMS fix to make curl build properly on his VMS
+  machine. He also had some interesting libcurl patches... they might be able
+  to do in a slightly nicer way. Discussions are in progress.
+
+Daniel (10 June 2004)
+- Gisle Vanem brought code cleanupsm better verbose output and better connect
+  timeout handling when attempting to connect to a host that resolves to
+  multiple IP addresses.
+
+- Steven Bazyl and Seshubabu Pasam pointed out a bug on win32 when freeing the
+  path after a file:// transfer.
+
+Daniel (9 June 2004)
+- Alexander Krasnostavsky made 'configure --disable-http' work to build libcurl
+  without HTTP support. I added a new return code for curl_formadd() in case
+  libcurl is built with HTTP disable: CURL_FORMADD_DISABLED.
+
+- Alexander Krasnostavsky pointed out a missing file in the generated
+  curllib.dsp file, and now people building with this should get a libcurl.lib
+  file generated as it used to do before we generated this file.
+
+Daniel (8 June 2004)
+- Marty Kuhrt fixed a minor build problem for VMS.
+
+Daniel (7 June 2004)
+- Reverted the configure check from the 4th since it obviously didn't work.
+  Remade it in a different manner that hopefully works better.
+
+Daniel (4 June 2004)
+- G<>nter Knauf brought patches to make curl build fine on NetWare again.
+
+- Made the configure checks for strerror_r() not exit the configure script
+  when built for cross-compiling.
+
+Daniel (3 June 2004)
+- Chris Gaukroger pointed out that 'make test' attempts to run the tests even
+  if curl is built cross-compiled. I've now made it output a short message
+  instead, saying it isn't possible to do.
+
+- Alexander Krasnostavsky brought FTP 3rd party transfer support to libcurl.
+  You can now use libcurl to transfer files between two remote hosts using
+  FTP. There are a bunch of new options to control this with:
+   CURLOPT_SOURCE_HOST
+   CURLOPT_SOURCE_USERPWD
+   CURLOPT_SOURCE_PATH
+   CURLOPT_SOURCE_PORT
+   CURLOPT_PASV_HOST
+   CURLOPT_SOURCE_PREQUOTE
+   CURLOPT_SOURCE_POSTQUOTE
+
+  (They still remain to be documented properly in the curl_easy_setopt man
+  page.)
+
+  When using this, the ordinary CURLOPT_URL specifies the target URL, and you
+  specify the source data with these additional options. ftp3rdparty.c is a
+  new example source code showing how to use this.
+
+- Vincent Bronner fixed the HTTP Digest code to use the proxy user name and
+  password when doing proxy authentication, it previously always used the host
+  user name and password!
+
+Daniel (2 June 2004)
+- CURLOPT_UPLOAD and CURLOPT_PUT now do the exact same thing internally, which
+  fixes some old confusions on when which of these should be used and what the
+  differences are.
+
+- Applied Gisle's fixes to make curl build fine with lcc-win32
+
 Version 7.12.0 (2 June 2004)
 
 Daniel (1 June 2004)
@@ -51,7 +595,7 @@ Daniel (20 May 2004)
   wrong. The same was true for the download speed. Fixed now.
 
 Daniel (19 May 2004)
-- David Byron added test case 170 - this used to crash the previous version of 
+- David Byron added test case 170 - this used to crash the previous version of
   curl.
 
 Daniel (17 May 2004)

CVS-INFO

@@ -15,12 +15,6 @@ Compile and build instructions follow below.
   CHANGES.0     contains ancient changes.
   CHANGES.$year contains changes for the particular year.
 
-  tests/memanalyze.pl
-                is for analyzing the output generated by curl if -DCURLDEBUG
-                is used when compiling (run configure with --enable-debug)
-
-  buildconf     builds the makefiles and configure stuff
-
   Makefile.dist is included as the root Makefile in distribution archives
 
   perl/         is a subdirectory with various perl scripts

Makefile.am

@@ -23,8 +23,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist	\
-  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
+EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist curl-config.in \
+ curl-style.el sample.emacs RELEASE-NOTES buildconf buildconf.bat
 
 bin_SCRIPTS = curl-config
 

Makefile.dist

@@ -30,8 +30,28 @@ ssl:
 	make
 
 borland:
-	cd lib & make -f Makefile.b32
-	cd src & make -f Makefile.b32
+	cd lib
+	make -f Makefile.b32
+	cd ..\src
+	make -f Makefile.b32
+
+borland-ssl:
+	cd lib
+	make -f Makefile.b32 WITH_SSL=1
+	cd ..\src
+	make -f Makefile.b32 WITH_SSL=1
+
+borland-ssl-zlib:
+	cd lib
+	make -f Makefile.b32 WITH_SSL=1 WITH_ZLIB=1
+	cd ..\src
+	make -f Makefile.b32 WITH_SSL=1 WITH_ZLIB=1
+
+borland-clean:
+	cd lib
+	make -f Makefile.b32 clean
+	cd ..\src
+	make -f Makefile.b32 clean
 
 mingw32:
 	cd lib & make -f Makefile.m32 ZLIB=1
@@ -41,18 +61,34 @@ mingw32-ssl:
 	cd lib & make -f Makefile.m32 SSL=1 ZLIB=1
 	cd src & make -f Makefile.m32 SSL=1 ZLIB=1
 
+mingw32-clean:
+	cd lib & make -f Makefile.m32 clean
+	cd src & make -f Makefile.m32 clean
+
 vc:
 	cd lib
 	nmake /f Makefile.vc6 cfg=release
 	cd ..\src
 	nmake /f Makefile.vc6
 
+vc-zlib:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-zlib
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-zlib
+
 vc-ssl:
 	cd lib
 	nmake /f Makefile.vc6 cfg=release-ssl
 	cd ..\src
 	nmake /f Makefile.vc6 cfg=release-ssl
 
+vc-ssl-zlib:
+	cd lib
+	nmake /f Makefile.vc6 cfg=release-ssl-zlib
+	cd ..\src
+	nmake /f Makefile.vc6 cfg=release-ssl-zlib
+
 vc-ssl-dll:
 	cd lib
 	nmake /f Makefile.vc6 cfg=release-ssl-dll
@@ -82,8 +118,16 @@ amiga:
 	cd ./src && make -f makefile.amiga
 
 netware:
-	cd lib && make -f Makefile.netware
-	cd src && make -f Makefile.netware
+	$(MAKE) -C lib -f Makefile.netware
+	$(MAKE) -C src -f Makefile.netware
+
+netware-ssl:
+	$(MAKE) -C lib -f Makefile.netware SSL=1
+	$(MAKE) -C src -f Makefile.netware SSL=1
+
+netware-clean:
+	$(MAKE) -C lib -f Makefile.netware clean
+	$(MAKE) -C src -f Makefile.netware clean
 
 unix: all
 

README

@@ -1,12 +1,12 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
 README
 
-  Curl is a command line tool for transfering data specified with URL
+  Curl is a command line tool for transferring data specified with URL
   syntax. Find out how to use Curl by reading the curl.1 man page or the
   MANUAL document. Find out how to install Curl by reading the INSTALL
   document.

RELEASE-NOTES

@@ -1,62 +1,84 @@
-Curl and libcurl 7.12.0.
+Curl and libcurl 7.12.2
 
- Public curl release number:               81
- Releases counted from the very beginning: 108
+ Public curl release number:               83
+ Releases counted from the very beginning: 110
  Available command line options:           96
- Available curl_easy_setopt() options:     113
+ Available curl_easy_setopt() options:     121
  Number of public functions in libcurl:    36
-
-A special thanks to:
-
- archivas.com and Alan Pinstein, for paying me to focus on their requests
+ Amount of public web site mirrors:        13
+ Number of known libcurl bindings:         27
 
 This release includes the following changes:
 
- o added ability to "upload" to file:// URLs
- o added curl_global_init_mem()
- o removed curl_formparse()
- o the MSVC project file in the release archive is automatically built
- o curl --proxy-digest is a new command line option
- o the Windows version of libcurl can use wldap32.dll for LDAP
- o added curl_easy_strerror(), curl_multi_strerror() and curl_share_strerror()
- o IPv6-enabled Windows hosts now resolves names threaded/asynch as well
- o configure --with-libidn can be used to point out the root dir of a libidn
-   installation (version 0.4.5 or later) for curl to use, then libcurl can
-   resolve and use IDNA names (domain names with "international" letters)
+ o the IDN code now verifies that only TLD-legitmate letters are used in the
+   name or a warning is displayed (when verbose is enabled)
+ o provides error texts for IDN errors
+ o file upload parts in formposts now get their directory names cut off
+ o added CURLINFO_OS_ERRNO
+ o added CURLOPT_FTPSSLAUTH to allow ftp connects to attempt "AUTH TLS" instead
+   before "AUTH SSL"
+ o curl_getdate() completely rewritten: may affect rare curl -z use cases
 
 This release includes the following bugfixes:
 
- o incoming cookies with domains set with a prefixed dot now works better
- o CURLOPT_COOKIEFILE and CURLOPT_COOKIE can be used in the same request
- o improved peer certificate name verification
- o allocation failures cause no leaks nor crashes
- o the progress meter display now handles file sizes up to full 8 exabytes
-   (which is as high a signed 64 bit number can reach)
- o general HTTP authentication improvements
- o HTTP Digest authentication with the proxy works
- o mulipart formposting with -F and file names with spaces work again
- o curl_easy_duphandle() now works when ares-enabled
- o HTTP Digest authentication works a lot more like the RFC says
- o curl works with telnet and stdin properly on Windows
- o configure --without-ssl works even when pkg-config has OpenSSL details
- o src/hugehelp.c builds correct again in non-configure build environments
+ o CURLOPT_FTP_CREATE_MISSING_DIRS works for third party transfers
+ o memory leak for cookies received with max-age set
+ o potential memory leaks in the window name resolver
+ o URLs with ?-letters in the user name or password fields
+ o libcurl error message is now provided when send() fails
+ o no more SIGPIPE on Mac OS X and other SO_NOSIGPIPE-supporting platforms
+ o HTTP resume was refused if redirected
+ o configure's gethostbyname check when both nsl and socket libs are required
+ o configure --with-libidn now checks the given path before defaults
+ o a race condition sometimes resulting in CURLE_COULDNT_RESOLVE_HOST in the
+   windows threaded name resolver code
+ o isspace() invokes with negative values in the cookie code
+ o a case of read-already-freed-data when CURLOPT_VERBOSE is used and a (very)
+   persistent connection
+ o now includes descriptive error messages for IDN errors
+ o more forgivning PASS response code check for better working with proftpd
+ o curl/multi.h works better included in winsock-using apps
+ o curl_easy_reset() no longer enables the progress meter
+ o build fix for SSL disabled curl with SSL Engine support present
+ o configure --with-ssl=PATH now ignores pkg-config path info
+ o CURLOPT_SSLENGINE can be set to NULL even if no engine support is available
+ o LDAP crash when more than one record was received
+ o connect failures properly stores an error message in the errorbuffer
+ o Rare Location:-following problem with bad original URL
+ o -F can now add Content-Type on non-file sections
+ o double Host: header when following Location: with replaced Host:
+ o curl_multi_add_handle() return code
+ o "Proxy-Connection: close" is now understood and properly dealt with
+ o curl_getdate() crash
+ o downloading empty files now calls the write callback properly
+ o no reverse DNS lookups for ip-only addresses with ipv6-enabled libcurl
+ o file handler leak when getting an empty file:// URL
+ o libcurl works better multi-threaded on AIX (when built with xlc)
+ o cookies over proxy didn't match the path properly
+ o MSVC makefile fixes to build better
+ o FTP response 530 on 'PASS' now sends back a better error message
 
 Other curl-related news since the previous public release:
 
- o The CVS repository was moved to cool.haxx.se
- o AdacURL 7.11.2 was released: http://www.almroth.com/adacurl/
- o PycURL 7.11.3 was released: http://pycurl.sourceforge.net
- o A new German download mirror: http://www.mirrorspace.org/curl/
- o Two new mailing lists are available:
-   curl-and-python - for python programmers using pycurl or curl
-   curl-perl-commmits - receives commits done to the curl-perl CVS module
+ o AdacURL version 7.12.1 http://www.almroth.com/adacurl/index.html
+ o pycurl version 7.12.1 http://pycurl.sourceforge.net/
+ o tclcurl version 0.12.1
+   http://personal1.iddeo.es/andresgarci/tclcurl/english/
+ o libcurl.NET was announce: http://www.seasideresearch.com/downloads.html
+ o Get your fresh Mozilla-extracted ca cert bundle here:
+   http://curl.haxx.se/docs/caextract.html
+ o New web mirror in Taiwan: http://curl.cs.pu.edu.tw/
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Gisle Vanem, Tommy Tam, Luca Altea, James Bursa, Mihai Ionescu, Michael
- Benedict, Andr<64>s Garc<72>a, Joe Halpin, Seshubabu Pasam, Peter Sylvester, Robert
- D. Young, Jesse Noller, David Byron, Massimiliano Ziccardi, Mohun Biswas,
- Renaud Duhaut
+ Casey O'Donnell, Roland Krikava, Alex, Alexander Krasnostavsky, Kjetil
+ Jacobsen, Ling Thio, Roman Koifman, Harshal Pradhan, Jonas Forsman, David
+ Tarendash, Daniel at touchtunes, Bertrand Demiddelaer, Andreas Rieke,
+ Jean-Claude Chauve, Dan Fandrich, Peter Sylvester, "Mekonikum", Jean-Philippe
+ Barrette-LaPierre, G<>nter Knauf, Larry Campbell, Fedor Karpelevitch,
+ Aleksandar Milivojevic, Gisle Vanem, Chris "Bob Bob", Chih-Chung Chang, Andy
+ Cedilnik, Alan Pinstein, Eric Vergnaud, Traian Nicolescu, runekl at
+ opoint.com
 
         Thanks! (and sorry if I forgot to mention someone)

TODO-RELEASE

@@ -1,13 +1,11 @@
 Issues not sorted in any particular order.
-  #[num] refers to bug report numbers.
-  UNASSIGNED means that no person has publicly stated to work on the issue.
-  DELETE means the issue is subject for dismissal
 
-To get fixed in 7.12.0 (planned release: June 2004)
+To get fixed in 7.12.2 (planned release: mid October 2004)
 ======================
 
-To get fixed in 7.12.1 (planned release: August 2004)
+To get fixed in 7.12.3 (planned release: December 2004)
 ======================
 
-* FTP 3rd party transfers
+47 - Peter Sylvester's patch for SRP on the TLS layer
 
+48 - MSVC Makefile improvements by Samuel D<>az Garc<72>a

acinclude.m4

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

ares/.cvsignore

@@ -6,3 +6,17 @@ ahost
 config.log
 config.status
 aclocal.m4
+.deps
+Makefile.in
+config.guess
+config.h
+config.h.in
+config.sub
+libtool
+ltmain.sh
+stamp-h1
+*.lo
+.libs
+depcomp
+libcares.la
+missing

ares/CHANGES

@@ -1,5 +1,128 @@
   Changelog for the c-ares project
 
+* September 29
+
+- Henrik Stoerner fix: got a report that Tru64 Unix (the unix from Digital
+  when they made Alpha's) uses /etc/svc.conf for the purpose fixed below for
+  other OSes. He made c-ares check for and understand it if present.
+
+- Now c-ares will use local host name lookup _before_ DNS resolving by default
+  if nothing else is told.
+
+* September 26
+
+- Henrik Stoerner: found out that c-ares does not look at the /etc/host.conf
+  file to determine the sequence in which to search /etc/hosts and DNS.  So on
+  systems where this order is defined by /etc/host.conf instead of a "lookup"
+  entry in /etc/resolv.conf, c-ares will always default to looking in DNS
+  first, and /etc/hosts second.
+
+  c-ares now looks at
+
+  1) resolv.conf (for the "lookup" line);
+  2) nsswitch.fon (for the "hosts:" line);
+  3) host.conf (for the "order" line).
+
+  First match wins.
+
+- Dominick Meglio patched: C-ares on Windows assumed that the HOSTS file is
+  located in a static location. It assumed
+  C:\Windows\System32\Drivers\Etc. This is a poor assumption to make. In fact,
+  the location of the HOSTS file can be changed via a registry setting.
+
+  There is a key called DatabasePath which specifies the path to the HOSTS
+  file:
+  http://www.microsoft.com/technet/itsolutions/network/deploy/depovg/tcpip2k.mspx
+
+  The patch will make c-ares correctly consult the registry for the location
+  of this file.
+
+* August 29
+
+- Gisle Vanem fixed the MSVC build files.
+
+* August 20
+
+- Gisle Vanem made c-ares build and work with his Watt-32 TCP/IP stack.
+
+* August 13
+
+- Harshal Pradhan made a minor syntax change in ares_init.c to make it build
+  fine with MSVC 7.1
+
+* July 24
+
+- Made the lib get built static only if --enable-debug is used.
+
+- Gisle Vanem fixed:
+
+  Basically in loops like handle_errors(), 'query->next' was assigned a local
+  variable and then query was referenced after the memory was freed by
+  next_server(). I've changed that so next_server() and end_query() returns
+  the next query. So callers should use this ret-value.
+
+  The next problem was that 'server->tcp_buffer_pos' had a random value at
+  entry to 1st recv() (luckily causing Winsock to return ENOBUFS).
+
+  I've also added a ares_writev() for Windows to streamline the code a bit
+  more.
+
+* July 20
+- Fixed a few variable return types for some system calls. Made configure
+  check for ssize_t to make it possible to use that when receiving the send()
+  error code. This is necessary to prevent compiler warnings on some systems.
+
+- Made configure create config.h, and all source files now include setup.h that
+  might include the proper config.h (or a handicrafted alternative).
+
+- Switched to 'ares_socket_t' type for sockets in ares, since Windows don't
+  use 'int' for that.
+
+- automake-ified and libool-ified c-ares. Now it builds libcares as a shared
+  lib on most platforms if wanted. (This bloated the size of the release
+  archive with another 200K!)
+
+- Makefile.am now uses Makefile.inc for the c sources, h headers and man
+  pages, to make it easier for other makefiles to use the exact same set of
+  files.
+
+- Adjusted 'maketgz' to use the new automake magic when building distribution
+  archives.
+
+- Anyone desires HTML and/or PDF versions of the man pages in the release
+  archives?
+
+* July 3
+- G<>nter Knauf made c-ares build and run on Novell Netware.
+
+* July 1
+- Gisle Vanem provided Makefile.dj to build with djgpp, added a few more djgpp
+  fixes and made ares not use 'errno' to provide further info on Windows.
+
+* June 30
+- Gisle Vanem made it build with djgpp and run fine with the Watt-32 stack.
+
+* June 10
+- Gisle Vanem's init patch for Windows:
+
+  The init_by_resolv_conf() function fetches the DNS-server(s)
+  from a series of registry branches.
+
+  This can be wrong in the case where DHCP has assigned nameservers, but the
+  user has overridden these servers with other prefered settings. Then it's
+  wrong to use the DHCPNAMESERVER setting in registry.
+
+  In the case of no global DHCP-assigned or fixed servers, but DNS server(s)
+  per adapter, one has to query the adapter branches.  But how can c-ares know
+  which adapter is valid for use? AFAICS it can't. There could be one adapter
+  that is down (e.g. a VPN adapter).
+
+  So it's better to leave this to the IP Helper API (iphlapi) available in
+  Win-98/2000 and later. My patch falls-back to the old way if not available.
+
+* June 8
+- James Bursa fixed an init issue for RISC OS.
+
 * May 11
 - Nico Stappenbelt reported that when processing domain and search lines in
   the resolv.conf file, the first entry encountered is processed and used as

ares/FILES

@@ -10,6 +10,9 @@ maketgz
 aclocal.m4
 acinclude.m4
 Makefile.in
+Makefile.dj
+Makefile.m32
+Makefile.netware
 install-sh
 mkinstalldirs
 configure

ares/Makefile.am

@@ -0,0 +1,57 @@
+AUTOMAKE_OPTIONS = foreign
+
+lib_LTLIBRARIES = libcares.la
+
+man_MANS = $(MANPAGES)
+
+MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/adig/adig.mak	\
+ vc/adig/adig.plg vc/vc.dsw vc/ahost/ahost.dep vc/ahost/ahost.dsp	\
+ vc/ahost/ahost.mak vc/ahost/ahost.plg vc/areslib/areslib.dep		\
+ vc/areslib/areslib.dsp vc/areslib/areslib.mak vc/areslib/areslib.plg
+
+# adig and ahost are just sample programs and thus not mentioned with the
+# regular sources and headers
+EXTRA_DIST = CHANGES README.cares Makefile.inc adig.c ahost.c $(man_MANS) \
+ $(MSVCFILES)
+
+
+VER=-version-info 0:0:0
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
+# 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that age
+# must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information: 
+#
+# 1.Start with version information of 0:0:0 for each libtool library.
+#
+# 2.Update the version information only immediately before a public release of
+# your software. More frequent updates are unnecessary, and only guarantee
+# that the current interface number gets larger faster.
+#
+# 3.If the library source code has changed at all since the last update, then
+# increment revision (c:r+1:a)
+#
+# 4.If any interfaces have been added, removed, or changed since the last
+# update, increment current, and set revision to 0. (c+1:r=0:a)
+#
+# 5.If any interfaces have been added since the last public release, then
+# increment age. (c:r:a+1)
+#
+# 6.If any interfaces have been removed since the last public release, then
+# set age to 0. (c:r:a=0)
+#
+
+libcares_la_LDFLAGS = $(VER)
+
+# Makefile.inc provides the CSOURCES and HHEADERS defines
+include Makefile.inc
+
+libcares_la_SOURCES = $(CSOURCES) $(HHEADERS)
+
+# where to install the c-ares headers
+libcares_ladir = $(includedir)
+# what headers to install on 'make install':
+libcares_la_HEADERS = ares.h ares_version.h

ares/Makefile.dj

@@ -0,0 +1,50 @@
+#
+# c-ares Makefile for djgpp/gcc/Watt-32.
+#   By Gisle Vanem <giva@bgnett.no> 2004.
+#
+.SUFFIXES: .exe
+
+include Makefile.inc
+
+WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
+
+CC      = gcc
+CFLAGS  = -O2 -Wall -DWATT32 -Dselect=select_s -I$(WATT32_ROOT)/inc
+LDFLAGS = -s
+EX_LIBS = $(WATT32_ROOT)/lib/libwatt.a
+
+OBJ_DIR = djgpp
+
+OBJECTS = $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
+
+all: $(OBJ_DIR) libcares.a ahost.exe adig.exe
+	@echo Welcome to c-ares.
+
+$(OBJ_DIR):
+	- mkdir $(OBJ_DIR)
+
+libcares.a: $(OBJECTS)
+	ar rs $@ $?
+
+ahost.exe: ahost.c libcares.a
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+adig.exe: adig.c libcares.a
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
+
+clean:
+	rm -f $(OBJECTS) libcares.a
+
+vclean realclean: clean
+	rm -f ahost.exe adig.exe depend.dj
+	- rmdir $(OBJ_DIR)
+
+$(OBJ_DIR)/%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+	@echo
+
+depend:
+	$(CC) -MM $(CFLAGS) $(CSOURCES) | \
+	sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/$$(OBJ_DIR)\/\1/' > depend.dj
+
+-include depend.dj

ares/Makefile.in

@@ -1,79 +0,0 @@
-# $Id$
-
-SHELL=/bin/sh
-INSTALL=@INSTALL@
-RANLIB=@RANLIB@
-VPATH=@srcdir@
-srcdir=@srcdir@
-top_srcdir=@top_srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-
-LIB=libcares.a
-CC=@CC@
-CPPFLAGS=@CPPFLAGS@
-CFLAGS=@CFLAGS@ ${WARN_CFLAGS} ${ERROR_CFLAGS}
-DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
-OBJS=	ares__close_sockets.o ares__get_hostent.o ares__read_line.o \
-	ares_destroy.o ares_expand_name.o ares_fds.o \
-	ares_free_hostent.o ares_free_string.o ares_gethostbyaddr.o \
-	ares_gethostbyname.o ares_init.o ares_mkquery.o ares_parse_a_reply.o \
-	ares_parse_ptr_reply.o ares_process.o ares_query.o ares_search.o \
-	ares_send.o ares_strerror.o ares_timeout.o ares_version.o \
-	ares_expand_string.o ares_cancel.o
-
-MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3   \
-        ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3	      \
-        ares_gethostbyname.3 ares_init.3 ares_init_options.3 ares_mkquery.3   \
-        ares_parse_a_reply.3 ares_parse_ptr_reply.3 ares_process.3	      \
-        ares_query.3 ares_search.3 ares_send.3 ares_strerror.3 ares_timeout.3 \
-        ares_version.3 ares_cancel.3
-
-$(LIB): ${OBJS}
-	ar cru $@ ${OBJS}
-	${RANLIB} $@
-
-all: $(LIB) demos
-
-demos: adig ahost
-
-tags:
-	etags *.[ch]
-
-adig: adig.o $(LIB)
-	${CC} ${LDFLAGS} -o $@ adig.o $(LIB) ${LIBS}
-
-ahost: ahost.o $(LIB)
-	${CC} ${LDFLAGS} -o $@ ahost.o $(LIB) ${LIBS}
-
-${OBJS}: ares.h ares_dns.h ares_private.h
-
-.c.o:
-	${CC} -c ${ALL_CFLAGS} $<
-
-check:
-
-install:
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
-	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
-	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
-	chmod u-w ${DESTDIR}${libdir}/$(LIB)
-	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
-	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
-	(for man in $(MANPAGES); do \
-	   ${INSTALL} -m 444 ${srcdir}/$${man} ${DESTDIR}${mandir}/man3; \
-	done)
-
-clean:
-	rm -f ${OBJS} $(LIB) adig.o adig ahost.o ahost
-
-distclean: clean
-	rm -f config.cache config.log config.status Makefile

ares/Makefile.inc

@@ -0,0 +1,15 @@
+CSOURCES = ares_fds.c ares_process.c ares_free_hostent.c ares_query.c	   \
+ares__close_sockets.c ares_free_string.c ares_search.c ares__get_hostent.c \
+ares_gethostbyaddr.c ares_send.c ares__read_line.c ares_gethostbyname.c	   \
+ares_strerror.c ares_cancel.c ares_init.c ares_timeout.c ares_destroy.c	   \
+ares_mkquery.c ares_version.c ares_expand_name.c ares_parse_a_reply.c	   \
+windows_port.c ares_expand_string.c ares_parse_ptr_reply.c
+
+HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h nameser.h
+
+MANPAGES= ares_destroy.3 ares_expand_name.3 ares_expand_string.3 ares_fds.3 \
+ ares_free_hostent.3 ares_free_string.3 ares_gethostbyaddr.3		    \
+ ares_gethostbyname.3 ares_init.3 ares_init_options.3 ares_mkquery.3	    \
+ ares_parse_a_reply.3 ares_parse_ptr_reply.3 ares_process.3		    \
+ ares_query.3 ares_search.3 ares_send.3 ares_strerror.3 ares_timeout.3	    \
+ ares_version.3 ares_cancel.3

ares/Makefile.m32

@@ -0,0 +1,75 @@
+#############################################################
+# $Id$
+#
+## Makefile for building libcares.a with MingW32 (GCC-3.2)
+## Use: make -f Makefile.m32 [demos]
+##
+## Quick hack by Guenter; comments to: /dev/nul
+
+CC = gcc
+AR = ar
+RANLIB = ranlib
+STRIP = strip -g
+#RM = rm -f 
+
+########################################################
+## Nothing more to do below this line!
+
+LIB=libcares.a
+CC=gcc
+#CPPFLAGS=@CPPFLAGS@
+WARN_FLAGS=-Wall
+CFLAGS=-O2
+CFLAGS+=${WARN_CFLAGS} ${ERROR_CFLAGS}
+DEFS=-DMINGW32
+LDFLAGS=-s
+LIBS=-lwsock32
+ALL_CFLAGS=${CPPFLAGS} ${CFLAGS} ${DEFS}
+
+MANPAGES := $(patsubst %.c,%.o,$(wildcard ares_*.3))
+
+OBJS	:= $(patsubst %.c,%.o,$(wildcard ares_*.c))
+OBJS	+= windows_port.o
+
+$(LIB): ${OBJS}
+	ar cru $@ ${OBJS}
+	${RANLIB} $@
+
+all: $(LIB) demos
+
+demos: adig.exe ahost.exe
+
+tags:
+	etags *.[ch]
+
+adig.exe: adig.o $(LIB)
+	${CC} ${LDFLAGS} -o $@ adig.o $(LIB) ${LIBS}
+
+ahost.exe: ahost.o $(LIB)
+	${CC} ${LDFLAGS} -o $@ ahost.o $(LIB) ${LIBS}
+
+${OBJS}: ares.h ares_dns.h ares_private.h
+
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
+check:
+
+install:
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
+	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
+	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
+	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
+	chmod u-w ${DESTDIR}${libdir}/$(LIB)
+	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
+	(for man in $(MANPAGES); do \
+	   ${INSTALL} -m 444 ${srcdir}/$${man} ${DESTDIR}${mandir}/man3; \
+	done)
+
+clean:
+	rm -f ${OBJS} $(LIB) adig.o adig.exe ahost.o ahost.exe
+
+distclean: clean
+	rm -f config.cache config.log config.status Makefile

ares/Makefile.netware

@@ -0,0 +1,317 @@
+#################################################################
+#
+## Makefile for building libares.lib (NetWare version - gnu make)
+## Use: make -f Makefile.netware
+##
+## Comments to: Guenter Knauf <eflash@gmx.net>
+#
+#################################################################
+
+# Edit the path below to point to the base of your Novell NDK.
+ifndef NDKBASE
+NDKBASE	= c:/novell
+endif
+
+ifndef INSTDIR
+INSTDIR	= ../curl-$(LIBCURL_VERSION_STR)-bin-nw
+endif
+
+# Edit the vars below to change NLM target settings.
+TARGETS = adig.nlm ahost.nlm
+LTARGET = libcares.lib
+VERSION	= $(LIBCARES_VERSION)
+COPYR	= Copyright (c) 1996 - 2004, Daniel Stenberg, <daniel@haxx.se>
+DESCR	= cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
+MTSAFE	= YES
+STACK	= 64000
+SCREEN	= none
+#EXPORTS	=
+# Comment the line below if you dont want to load protected automatically.
+#LDRING	= 3
+
+# Edit the var below to point to your lib architecture.
+ifndef LIBARCH
+LIBARCH = LIBC
+endif
+
+# must be equal to DEBUG or NDEBUG
+DB	= NDEBUG
+# DB	= DEBUG
+# DB	= CURLDEBUG
+# Optimization: -O<n> or debugging: -g
+ifeq ($(DB),NDEBUG)
+	OPT	= -O2
+	OBJDIR	= release
+else
+	OPT	= -g
+	OBJDIR	= debug
+endif
+
+# Include the version info retrieved from curlver.h
+-include $(OBJDIR)/version.inc
+
+# The following line defines your compiler.
+ifdef METROWERKS
+	CC = mwccnlm
+else
+	CC = gcc
+endif
+YACC	= bison -y
+CP	= cp -afv
+# RM	= rm -f
+# if you want to mark the target as MTSAFE you will need a tool for
+# generating the xdc data for the linker; here's a minimal tool:
+# http://www.gknw.com/development/prgtools/mkxdc.zip
+MPKXDC	= mkxdc
+
+# Global flags for all compilers
+CFLAGS	= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
+
+ifeq ($(CC),mwccnlm)
+LD	= mwldnlm
+LDFLAGS	= -nostdlib $(PRELUDE) $(OBJS) $(<:.def=.o) -o $@ -commandfile
+AR	= mwldnlm
+ARFLAGS	= -type library -w nocmdline $(OBJDIR)/*.o -o
+CFLAGS	+= -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
+CFLAGS	+= -relax_pointers
+#CFLAGS	+= -w on
+ifeq ($(LIBARCH),LIBC)
+	PRELUDE = $(SDK_LIBC)/imports/libcpre.o
+	CFLAGS += -align 4
+else
+	PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+#	CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
+	CFLAGS += -align 1
+endif
+else
+LD	= nlmconv
+LDFLAGS	= -T
+AR	= ar
+ARFLAGS	= -cq
+CFLAGS	+= -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
+CFLAGS	+= -Wall -Wno-format # -pedantic
+ifeq ($(LIBARCH),LIBC)
+	PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
+else
+	PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
+	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+endif
+endif
+
+NDK_ROOT = $(NDKBASE)/ndk
+SDK_CLIB = $(NDK_ROOT)/nwsdk
+SDK_LIBC = $(NDK_ROOT)/libc
+
+ifeq ($(LIBARCH),LIBC)
+	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
+	INCLUDES += -I$(SDK_LIBC)/include/winsock
+	CFLAGS += -D_POSIX_SOURCE
+#	CFLAGS += -D__ANSIC__
+else
+	INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+	# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
+	CFLAGS += -DNETDB_USE_INTERNET
+endif
+CFLAGS	+= -I. $(INCLUDES)
+
+ifeq ($(MTSAFE),YES)
+	XDCOPT = -n
+endif
+ifeq ($(MTSAFE),NO)
+	XDCOPT = -u
+endif
+
+ifeq ($(findstring linux,$(OSTYPE)),linux)
+DL	= '
+#-include $(NDKBASE)/nlmconv/ncpfs.inc
+endif
+
+OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard ares_*.c))
+
+.PHONY: lib nlm prebuild dist install clean
+
+lib: prebuild $(LTARGET)
+
+nlm: prebuild $(TARGETS) 
+
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h arpa/nameser.h
+
+dist: all
+	-$(RM) $(OBJS) $(OBJDIR)/*.map $(OBJDIR)/*.ncv
+	-$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.xdc $(OBJDIR)/version.inc
+
+install: $(INSTDIR) all
+	@$(CP) *.nlm $(INSTDIR)
+	@$(CP) ../CHANGES $(INSTDIR)
+	@$(CP) ../COPYING $(INSTDIR)
+	@$(CP) ../README $(INSTDIR)
+	@$(CP) ../RELEASE-NOTES $(INSTDIR)
+
+clean:
+	-$(RM) $(LTARGET) $(TARGETS) config.h
+	-$(RM) -r $(OBJDIR)
+	-$(RM) -r arpa
+
+%.lib: $(OBJS)
+	@echo Creating $@
+	@-$(RM) $@
+	@$(AR) $(ARFLAGS) $@ $^
+
+%.nlm: $(OBJDIR)/%.def $(OBJDIR)/%.o $(OBJDIR)/%.xdc $(OBJS)
+	@echo Linking $@
+	@-$(RM) $@
+	@$(LD) $(LDFLAGS) $<
+
+$(INSTDIR):
+	@mkdir $(INSTDIR)
+
+$(OBJDIR):
+	@mkdir $(OBJDIR)
+
+$(OBJDIR)/%.o: %.c
+#	@echo Compiling $<
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)/version.inc: ares_version.h $(OBJDIR)
+	@echo Creating $@
+	@awk -f ../packages/NetWare/get_ver.awk $< > $@
+
+$(OBJDIR)/%.xdc: Makefile.netware
+	@echo Creating $@
+	@$(MPKXDC) $(XDCOPT) $@
+
+$(OBJDIR)/%.def: Makefile.netware
+	@echo Creating $@
+	@echo $(DL)# DEF file for linking with $(LD)$(DL) > $@
+	@echo $(DL)# Do not edit this file - it is created by make!$(DL) >> $@
+	@echo $(DL)# All your changes will be lost!!$(DL) >> $@
+	@echo $(DL)#$(DL) >> $@
+	@echo $(DL)copyright "$(COPYR)"$(DL) >> $@
+	@echo $(DL)description "$(DESCR)"$(DL) >> $@
+	@echo $(DL)version $(VERSION)$(DL) >> $@
+ifdef NLMTYPE
+	@echo $(DL)type $(NLMTYPE)$(DL) >> $@
+endif
+ifdef STACK
+	@echo $(DL)stack $(STACK)$(DL) >> $@
+endif
+ifdef SCREEN
+	@echo $(DL)screenname "$(SCREEN)"$(DL) >> $@
+else
+	@echo $(DL)screenname "DEFAULT"$(DL) >> $@
+endif
+ifeq ($(DB),DEBUG)
+	@echo $(DL)debug$(DL) >> $@
+endif
+	@echo $(DL)threadname "$^"$(DL) >> $@
+ifdef XDCOPT
+	@echo $(DL)xdcdata $(@:.def=.xdc)$(DL) >> $@
+endif
+ifeq ($(LDRING),0)
+	@echo $(DL)flag_on 16$(DL) >> $@
+endif
+ifeq ($(LDRING),3)
+	@echo $(DL)flag_on 512$(DL) >> $@
+endif
+ifeq ($(LIBARCH),CLIB)
+	@echo $(DL)start _Prelude$(DL) >> $@
+	@echo $(DL)exit _Stop$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/clib.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/threads.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/nlmlib.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_CLIB)/imports/socklib.imp$(DL) >> $@
+	@echo $(DL)module clib$(DL) >> $@
+else
+	@echo $(DL)flag_on 64$(DL) >> $@
+	@echo $(DL)pseudopreemption$(DL) >> $@
+	@echo $(DL)start _LibCPrelude$(DL) >> $@
+	@echo $(DL)exit _LibCPostlude$(DL) >> $@
+	@echo $(DL)check _LibCCheckUnload$(DL) >> $@
+	@echo $(DL)import @$(SDK_LIBC)/imports/libc.imp$(DL) >> $@
+	@echo $(DL)import @$(SDK_LIBC)/imports/netware.imp$(DL) >> $@
+	@echo $(DL)module libc$(DL) >> $@
+endif
+ifdef MODULES
+	@echo $(DL)module $(MODULES)$(DL) >> $@
+endif
+ifdef EXPORTS
+	@echo $(DL)export $(EXPORTS)$(DL) >> $@
+endif
+ifdef IMPORTS
+	@echo $(DL)import $(IMPORTS)$(DL) >> $@
+endif
+ifeq ($(LD),nlmconv)
+	@echo $(DL)input $(OBJS)$(DL) >> $@
+	@echo $(DL)input $(PRELUDE)$(DL) >> $@
+	@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
+endif
+
+config.h: Makefile.netware
+	@echo Creating $@
+	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
+	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
+	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
+	@echo $(DL)*/$(DL) >> $@
+	@echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
+	@echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
+	@echo $(DL)#define PACKAGE_BUGREPORT "curl-bug@haxx.se"$(DL) >> $@
+	@echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INET_PTON 1$(DL) >> $@
+	@echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
+	@echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SOCKET 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
+	@echo $(DL)#define RETSIGTYPE void$(DL) >> $@
+	@echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@
+	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
+	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
+ifdef NW_WINSOCK
+	@echo $(DL)#define HAVE_CLOSESOCKET 1$(DL) >> $@
+else
+	@echo $(DL)#define HAVE_SYS_TYPES_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SOCKET_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SYS_SOCKIO_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_NETDB_H 1$(DL) >> $@
+endif
+ifdef OLD_NOVELLSDK
+	@echo $(DL)#define socklen_t int$(DL) >> $@
+endif
+
+arpa/nameser.h: nameser.h
+	@echo Fix missing header $@
+	@-mkdir arpa
+	@$(CP) $< arpa
+
+

ares/NEWS

@@ -1,3 +1,6 @@
+Major changes since:
+* see the CHANGES file
+
 Major changes in release 1.1.1:
 * ares should now compile as C++ code (no longer uses reserved word
   "class").

ares/adig.c

@@ -13,6 +13,7 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -36,7 +37,7 @@
 #include "ares_dns.h"
 
 #ifndef INADDR_NONE
-#define	INADDR_NONE 0xffffffff
+#define INADDR_NONE 0xffffffff
 #endif
 
 /* Mac OS X portability check */
@@ -53,58 +54,58 @@ struct nv {
 };
 
 static const struct nv flags[] = {
-  { "usevc",		ARES_FLAG_USEVC },
-  { "primary",		ARES_FLAG_PRIMARY },
-  { "igntc",		ARES_FLAG_IGNTC },
-  { "norecurse",	ARES_FLAG_NORECURSE },
-  { "stayopen",		ARES_FLAG_STAYOPEN },
-  { "noaliases",	ARES_FLAG_NOALIASES }
+  { "usevc",            ARES_FLAG_USEVC },
+  { "primary",          ARES_FLAG_PRIMARY },
+  { "igntc",            ARES_FLAG_IGNTC },
+  { "norecurse",        ARES_FLAG_NORECURSE },
+  { "stayopen",         ARES_FLAG_STAYOPEN },
+  { "noaliases",        ARES_FLAG_NOALIASES }
 };
 static const int nflags = sizeof(flags) / sizeof(flags[0]);
 
 static const struct nv classes[] = {
-  { "IN",	C_IN },
-  { "CHAOS",	C_CHAOS },
-  { "HS",	C_HS },
-  { "ANY",	C_ANY }
+  { "IN",       C_IN },
+  { "CHAOS",    C_CHAOS },
+  { "HS",       C_HS },
+  { "ANY",      C_ANY }
 };
 static const int nclasses = sizeof(classes) / sizeof(classes[0]);
 
 static const struct nv types[] = {
-  { "A",	T_A },
-  { "NS",	T_NS },
-  { "MD",	T_MD },
-  { "MF",	T_MF },
-  { "CNAME",	T_CNAME },
-  { "SOA",	T_SOA },
-  { "MB",	T_MB },
-  { "MG",	T_MG },
-  { "MR",	T_MR },
-  { "NULL",	T_NULL },
-  { "WKS",	T_WKS },
-  { "PTR",	T_PTR },
-  { "HINFO",	T_HINFO },
-  { "MINFO",	T_MINFO },
-  { "MX",	T_MX },
-  { "TXT",	T_TXT },
-  { "RP",	T_RP },
-  { "AFSDB",	T_AFSDB },
-  { "X25",	T_X25 },
-  { "ISDN",	T_ISDN },
-  { "RT",	T_RT },
-  { "NSAP",	T_NSAP },
-  { "NSAP_PTR",	T_NSAP_PTR },
-  { "SIG",	T_SIG },
-  { "KEY",	T_KEY },
-  { "PX",	T_PX },
-  { "GPOS",	T_GPOS },
-  { "AAAA",	T_AAAA },
-  { "LOC",	T_LOC },
-  { "SRV",	T_SRV },
-  { "AXFR",	T_AXFR },
-  { "MAILB",	T_MAILB },
-  { "MAILA",	T_MAILA },
-  { "ANY",	T_ANY }
+  { "A",        T_A },
+  { "NS",       T_NS },
+  { "MD",       T_MD },
+  { "MF",       T_MF },
+  { "CNAME",    T_CNAME },
+  { "SOA",      T_SOA },
+  { "MB",       T_MB },
+  { "MG",       T_MG },
+  { "MR",       T_MR },
+  { "NULL",     T_NULL },
+  { "WKS",      T_WKS },
+  { "PTR",      T_PTR },
+  { "HINFO",    T_HINFO },
+  { "MINFO",    T_MINFO },
+  { "MX",       T_MX },
+  { "TXT",      T_TXT },
+  { "RP",       T_RP },
+  { "AFSDB",    T_AFSDB },
+  { "X25",      T_X25 },
+  { "ISDN",     T_ISDN },
+  { "RT",       T_RT },
+  { "NSAP",     T_NSAP },
+  { "NSAP_PTR", T_NSAP_PTR },
+  { "SIG",      T_SIG },
+  { "KEY",      T_KEY },
+  { "PX",       T_PX },
+  { "GPOS",     T_GPOS },
+  { "AAAA",     T_AAAA },
+  { "LOC",      T_LOC },
+  { "SRV",      T_SRV },
+  { "AXFR",     T_AXFR },
+  { "MAILB",    T_MAILB },
+  { "MAILA",    T_MAILA },
+  { "ANY",      T_ANY }
 };
 static const int ntypes = sizeof(types) / sizeof(types[0]);
 
@@ -123,10 +124,10 @@ static const char *rcodes[] = {
 
 static void callback(void *arg, int status, unsigned char *abuf, int alen);
 static const unsigned char *display_question(const unsigned char *aptr,
-					     const unsigned char *abuf,
-					     int alen);
+                                             const unsigned char *abuf,
+                                             int alen);
 static const unsigned char *display_rr(const unsigned char *aptr,
-				       const unsigned char *abuf, int alen);
+                                       const unsigned char *abuf, int alen);
 static const char *type_name(int type);
 static const char *class_name(int dnsclass);
 static void usage(void);
@@ -145,7 +146,7 @@ int main(int argc, char **argv)
   WORD wVersionRequested = MAKEWORD(1,1);
   WSADATA wsaData;
   WSAStartup(wVersionRequested, &wsaData);
-#endif  
+#endif
 
   options.flags = ARES_FLAG_NOCHECKRESP;
   options.servers = NULL;
@@ -153,80 +154,80 @@ int main(int argc, char **argv)
   while ((c = getopt(argc, argv, "f:s:c:t:T:U:")) != -1)
     {
       switch (c)
-	{
-	case 'f':
-	  /* Add a flag. */
-	  for (i = 0; i < nflags; i++)
-	    {
-	      if (strcmp(flags[i].name, optarg) == 0)
-		break;
-	    }
-	  if (i == nflags)
-	    usage();
-	  options.flags |= flags[i].value;
-	  break;
+        {
+        case 'f':
+          /* Add a flag. */
+          for (i = 0; i < nflags; i++)
+            {
+              if (strcmp(flags[i].name, optarg) == 0)
+                break;
+            }
+          if (i == nflags)
+            usage();
+          options.flags |= flags[i].value;
+          break;
 
-	case 's':
-	  /* Add a server, and specify servers in the option mask. */
-	  hostent = gethostbyname(optarg);
-	  if (!hostent || hostent->h_addrtype != AF_INET)
-	    {
-	      fprintf(stderr, "adig: server %s not found.\n", optarg);
-	      return 1;
-	    }
-	  options.servers = realloc(options.servers, (options.nservers + 1)
-				    * sizeof(struct in_addr));
-	  if (!options.servers)
-	    {
-	      fprintf(stderr, "Out of memory!\n");
-	      return 1;
-	    }
-	  memcpy(&options.servers[options.nservers], hostent->h_addr,
-		 sizeof(struct in_addr));
-	  options.nservers++;
-	  optmask |= ARES_OPT_SERVERS;
-	  break;
+        case 's':
+          /* Add a server, and specify servers in the option mask. */
+          hostent = gethostbyname(optarg);
+          if (!hostent || hostent->h_addrtype != AF_INET)
+            {
+              fprintf(stderr, "adig: server %s not found.\n", optarg);
+              return 1;
+            }
+          options.servers = realloc(options.servers, (options.nservers + 1)
+                                    * sizeof(struct in_addr));
+          if (!options.servers)
+            {
+              fprintf(stderr, "Out of memory!\n");
+              return 1;
+            }
+          memcpy(&options.servers[options.nservers], hostent->h_addr,
+                 sizeof(struct in_addr));
+          options.nservers++;
+          optmask |= ARES_OPT_SERVERS;
+          break;
 
-	case 'c':
-	  /* Set the query class. */
-	  for (i = 0; i < nclasses; i++)
-	    {
-	      if (strcasecmp(classes[i].name, optarg) == 0)
-		break;
-	    }
-	  if (i == nclasses)
-	    usage();
-	  dnsclass = classes[i].value;
-	  break;
+        case 'c':
+          /* Set the query class. */
+          for (i = 0; i < nclasses; i++)
+            {
+              if (strcasecmp(classes[i].name, optarg) == 0)
+                break;
+            }
+          if (i == nclasses)
+            usage();
+          dnsclass = classes[i].value;
+          break;
 
-	case 't':
-	  /* Set the query type. */
-	  for (i = 0; i < ntypes; i++)
-	    {
-	      if (strcasecmp(types[i].name, optarg) == 0)
-		break;
-	    }
-	  if (i == ntypes)
-	    usage();
-	  type = types[i].value;
-	  break;
+        case 't':
+          /* Set the query type. */
+          for (i = 0; i < ntypes; i++)
+            {
+              if (strcasecmp(types[i].name, optarg) == 0)
+                break;
+            }
+          if (i == ntypes)
+            usage();
+          type = types[i].value;
+          break;
 
-	case 'T':
-	  /* Set the TCP port number. */
-	  if (!isdigit((unsigned char)*optarg))
-	    usage();
-	  options.tcp_port = strtol(optarg, NULL, 0);
-	  optmask |= ARES_OPT_TCP_PORT;
-	  break;
+        case 'T':
+          /* Set the TCP port number. */
+          if (!isdigit((unsigned char)*optarg))
+            usage();
+          options.tcp_port = strtol(optarg, NULL, 0);
+          optmask |= ARES_OPT_TCP_PORT;
+          break;
 
-	case 'U':
-	  /* Set the UDP port number. */
-	  if (!isdigit((unsigned char)*optarg))
-	    usage();
-	  options.udp_port = strtol(optarg, NULL, 0);
-	  optmask |= ARES_OPT_UDP_PORT;
-	  break;
-	}
+        case 'U':
+          /* Set the UDP port number. */
+          if (!isdigit((unsigned char)*optarg))
+            usage();
+          options.udp_port = strtol(optarg, NULL, 0);
+          optmask |= ARES_OPT_UDP_PORT;
+          break;
+        }
     }
   argc -= optind;
   argv += optind;
@@ -238,7 +239,7 @@ int main(int argc, char **argv)
   if (status != ARES_SUCCESS)
     {
       fprintf(stderr, "ares_init_options: %s\n",
-	      ares_strerror(status));
+              ares_strerror(status));
       return 1;
     }
 
@@ -252,7 +253,7 @@ int main(int argc, char **argv)
   else
     {
       for (; *argv; argv++)
-	ares_query(channel, *argv, dnsclass, type, callback, *argv);
+        ares_query(channel, *argv, dnsclass, type, callback, *argv);
     }
 
   /* Wait for all queries to complete. */
@@ -262,14 +263,14 @@ int main(int argc, char **argv)
       FD_ZERO(&write_fds);
       nfds = ares_fds(channel, &read_fds, &write_fds);
       if (nfds == 0)
-	break;
+        break;
       tvp = ares_timeout(channel, NULL, &tv);
       count = select(nfds, &read_fds, &write_fds, NULL, tvp);
       if (count < 0 && errno != EINVAL)
-	{
-	  perror("select");
-	  return 1;
-	}
+        {
+          perror("select");
+          return 1;
+        }
       ares_process(channel, &read_fds, &write_fds);
     }
 
@@ -295,7 +296,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
     {
       printf("%s\n", ares_strerror(status));
       if (!abuf)
-	return;
+        return;
     }
 
   /* Won't happen, but check anyway, for safety. */
@@ -319,11 +320,11 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
   /* Display the answer header. */
   printf("id: %d\n", id);
   printf("flags: %s%s%s%s%s\n",
-	 qr ? "qr " : "",
-	 aa ? "aa " : "",
-	 tc ? "tc " : "",
-	 rd ? "rd " : "",
-	 ra ? "ra " : "");
+         qr ? "qr " : "",
+         aa ? "aa " : "",
+         tc ? "tc " : "",
+         rd ? "rd " : "",
+         ra ? "ra " : "");
   printf("opcode: %s\n", opcodes[opcode]);
   printf("rcode: %s\n", rcodes[rcode]);
 
@@ -334,7 +335,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
     {
       aptr = display_question(aptr, abuf, alen);
       if (aptr == NULL)
-	return;
+        return;
     }
 
   /* Display the answers. */
@@ -343,7 +344,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
     {
       aptr = display_rr(aptr, abuf, alen);
       if (aptr == NULL)
-	return;
+        return;
     }
 
   /* Display the NS records. */
@@ -352,7 +353,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
     {
       aptr = display_rr(aptr, abuf, alen);
       if (aptr == NULL)
-	return;
+        return;
     }
 
   /* Display the additional records. */
@@ -361,13 +362,13 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
     {
       aptr = display_rr(aptr, abuf, alen);
       if (aptr == NULL)
-	return;
+        return;
     }
 }
 
 static const unsigned char *display_question(const unsigned char *aptr,
-					     const unsigned char *abuf,
-					     int alen)
+                                             const unsigned char *abuf,
+                                             int alen)
 {
   char *name;
   int type, dnsclass, status;
@@ -405,7 +406,7 @@ static const unsigned char *display_question(const unsigned char *aptr,
 }
 
 static const unsigned char *display_rr(const unsigned char *aptr,
-				       const unsigned char *abuf, int alen)
+                                       const unsigned char *abuf, int alen)
 {
   const unsigned char *p;
   char *name;
@@ -462,7 +463,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       /* For these types, the RR data is just a domain name. */
       status = ares_expand_name(aptr, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
       printf("\t%s.", name);
       free(name);
       break;
@@ -472,12 +473,12 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       p = aptr;
       len = *p;
       if (p + len + 1 > aptr + dlen)
-	return NULL;
+        return NULL;
       printf("\t%.*s", len, p + 1);
       p += len + 1;
       len = *p;
       if (p + len + 1 > aptr + dlen)
-	return NULL;
+        return NULL;
       printf("\t%.*s", len, p + 1);
       break;
 
@@ -486,13 +487,13 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       p = aptr;
       status = ares_expand_name(p, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
       printf("\t%s.", name);
       free(name);
       p += len;
       status = ares_expand_name(p, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
       printf("\t%s.", name);
       free(name);
       break;
@@ -502,11 +503,11 @@ static const unsigned char *display_rr(const unsigned char *aptr,
        * then a domain name.
        */
       if (dlen < 2)
-	return NULL;
+        return NULL;
       printf("\t%d", (aptr[0] << 8) | aptr[1]);
       status = ares_expand_name(aptr + 2, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
       printf("\t%s.", name);
       free(name);
       break;
@@ -518,24 +519,24 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       p = aptr;
       status = ares_expand_name(p, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
       printf("\t%s.\n", name);
       free(name);
       p += len;
       status = ares_expand_name(p, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
-	return NULL;
+        return NULL;
       printf("\t\t\t\t\t\t%s.\n", name);
       free(name);
       p += len;
       if (p + 20 > aptr + dlen)
-	return NULL;
+        return NULL;
       printf("\t\t\t\t\t\t( %d %d %d %d %d )",
-	     (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3],
-	     (p[4] << 24) | (p[5] << 16) | (p[6] << 8) | p[7],
-	     (p[8] << 24) | (p[9] << 16) | (p[10] << 8) | p[11],
-	     (p[12] << 24) | (p[13] << 16) | (p[14] << 8) | p[15],
-	     (p[16] << 24) | (p[17] << 16) | (p[18] << 8) | p[19]);
+             (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3],
+             (p[4] << 24) | (p[5] << 16) | (p[6] << 8) | p[7],
+             (p[8] << 24) | (p[9] << 16) | (p[10] << 8) | p[11],
+             (p[12] << 24) | (p[13] << 16) | (p[14] << 8) | p[15],
+             (p[16] << 24) | (p[17] << 16) | (p[18] << 8) | p[19]);
       break;
 
     case T_TXT:
@@ -543,19 +544,19 @@ static const unsigned char *display_rr(const unsigned char *aptr,
        * strings. */
       p = aptr;
       while (p < aptr + dlen)
-	{
-	  len = *p;
-	  if (p + len + 1 > aptr + dlen)
-	    return NULL;
-	  printf("\t%.*s", len, p + 1);
-	  p += len + 1;
-	}
+        {
+          len = *p;
+          if (p + len + 1 > aptr + dlen)
+            return NULL;
+          printf("\t%.*s", len, p + 1);
+          p += len + 1;
+        }
       break;
 
     case T_A:
       /* The RR data is a four-byte Internet address. */
       if (dlen != 4)
-	return NULL;
+        return NULL;
       memcpy(&addr, aptr, sizeof(struct in_addr));
       printf("\t%s", inet_ntoa(addr));
       break;
@@ -568,18 +569,18 @@ static const unsigned char *display_rr(const unsigned char *aptr,
       /* The RR data is three two-byte numbers representing the
        * priority, weight, and port, followed by a domain name.
        */
-      
+
       printf("\t%d", DNS__16BIT(aptr));
       printf(" %d", DNS__16BIT(aptr + 2));
       printf(" %d", DNS__16BIT(aptr + 4));
-      
+
       status = ares_expand_name(aptr + 6, abuf, alen, &name, &len);
       if (status != ARES_SUCCESS)
         return NULL;
       printf("\t%s.", name);
       free(name);
       break;
-      
+
     default:
       printf("\t[Unknown RR; cannot parse]");
     }
@@ -595,7 +596,7 @@ static const char *type_name(int type)
   for (i = 0; i < ntypes; i++)
     {
       if (types[i].value == type)
-	return types[i].name;
+        return types[i].name;
     }
   return "(unknown)";
 }
@@ -607,7 +608,7 @@ static const char *class_name(int dnsclass)
   for (i = 0; i < nclasses; i++)
     {
       if (classes[i].value == dnsclass)
-	return classes[i].name;
+        return classes[i].name;
     }
   return "(unknown)";
 }
@@ -615,6 +616,6 @@ static const char *class_name(int dnsclass)
 static void usage(void)
 {
   fprintf(stderr, "usage: adig [-f flag] [-s server] [-c class] "
-	  "[-t type] [-p port] name ...\n");
+          "[-t type] [-p port] name ...\n");
   exit(1);
 }

ares/ahost.c

@@ -13,6 +13,7 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -32,7 +33,7 @@
 #include "ares_dns.h"
 
 #ifndef INADDR_NONE
-#define	INADDR_NONE 0xffffffff
+#define INADDR_NONE 0xffffffff
 #endif
 
 static void callback(void *arg, int status, struct hostent *host);
@@ -50,7 +51,7 @@ int main(int argc, char **argv)
   WORD wVersionRequested = MAKEWORD(1,1);
   WSADATA wsaData;
   WSAStartup(wVersionRequested, &wsaData);
-#endif  
+#endif
 
   if (argc <= 1)
     usage();
@@ -67,12 +68,12 @@ int main(int argc, char **argv)
     {
       addr.s_addr = inet_addr(*argv);
       if (addr.s_addr == INADDR_NONE)
-	ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
+        ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
       else
-	{
-	  ares_gethostbyaddr(channel, &addr, sizeof(addr), AF_INET, callback,
-			     *argv);
-	}
+        {
+          ares_gethostbyaddr(channel, &addr, sizeof(addr), AF_INET, callback,
+                             *argv);
+        }
     }
 
   /* Wait for all queries to complete. */
@@ -82,7 +83,7 @@ int main(int argc, char **argv)
       FD_ZERO(&write_fds);
       nfds = ares_fds(channel, &read_fds, &write_fds);
       if (nfds == 0)
-	break;
+        break;
       tvp = ares_timeout(channel, NULL, &tv);
       select(nfds, &read_fds, &write_fds, NULL, tvp);
       ares_process(channel, &read_fds, &write_fds);

ares/ares.h

@@ -20,63 +20,66 @@
 
 #include <sys/types.h>
 
-#ifdef _AIX
+#if defined(_AIX) || defined(NETWARE)
 /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
    libc5-based Linux systems. Only include it on system that are known to
    require it! */
 #include <sys/select.h>
 #endif
 
-#ifdef WIN32
-#include <winsock.h>
-#include <windows.h>
+#if defined(WATT32)
+  #include <netinet/in.h>
+  #include <tcp.h>
+#elif defined(WIN32)
+  #include <winsock.h>
+  #include <windows.h>
 #else
-#include <netinet/in.h>
+  #include <netinet/in.h>
 #endif
 
-#define ARES_SUCCESS		0
+#define ARES_SUCCESS            0
 
 /* Server error codes (ARES_ENODATA indicates no relevant answer) */
-#define ARES_ENODATA		1
-#define ARES_EFORMERR		2
-#define ARES_ESERVFAIL		3
-#define ARES_ENOTFOUND		4
-#define ARES_ENOTIMP		5
-#define ARES_EREFUSED		6
+#define ARES_ENODATA            1
+#define ARES_EFORMERR           2
+#define ARES_ESERVFAIL          3
+#define ARES_ENOTFOUND          4
+#define ARES_ENOTIMP            5
+#define ARES_EREFUSED           6
 
 /* Locally generated error codes */
-#define ARES_EBADQUERY		7
-#define ARES_EBADNAME		8
-#define ARES_EBADFAMILY		9
-#define ARES_EBADRESP		10
-#define ARES_ECONNREFUSED	11
-#define ARES_ETIMEOUT		12
-#define ARES_EOF		13
-#define ARES_EFILE		14
-#define ARES_ENOMEM		15
-#define ARES_EDESTRUCTION	16
-#define ARES_EBADSTR		17
+#define ARES_EBADQUERY          7
+#define ARES_EBADNAME           8
+#define ARES_EBADFAMILY         9
+#define ARES_EBADRESP           10
+#define ARES_ECONNREFUSED       11
+#define ARES_ETIMEOUT           12
+#define ARES_EOF                13
+#define ARES_EFILE              14
+#define ARES_ENOMEM             15
+#define ARES_EDESTRUCTION       16
+#define ARES_EBADSTR            17
 
 /* Flag values */
-#define ARES_FLAG_USEVC		(1 << 0)
-#define ARES_FLAG_PRIMARY	(1 << 1)
-#define ARES_FLAG_IGNTC		(1 << 2)
-#define ARES_FLAG_NORECURSE	(1 << 3)
-#define ARES_FLAG_STAYOPEN	(1 << 4)
-#define ARES_FLAG_NOSEARCH	(1 << 5)
-#define ARES_FLAG_NOALIASES	(1 << 6)
-#define ARES_FLAG_NOCHECKRESP	(1 << 7)
+#define ARES_FLAG_USEVC         (1 << 0)
+#define ARES_FLAG_PRIMARY       (1 << 1)
+#define ARES_FLAG_IGNTC         (1 << 2)
+#define ARES_FLAG_NORECURSE     (1 << 3)
+#define ARES_FLAG_STAYOPEN      (1 << 4)
+#define ARES_FLAG_NOSEARCH      (1 << 5)
+#define ARES_FLAG_NOALIASES     (1 << 6)
+#define ARES_FLAG_NOCHECKRESP   (1 << 7)
 
 /* Option mask values */
-#define ARES_OPT_FLAGS		(1 << 0)
-#define ARES_OPT_TIMEOUT	(1 << 1)
-#define ARES_OPT_TRIES		(1 << 2)
-#define ARES_OPT_NDOTS		(1 << 3)
-#define ARES_OPT_UDP_PORT	(1 << 4)
-#define ARES_OPT_TCP_PORT	(1 << 5)
-#define ARES_OPT_SERVERS	(1 << 6)
-#define ARES_OPT_DOMAINS	(1 << 7)
-#define ARES_OPT_LOOKUPS	(1 << 8)
+#define ARES_OPT_FLAGS          (1 << 0)
+#define ARES_OPT_TIMEOUT        (1 << 1)
+#define ARES_OPT_TRIES          (1 << 2)
+#define ARES_OPT_NDOTS          (1 << 3)
+#define ARES_OPT_UDP_PORT       (1 << 4)
+#define ARES_OPT_TCP_PORT       (1 << 5)
+#define ARES_OPT_SERVERS        (1 << 6)
+#define ARES_OPT_DOMAINS        (1 << 7)
+#define ARES_OPT_LOOKUPS        (1 << 8)
 
 struct ares_options {
   int flags;
@@ -97,41 +100,41 @@ struct timeval;
 struct ares_channeldata;
 typedef struct ares_channeldata *ares_channel;
 typedef void (*ares_callback)(void *arg, int status, unsigned char *abuf,
-			      int alen);
+                              int alen);
 typedef void (*ares_host_callback)(void *arg, int status,
-				   struct hostent *hostent);
+                                   struct hostent *hostent);
 
 int ares_init(ares_channel *channelptr);
 int ares_init_options(ares_channel *channelptr, struct ares_options *options,
-		      int optmask);
+                      int optmask);
 void ares_destroy(ares_channel channel);
 void ares_cancel(ares_channel channel);
 void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
-	       ares_callback callback, void *arg);
+               ares_callback callback, void *arg);
 void ares_query(ares_channel channel, const char *name, int dnsclass,
-		int type, ares_callback callback, void *arg);
+                int type, ares_callback callback, void *arg);
 void ares_search(ares_channel channel, const char *name, int dnsclass,
-		 int type, ares_callback callback, void *arg);
+                 int type, ares_callback callback, void *arg);
 void ares_gethostbyname(ares_channel channel, const char *name, int family,
-			ares_host_callback callback, void *arg);
+                        ares_host_callback callback, void *arg);
 void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
-			int family, ares_host_callback callback, void *arg);
+                        int family, ares_host_callback callback, void *arg);
 
 int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
 struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
-			     struct timeval *tv);
+                             struct timeval *tv);
 void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
 
 int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
-		 int rd, unsigned char **buf, int *buflen);
+                 int rd, unsigned char **buf, int *buflen);
 int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, char **s, long *enclen);
+                     int alen, char **s, long *enclen);
 int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, unsigned char **s, long *enclen);
+                     int alen, unsigned char **s, long *enclen);
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
-		       struct hostent **host);
+                       struct hostent **host);
 int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
-			 int addrlen, int family, struct hostent **host);
+                         int addrlen, int family, struct hostent **host);
 void ares_free_string(void *str);
 void ares_free_hostent(struct hostent *host);
 const char *ares_strerror(int code);

ares/ares__close_sockets.c

@@ -13,11 +13,13 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
+
 #include <stdlib.h>
-#ifdef WIN32
-#else
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
 #include "ares.h"
 #include "ares_private.h"
 
@@ -42,14 +44,14 @@ void ares__close_sockets(struct server_state *server)
   server->tcp_lenbuf_pos = 0;
 
   /* Close the TCP and UDP sockets. */
-  if (server->tcp_socket != -1)
+  if (server->tcp_socket != ARES_SOCKET_BAD)
     {
       closesocket(server->tcp_socket);
-      server->tcp_socket = -1;
+      server->tcp_socket = ARES_SOCKET_BAD;
     }
-  if (server->udp_socket != -1)
+  if (server->udp_socket != ARES_SOCKET_BAD)
     {
       closesocket(server->udp_socket);
-      server->udp_socket = -1;
+      server->udp_socket = ARES_SOCKET_BAD;
     }
 }

ares/ares__get_hostent.c

@@ -13,11 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -43,96 +42,96 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
     {
       /* Skip comment lines; terminate line at comment character. */
       if (*line == '#' || !*line)
-	continue;
+        continue;
       p = strchr(line, '#');
       if (p)
-	*p = 0;
+        *p = 0;
 
       /* Get the address part. */
       p = line;
       while (*p && !isspace((unsigned char)*p))
-	p++;
+        p++;
       if (!*p)
-	continue;
+        continue;
       *p = 0;
       addr.s_addr = inet_addr(line);
       if (addr.s_addr == INADDR_NONE)
-	continue;
+        continue;
 
       /* Get the canonical hostname. */
       p++;
       while (isspace((unsigned char)*p))
-	p++;
+        p++;
       if (!*p)
-	continue;
+        continue;
       q = p;
       while (*q && !isspace((unsigned char)*q))
-	q++;
+        q++;
       end_at_hostname = (*q == 0);
       *q = 0;
       canonical = p;
 
       naliases = 0;
       if (!end_at_hostname)
-	{
-	  /* Count the aliases. */
-	  p = q + 1;
-	  while (isspace((unsigned char)*p))
-	    p++;
-	  while (*p)
-	    {
-	      while (*p && !isspace((unsigned char)*p))
-		p++;
-	      while (isspace((unsigned char)*p))
-		p++;
-	      naliases++;
-	    }
-	}
+        {
+          /* Count the aliases. */
+          p = q + 1;
+          while (isspace((unsigned char)*p))
+            p++;
+          while (*p)
+            {
+              while (*p && !isspace((unsigned char)*p))
+                p++;
+              while (isspace((unsigned char)*p))
+                p++;
+              naliases++;
+            }
+        }
 
       /* Allocate memory for the host structure. */
       hostent = malloc(sizeof(struct hostent));
       if (!hostent)
-	break;
+        break;
       hostent->h_aliases = NULL;
       hostent->h_addr_list = NULL;
       hostent->h_name = strdup(canonical);
       if (!hostent->h_name)
-	break;
+        break;
       hostent->h_addr_list = malloc(2 * sizeof(char *));
       if (!hostent->h_addr_list)
-	break;
+        break;
       hostent->h_addr_list[0] = malloc(sizeof(struct in_addr));
       if (!hostent->h_addr_list[0])
-	break;
+        break;
       hostent->h_aliases = malloc((naliases + 1) * sizeof(char *));
       if (!hostent->h_aliases)
-	break;
+        break;
 
       /* Copy in aliases. */
       naliases = 0;
       if (!end_at_hostname)
-	{
-	  p = canonical + strlen(canonical) + 1;
-	  while (isspace((unsigned char)*p))
-	    p++;
-	  while (*p)
-	    {
-	      q = p;
-	      while (*q && !isspace((unsigned char)*q))
-		q++;
-	      hostent->h_aliases[naliases] = malloc(q - p + 1);
-	      if (hostent->h_aliases[naliases] == NULL)
-		break;
-	      memcpy(hostent->h_aliases[naliases], p, q - p);
-	      hostent->h_aliases[naliases][q - p] = 0;
-	      p = q;
-	      while (isspace((unsigned char)*p))
-		p++;
-	      naliases++;
-	    }
-	  if (*p)
-	    break;
-	}
+        {
+          p = canonical + strlen(canonical) + 1;
+          while (isspace((unsigned char)*p))
+            p++;
+          while (*p)
+            {
+              q = p;
+              while (*q && !isspace((unsigned char)*q))
+                q++;
+              hostent->h_aliases[naliases] = malloc(q - p + 1);
+              if (hostent->h_aliases[naliases] == NULL)
+                break;
+              memcpy(hostent->h_aliases[naliases], p, q - p);
+              hostent->h_aliases[naliases][q - p] = 0;
+              p = q;
+              while (isspace((unsigned char)*p))
+                p++;
+              naliases++;
+            }
+          if (*p)
+            break;
+        }
       hostent->h_aliases[naliases] = NULL;
 
       hostent->h_addrtype = AF_INET;
@@ -150,22 +149,22 @@ int ares__get_hostent(FILE *fp, struct hostent **host)
     {
       /* Memory allocation failure; clean up. */
       if (hostent)
-	{
+        {
           if(hostent->h_name)
             free((char *) hostent->h_name);
-	  if (hostent->h_aliases)
-	    {
-	      for (alias = hostent->h_aliases; *alias; alias++)
-		free(*alias);
-	    }
+          if (hostent->h_aliases)
+            {
+              for (alias = hostent->h_aliases; *alias; alias++)
+                free(*alias);
+            }
           if(hostent->h_aliases)
             free(hostent->h_aliases);
-	  if (hostent->h_addr_list && hostent->h_addr_list[0])
-	    free(hostent->h_addr_list[0]);
+          if (hostent->h_addr_list && hostent->h_addr_list[0])
+            free(hostent->h_addr_list[0]);
           if(hostent->h_addr_list)
             free(hostent->h_addr_list);
           free(hostent);
-	}
+        }
       return ARES_ENOMEM;
     }
 

ares/ares__read_line.c

@@ -13,6 +13,7 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,26 +38,26 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize)
     {
       *buf = malloc(128);
       if (!*buf)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
       *bufsize = 128;
     }
 
   while (1)
     {
       if (!fgets(*buf + offset, *bufsize - (int)offset, fp))
-	return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
+        return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
       len = offset + strlen(*buf + offset);
       if ((*buf)[len - 1] == '\n')
-	{
-	  (*buf)[len - 1] = 0;
-	  return ARES_SUCCESS;
-	}
+        {
+          (*buf)[len - 1] = 0;
+          return ARES_SUCCESS;
+        }
       offset = len;
 
       /* Allocate more space. */
       newbuf = realloc(*buf, *bufsize * 2);
       if (!newbuf)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
       *buf = newbuf;
       *bufsize *= 2;
     }

ares/ares_cancel.c

@@ -1,18 +1,17 @@
-/* Copyright 1998 by the Massachusetts Institute of Technology.
+/* Copyright (C) 2004 by Daniel Stenberg et al
  *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"

ares/ares_destroy.c

@@ -13,6 +13,7 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"

ares/ares_dns.h

@@ -18,64 +18,64 @@
 #ifndef ARES__DNS_H
 #define ARES__DNS_H
 
-#define DNS__16BIT(p)			(((p)[0] << 8) | (p)[1])
-#define DNS__32BIT(p)			(((p)[0] << 24) | ((p)[1] << 16) | \
-					 ((p)[2] << 8) | (p)[3])
-#define DNS__SET16BIT(p, v)		(((p)[0] = ((v) >> 8) & 0xff), \
-					 ((p)[1] = (v) & 0xff))
-#define DNS__SET32BIT(p, v)		(((p)[0] = ((v) >> 24) & 0xff), \
-					 ((p)[1] = ((v) >> 16) & 0xff), \
-					 ((p)[2] = ((v) >> 8) & 0xff), \
-					 ((p)[3] = (v) & 0xff))
+#define DNS__16BIT(p)                   (((p)[0] << 8) | (p)[1])
+#define DNS__32BIT(p)                   (((p)[0] << 24) | ((p)[1] << 16) | \
+                                         ((p)[2] << 8) | (p)[3])
+#define DNS__SET16BIT(p, v)             (((p)[0] = ((v) >> 8) & 0xff), \
+                                         ((p)[1] = (v) & 0xff))
+#define DNS__SET32BIT(p, v)             (((p)[0] = ((v) >> 24) & 0xff), \
+                                         ((p)[1] = ((v) >> 16) & 0xff), \
+                                         ((p)[2] = ((v) >> 8) & 0xff), \
+                                         ((p)[3] = (v) & 0xff))
 
 /* Macros for parsing a DNS header */
-#define DNS_HEADER_QID(h)		DNS__16BIT(h)
-#define DNS_HEADER_QR(h)		(((h)[2] >> 7) & 0x1)
-#define DNS_HEADER_OPCODE(h)		(((h)[2] >> 3) & 0xf)
-#define DNS_HEADER_AA(h)		(((h)[2] >> 2) & 0x1)
-#define DNS_HEADER_TC(h)		(((h)[2] >> 1) & 0x1)
-#define DNS_HEADER_RD(h)		((h)[2] & 0x1)
-#define DNS_HEADER_RA(h)		(((h)[3] >> 7) & 0x1)
-#define DNS_HEADER_Z(h)			(((h)[3] >> 4) & 0x7)
-#define DNS_HEADER_RCODE(h)		((h)[3] & 0xf)
-#define DNS_HEADER_QDCOUNT(h)		DNS__16BIT((h) + 4)
-#define DNS_HEADER_ANCOUNT(h)		DNS__16BIT((h) + 6)
-#define DNS_HEADER_NSCOUNT(h)		DNS__16BIT((h) + 8)
-#define DNS_HEADER_ARCOUNT(h)		DNS__16BIT((h) + 10)
+#define DNS_HEADER_QID(h)               DNS__16BIT(h)
+#define DNS_HEADER_QR(h)                (((h)[2] >> 7) & 0x1)
+#define DNS_HEADER_OPCODE(h)            (((h)[2] >> 3) & 0xf)
+#define DNS_HEADER_AA(h)                (((h)[2] >> 2) & 0x1)
+#define DNS_HEADER_TC(h)                (((h)[2] >> 1) & 0x1)
+#define DNS_HEADER_RD(h)                ((h)[2] & 0x1)
+#define DNS_HEADER_RA(h)                (((h)[3] >> 7) & 0x1)
+#define DNS_HEADER_Z(h)                 (((h)[3] >> 4) & 0x7)
+#define DNS_HEADER_RCODE(h)             ((h)[3] & 0xf)
+#define DNS_HEADER_QDCOUNT(h)           DNS__16BIT((h) + 4)
+#define DNS_HEADER_ANCOUNT(h)           DNS__16BIT((h) + 6)
+#define DNS_HEADER_NSCOUNT(h)           DNS__16BIT((h) + 8)
+#define DNS_HEADER_ARCOUNT(h)           DNS__16BIT((h) + 10)
 
 /* Macros for constructing a DNS header */
-#define DNS_HEADER_SET_QID(h, v)	DNS__SET16BIT(h, v)
-#define DNS_HEADER_SET_QR(h, v)		((h)[2] |= (((v) & 0x1) << 7))
-#define DNS_HEADER_SET_OPCODE(h, v)	((h)[2] |= (((v) & 0xf) << 3))
-#define DNS_HEADER_SET_AA(h, v)		((h)[2] |= (((v) & 0x1) << 2))
-#define DNS_HEADER_SET_TC(h, v)		((h)[2] |= (((v) & 0x1) << 1))
-#define DNS_HEADER_SET_RD(h, v)		((h)[2] |= (((v) & 0x1)))
-#define DNS_HEADER_SET_RA(h, v)		((h)[3] |= (((v) & 0x1) << 7))
-#define DNS_HEADER_SET_Z(h, v)		((h)[3] |= (((v) & 0x7) << 4))
-#define DNS_HEADER_SET_RCODE(h, v)	((h)[3] |= (((v) & 0xf)))
-#define DNS_HEADER_SET_QDCOUNT(h, v)	DNS__SET16BIT((h) + 4, v)
-#define DNS_HEADER_SET_ANCOUNT(h, v)	DNS__SET16BIT((h) + 6, v)
-#define DNS_HEADER_SET_NSCOUNT(h, v)	DNS__SET16BIT((h) + 8, v)
-#define DNS_HEADER_SET_ARCOUNT(h, v)	DNS__SET16BIT((h) + 10, v)
+#define DNS_HEADER_SET_QID(h, v)        DNS__SET16BIT(h, v)
+#define DNS_HEADER_SET_QR(h, v)         ((h)[2] |= (((v) & 0x1) << 7))
+#define DNS_HEADER_SET_OPCODE(h, v)     ((h)[2] |= (((v) & 0xf) << 3))
+#define DNS_HEADER_SET_AA(h, v)         ((h)[2] |= (((v) & 0x1) << 2))
+#define DNS_HEADER_SET_TC(h, v)         ((h)[2] |= (((v) & 0x1) << 1))
+#define DNS_HEADER_SET_RD(h, v)         ((h)[2] |= (((v) & 0x1)))
+#define DNS_HEADER_SET_RA(h, v)         ((h)[3] |= (((v) & 0x1) << 7))
+#define DNS_HEADER_SET_Z(h, v)          ((h)[3] |= (((v) & 0x7) << 4))
+#define DNS_HEADER_SET_RCODE(h, v)      ((h)[3] |= (((v) & 0xf)))
+#define DNS_HEADER_SET_QDCOUNT(h, v)    DNS__SET16BIT((h) + 4, v)
+#define DNS_HEADER_SET_ANCOUNT(h, v)    DNS__SET16BIT((h) + 6, v)
+#define DNS_HEADER_SET_NSCOUNT(h, v)    DNS__SET16BIT((h) + 8, v)
+#define DNS_HEADER_SET_ARCOUNT(h, v)    DNS__SET16BIT((h) + 10, v)
 
 /* Macros for parsing the fixed part of a DNS question */
-#define DNS_QUESTION_TYPE(q)		DNS__16BIT(q)
-#define DNS_QUESTION_CLASS(q)		DNS__16BIT((q) + 2)
+#define DNS_QUESTION_TYPE(q)            DNS__16BIT(q)
+#define DNS_QUESTION_CLASS(q)           DNS__16BIT((q) + 2)
 
 /* Macros for constructing the fixed part of a DNS question */
-#define DNS_QUESTION_SET_TYPE(q, v)	DNS__SET16BIT(q, v)
-#define DNS_QUESTION_SET_CLASS(q, v)	DNS__SET16BIT((q) + 2, v)
+#define DNS_QUESTION_SET_TYPE(q, v)     DNS__SET16BIT(q, v)
+#define DNS_QUESTION_SET_CLASS(q, v)    DNS__SET16BIT((q) + 2, v)
 
 /* Macros for parsing the fixed part of a DNS resource record */
-#define DNS_RR_TYPE(r)			DNS__16BIT(r)
-#define DNS_RR_CLASS(r)			DNS__16BIT((r) + 2)
-#define DNS_RR_TTL(r)			DNS__32BIT((r) + 4)
-#define DNS_RR_LEN(r)			DNS__16BIT((r) + 8)
+#define DNS_RR_TYPE(r)                  DNS__16BIT(r)
+#define DNS_RR_CLASS(r)                 DNS__16BIT((r) + 2)
+#define DNS_RR_TTL(r)                   DNS__32BIT((r) + 4)
+#define DNS_RR_LEN(r)                   DNS__16BIT((r) + 8)
 
 /* Macros for constructing the fixed part of a DNS resource record */
-#define DNS_RR_SET_TYPE(r)		DNS__SET16BIT(r, v)
-#define DNS_RR_SET_CLASS(r)		DNS__SET16BIT((r) + 2, v)
-#define DNS_RR_SET_TTL(r)		DNS__SET32BIT((r) + 4, v)
-#define DNS_RR_SET_LEN(r)		DNS__SET16BIT((r) + 8, v)
+#define DNS_RR_SET_TYPE(r)              DNS__SET16BIT(r, v)
+#define DNS_RR_SET_CLASS(r)             DNS__SET16BIT((r) + 2, v)
+#define DNS_RR_SET_TTL(r)               DNS__SET32BIT((r) + 4, v)
+#define DNS_RR_SET_LEN(r)               DNS__SET16BIT((r) + 8, v)
 
 #endif /* ARES__DNS_H */

ares/ares_expand_name.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
@@ -27,7 +28,7 @@
 #include "ares_private.h" /* for the memdebug */
 
 static int name_length(const unsigned char *encoded, const unsigned char *abuf,
-		       int alen);
+                       int alen);
 
 /* Expand an RFC1035-encoded domain name given by encoded.  The
  * containing message is given by abuf and alen.  The result given by
@@ -54,7 +55,7 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf,
  */
 
 int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, char **s, long *enclen)
+                     int alen, char **s, long *enclen)
 {
   int len, indir = 0;
   char *q;
@@ -74,27 +75,27 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
   while (*p)
     {
       if ((*p & INDIR_MASK) == INDIR_MASK)
-	{
-	  if (!indir)
-	    {
-	      *enclen = p + 2 - encoded;
-	      indir = 1;
-	    }
-	  p = abuf + ((*p & ~INDIR_MASK) << 8 | *(p + 1));
-	}
+        {
+          if (!indir)
+            {
+              *enclen = p + 2 - encoded;
+              indir = 1;
+            }
+          p = abuf + ((*p & ~INDIR_MASK) << 8 | *(p + 1));
+        }
       else
-	{
-	  len = *p;
-	  p++;
-	  while (len--)
-	    {
-	      if (*p == '.' || *p == '\\')
-		*q++ = '\\';
-	      *q++ = *p;
-	      p++;
-	    }
-	  *q++ = '.';
-	}
+        {
+          len = *p;
+          p++;
+          while (len--)
+            {
+              if (*p == '.' || *p == '\\')
+                *q++ = '\\';
+              *q++ = *p;
+              p++;
+            }
+          *q++ = '.';
+        }
     }
   if (!indir)
     *enclen = p + 1 - encoded;
@@ -110,7 +111,7 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
  * -1 if the encoding is invalid.
  */
 static int name_length(const unsigned char *encoded, const unsigned char *abuf,
-		       int alen)
+                       int alen)
 {
   int n = 0, offset, indir = 0;
 
@@ -121,34 +122,34 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf,
   while (*encoded)
     {
       if ((*encoded & INDIR_MASK) == INDIR_MASK)
-	{
-	  /* Check the offset and go there. */
-	  if (encoded + 1 >= abuf + alen)
-	    return -1;
-	  offset = (*encoded & ~INDIR_MASK) << 8 | *(encoded + 1);
-	  if (offset >= alen)
-	    return -1;
-	  encoded = abuf + offset;
+        {
+          /* Check the offset and go there. */
+          if (encoded + 1 >= abuf + alen)
+            return -1;
+          offset = (*encoded & ~INDIR_MASK) << 8 | *(encoded + 1);
+          if (offset >= alen)
+            return -1;
+          encoded = abuf + offset;
 
-	  /* If we've seen more indirects than the message length,
-	   * then there's a loop.
-	   */
-	  if (++indir > alen)
-	    return -1;
-	}
+          /* If we've seen more indirects than the message length,
+           * then there's a loop.
+           */
+          if (++indir > alen)
+            return -1;
+        }
       else
-	{
-	  offset = *encoded;
-	  if (encoded + offset + 1 >= abuf + alen)
-	    return -1;
-	  encoded++;
-	  while (offset--)
-	    {
-	      n += (*encoded == '.' || *encoded == '\\') ? 2 : 1;
-	      encoded++;
-	    }
-	  n++;
-	}
+        {
+          offset = *encoded;
+          if (encoded + offset + 1 >= abuf + alen)
+            return -1;
+          encoded++;
+          while (offset--)
+            {
+              n += (*encoded == '.' || *encoded == '\\') ? 2 : 1;
+              encoded++;
+            }
+          n++;
+        }
     }
 
   /* If there were any labels at all, then the number of dots is one

ares/ares_expand_string.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>

ares/ares_fds.c

@@ -13,11 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
-
-#else
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
@@ -37,20 +36,20 @@ int ares_fds(ares_channel channel, fd_set *read_fds, fd_set *write_fds)
   for (i = 0; i < channel->nservers; i++)
     {
       server = &channel->servers[i];
-      if (server->udp_socket != -1)
-	{
-	  FD_SET(server->udp_socket, read_fds);
-	  if (server->udp_socket >= nfds)
-	    nfds = server->udp_socket + 1;
-	}
-      if (server->tcp_socket != -1)
-	{
-	  FD_SET(server->tcp_socket, read_fds);
-	  if (server->qhead)
-	    FD_SET(server->tcp_socket, write_fds);
-	  if (server->tcp_socket >= nfds)
-	    nfds = server->tcp_socket + 1;
-	}
+      if (server->udp_socket != ARES_SOCKET_BAD)
+        {
+          FD_SET(server->udp_socket, read_fds);
+          if (server->udp_socket >= nfds)
+            nfds = server->udp_socket + 1;
+        }
+      if (server->tcp_socket != ARES_SOCKET_BAD)
+        {
+          FD_SET(server->tcp_socket, read_fds);
+          if (server->qhead)
+            FD_SET(server->tcp_socket, write_fds);
+          if (server->tcp_socket >= nfds)
+            nfds = server->tcp_socket + 1;
+        }
     }
   return nfds;
 }

ares/ares_free_hostent.c

@@ -13,11 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <stdlib.h>
 
-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <netdb.h>
 #endif
 

ares/ares_free_string.c

@@ -13,6 +13,7 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <stdlib.h>
 #include "ares.h"
 

ares/ares_gethostbyaddr.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -27,9 +28,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "ares.h"
 #include "ares_private.h"
 
+#ifdef WATT32
+#undef WIN32
+#endif
+
 struct addr_query {
   /* Arguments passed to ares_gethostbyaddr() */
   ares_channel channel;
@@ -42,13 +48,13 @@ struct addr_query {
 
 static void next_lookup(struct addr_query *aquery);
 static void addr_callback(void *arg, int status, unsigned char *abuf,
-			  int alen);
+                          int alen);
 static void end_aquery(struct addr_query *aquery, int status,
-		       struct hostent *host);
+                       struct hostent *host);
 static int file_lookup(struct in_addr *addr, struct hostent **host);
 
 void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen,
-			int family, ares_host_callback callback, void *arg)
+                        int family, ares_host_callback callback, void *arg)
 {
   struct addr_query *aquery;
 
@@ -84,27 +90,27 @@ static void next_lookup(struct addr_query *aquery)
   for (p = aquery->remaining_lookups; *p; p++)
     {
       switch (*p)
-	{
-	case 'b':
-	  addr = ntohl(aquery->addr.s_addr);
-	  a1 = (int)((addr >> 24) & 0xff);
-	  a2 = (int)((addr >> 16) & 0xff);
-	  a3 = (int)((addr >> 8) & 0xff);
-	  a4 = (int)(addr & 0xff);
-	  sprintf(name, "%d.%d.%d.%d.in-addr.arpa", a4, a3, a2, a1);
-	  aquery->remaining_lookups = p + 1;
-	  ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,
-		     aquery);
-	  return;
-	case 'f':
-	  status = file_lookup(&aquery->addr, &host);
-	  if (status != ARES_ENOTFOUND)
-	    {
-	      end_aquery(aquery, status, host);
-	      return;
-	    }
-	  break;
-	}
+        {
+        case 'b':
+          addr = ntohl(aquery->addr.s_addr);
+          a1 = (int)((addr >> 24) & 0xff);
+          a2 = (int)((addr >> 16) & 0xff);
+          a3 = (int)((addr >> 8) & 0xff);
+          a4 = (int)(addr & 0xff);
+          sprintf(name, "%d.%d.%d.%d.in-addr.arpa", a4, a3, a2, a1);
+          aquery->remaining_lookups = p + 1;
+          ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,
+                     aquery);
+          return;
+        case 'f':
+          status = file_lookup(&aquery->addr, &host);
+          if (status != ARES_ENOTFOUND)
+            {
+              end_aquery(aquery, status, host);
+              return;
+            }
+          break;
+        }
     }
   end_aquery(aquery, ARES_ENOTFOUND, NULL);
 }
@@ -117,7 +123,7 @@ static void addr_callback(void *arg, int status, unsigned char *abuf, int alen)
   if (status == ARES_SUCCESS)
     {
       status = ares_parse_ptr_reply(abuf, alen, &aquery->addr,
-				    sizeof(struct in_addr), AF_INET, &host);
+                                    sizeof(struct in_addr), AF_INET, &host);
       end_aquery(aquery, status, host);
     }
   else if (status == ARES_EDESTRUCTION)
@@ -127,7 +133,7 @@ static void addr_callback(void *arg, int status, unsigned char *abuf, int alen)
 }
 
 static void end_aquery(struct addr_query *aquery, int status,
-		       struct hostent *host)
+                       struct hostent *host)
 {
   aquery->callback(aquery->arg, status, host);
   if (host)
@@ -144,13 +150,30 @@ static int file_lookup(struct in_addr *addr, struct hostent **host)
 
   char PATH_HOSTS[MAX_PATH];
   if (IsNT) {
-    GetSystemDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_NT);
-  } else {
-    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_9X);
-  }
+        char tmp[MAX_PATH];
+        HKEY hkeyHosts;
 
+        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
+                == ERROR_SUCCESS)
+        {
+                DWORD dwLength = MAX_PATH;
+                RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, tmp,
+                        &dwLength);
+                ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH);
+                RegCloseKey(hkeyHosts);
+        }
+  }
+  else
+    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
+
+  strcat(PATH_HOSTS, WIN_PATH_HOSTS);
+
+#elif defined(WATT32)
+  extern const char *_w32_GetHostsFile (void);
+  const char *PATH_HOSTS = _w32_GetHostsFile();
+
+  if (!PATH_HOSTS)
+    return ARES_ENOTFOUND;
 #endif
 
   fp = fopen(PATH_HOSTS, "r");
@@ -160,7 +183,7 @@ static int file_lookup(struct in_addr *addr, struct hostent **host)
   while ((status = ares__get_hostent(fp, host)) == ARES_SUCCESS)
     {
       if (memcmp((*host)->h_addr, addr, sizeof(struct in_addr)) == 0)
-	break;
+        break;
       ares_free_hostent(*host);
     }
   fclose(fp);

ares/ares_gethostbyname.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -29,9 +30,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "ares.h"
 #include "ares_private.h"
 
+#ifdef WATT32
+#undef WIN32
+#endif
+
 struct host_query {
   /* Arguments passed to ares_gethostbyname() */
   ares_channel channel;
@@ -44,19 +50,19 @@ struct host_query {
 
 static void next_lookup(struct host_query *hquery);
 static void host_callback(void *arg, int status, unsigned char *abuf,
-			  int alen);
+                          int alen);
 static void end_hquery(struct host_query *hquery, int status,
-		       struct hostent *host);
+                       struct hostent *host);
 static int fake_hostent(const char *name, ares_host_callback callback,
-			void *arg);
+                        void *arg);
 static int file_lookup(const char *name, struct hostent **host);
 static void sort_addresses(struct hostent *host, struct apattern *sortlist,
-			   int nsort);
+                           int nsort);
 static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
-			     int nsort);
+                             int nsort);
 
 void ares_gethostbyname(ares_channel channel, const char *name, int family,
-			ares_host_callback callback, void *arg)
+                        ares_host_callback callback, void *arg)
 {
   struct host_query *hquery;
 
@@ -100,26 +106,26 @@ static void next_lookup(struct host_query *hquery)
   struct hostent *host;
 
   for (p = hquery->remaining_lookups; *p; p++)
-    { 
+    {
       switch (*p)
-	{
-	case 'b':
-	  /* DNS lookup */
-	  hquery->remaining_lookups = p + 1;
-	  ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
-		      hquery);
-	  return;
+        {
+        case 'b':
+          /* DNS lookup */
+          hquery->remaining_lookups = p + 1;
+          ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
+                      hquery);
+          return;
 
-	case 'f':
-	  /* Host file lookup */
-	  status = file_lookup(hquery->name, &host);
-	  if (status != ARES_ENOTFOUND)
-	    {
-	      end_hquery(hquery, status, host);
-	      return;
-	    }
-	  break;
-	}
+        case 'f':
+          /* Host file lookup */
+          status = file_lookup(hquery->name, &host);
+          if (status != ARES_ENOTFOUND)
+            {
+              end_hquery(hquery, status, host);
+              return;
+            }
+          break;
+        }
     }
   end_hquery(hquery, ARES_ENOTFOUND, NULL);
 }
@@ -134,7 +140,7 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)
     {
       status = ares_parse_a_reply(abuf, alen, &host);
       if (host && channel->nsort)
-	sort_addresses(host, channel->sortlist, channel->nsort);
+        sort_addresses(host, channel->sortlist, channel->nsort);
       end_hquery(hquery, status, host);
     }
   else if (status == ARES_EDESTRUCTION)
@@ -144,7 +150,7 @@ static void host_callback(void *arg, int status, unsigned char *abuf, int alen)
 }
 
 static void end_hquery(struct host_query *hquery, int status,
-		       struct hostent *host)
+                       struct hostent *host)
 {
   hquery->callback(hquery->arg, status, host);
   if (host)
@@ -157,7 +163,7 @@ static void end_hquery(struct host_query *hquery, int status,
  * query immediately, and return true.  Otherwise return false.
  */
 static int fake_hostent(const char *name, ares_host_callback callback,
-			void *arg)
+                        void *arg)
 {
   struct in_addr addr;
   struct hostent hostent;
@@ -169,7 +175,7 @@ static int fake_hostent(const char *name, ares_host_callback callback,
   for (p = name; *p; p++)
     {
       if (!isdigit((unsigned char)*p) && *p != '.')
-	return 0;
+        return 0;
     }
 
   /* It also only looks like an IP address if it's non-zero-length and
@@ -214,16 +220,32 @@ static int file_lookup(const char *name, struct hostent **host)
   int status;
 
 #ifdef WIN32
-
   char PATH_HOSTS[MAX_PATH];
   if (IsNT) {
-    GetSystemDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_NT);
-  } else {
-    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
-    strcat(PATH_HOSTS, PATH_HOSTS_9X);
-  }
+        char tmp[MAX_PATH];
+        HKEY hkeyHosts;
 
+        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
+                == ERROR_SUCCESS)
+        {
+                DWORD dwLength = MAX_PATH;
+                RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, tmp,
+                        &dwLength);
+                ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH);
+                RegCloseKey(hkeyHosts);
+        }
+  }
+  else
+    GetWindowsDirectory(PATH_HOSTS, MAX_PATH);
+
+  strcat(PATH_HOSTS, WIN_PATH_HOSTS);
+
+#elif defined(WATT32)
+  extern const char *_w32_GetHostsFile (void);
+  const char *PATH_HOSTS = _w32_GetHostsFile();
+
+  if (!PATH_HOSTS)
+    return ARES_ENOTFOUND;
 #endif
 
   fp = fopen(PATH_HOSTS, "r");
@@ -233,14 +255,14 @@ static int file_lookup(const char *name, struct hostent **host)
   while ((status = ares__get_hostent(fp, host)) == ARES_SUCCESS)
     {
       if (strcasecmp((*host)->h_name, name) == 0)
-	break;
+        break;
       for (alias = (*host)->h_aliases; *alias; alias++)
-	{
-	  if (strcasecmp(*alias, name) == 0)
-	    break;
-	}
+        {
+          if (strcasecmp(*alias, name) == 0)
+            break;
+        }
       if (*alias)
-	break;
+        break;
       ares_free_hostent(*host);
     }
   fclose(fp);
@@ -252,7 +274,7 @@ static int file_lookup(const char *name, struct hostent **host)
 }
 
 static void sort_addresses(struct hostent *host, struct apattern *sortlist,
-			   int nsort)
+                           int nsort)
 {
   struct in_addr a1, a2;
   int i1, i2, ind1, ind2;
@@ -267,13 +289,13 @@ static void sort_addresses(struct hostent *host, struct apattern *sortlist,
       memcpy(&a1, host->h_addr_list[i1], sizeof(struct in_addr));
       ind1 = get_address_index(&a1, sortlist, nsort);
       for (i2 = i1 - 1; i2 >= 0; i2--)
-	{
-	  memcpy(&a2, host->h_addr_list[i2], sizeof(struct in_addr));
-	  ind2 = get_address_index(&a2, sortlist, nsort);
-	  if (ind2 <= ind1)
-	    break;
-	  memcpy(host->h_addr_list[i2 + 1], &a2, sizeof(struct in_addr));
-	}
+        {
+          memcpy(&a2, host->h_addr_list[i2], sizeof(struct in_addr));
+          ind2 = get_address_index(&a2, sortlist, nsort);
+          if (ind2 <= ind1)
+            break;
+          memcpy(host->h_addr_list[i2 + 1], &a2, sizeof(struct in_addr));
+        }
       memcpy(host->h_addr_list[i2 + 1], &a1, sizeof(struct in_addr));
     }
 }
@@ -282,14 +304,14 @@ static void sort_addresses(struct hostent *host, struct apattern *sortlist,
  * if none of them match.
  */
 static int get_address_index(struct in_addr *addr, struct apattern *sortlist,
-			     int nsort)
+                             int nsort)
 {
   int i;
 
   for (i = 0; i < nsort; i++)
     {
       if ((addr->s_addr & sortlist[i].mask.s_addr) == sortlist[i].addr.s_addr)
-	break;
+        break;
     }
   return i;
 }

ares/ares_init.c

@@ -13,19 +13,28 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
+#include <iphlpapi.h>
+#include <malloc.h>
+
 #else
 #include <sys/param.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,17 +45,22 @@
 #include "ares.h"
 #include "ares_private.h"
 
+#ifdef WATT32
+#undef WIN32  /* Redefined in MingW/MSVC headers */
+#endif
+
 static int init_by_options(ares_channel channel, struct ares_options *options,
-			   int optmask);
+                           int optmask);
 static int init_by_environment(ares_channel channel);
 static int init_by_resolv_conf(ares_channel channel);
 static int init_by_defaults(ares_channel channel);
 static int config_domain(ares_channel channel, char *str);
-static int config_lookup(ares_channel channel, const char *str);
+static int config_lookup(ares_channel channel, const char *str,
+                         const char *bindch, const char *filech);
 static int config_nameserver(struct server_state **servers, int *nservers,
-			     char *str);
+                             char *str);
 static int config_sortlist(struct apattern **sortlist, int *nsort,
-			   const char *str);
+                           const char *str);
 static int set_search(ares_channel channel, const char *str);
 static int set_options(ares_channel channel, const char *str);
 static char *try_config(char *s, const char *opt);
@@ -60,7 +74,7 @@ int ares_init(ares_channel *channelptr)
 }
 
 int ares_init_options(ares_channel *channelptr, struct ares_options *options,
-		      int optmask)
+                      int optmask)
 {
   ares_channel channel;
   int i, status;
@@ -102,15 +116,15 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
     {
       /* Something failed; clean up memory we may have allocated. */
       if (channel->nservers != -1)
-	free(channel->servers);
+        free(channel->servers);
       if (channel->domains)
-	{
-	  for (i = 0; i < channel->ndomains; i++)
-	    free(channel->domains[i]);
-	  free(channel->domains);
-	}
+        {
+          for (i = 0; i < channel->ndomains; i++)
+            free(channel->domains[i]);
+          free(channel->domains);
+        }
       if (channel->sortlist)
-	free(channel->sortlist);
+        free(channel->sortlist);
       if(channel->lookups)
         free(channel->lookups);
       free(channel);
@@ -125,8 +139,8 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
   for (i = 0; i < channel->nservers; i++)
     {
       server = &channel->servers[i];
-      server->udp_socket = -1;
-      server->tcp_socket = -1;
+      server->udp_socket = ARES_SOCKET_BAD;
+      server->tcp_socket = ARES_SOCKET_BAD;
       server->tcp_lenbuf_pos = 0;
       server->tcp_buffer = NULL;
       server->qhead = NULL;
@@ -149,7 +163,7 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
 }
 
 static int init_by_options(ares_channel channel, struct ares_options *options,
-			   int optmask)
+                           int optmask)
 {
   int i;
 
@@ -171,11 +185,11 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
   if ((optmask & ARES_OPT_SERVERS) && channel->nservers == -1)
     {
       channel->servers =
-	malloc(options->nservers * sizeof(struct server_state));
+        malloc(options->nservers * sizeof(struct server_state));
       if (!channel->servers && options->nservers != 0)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
       for (i = 0; i < options->nservers; i++)
-	channel->servers[i].addr = options->servers[i];
+        channel->servers[i].addr = options->servers[i];
       channel->nservers = options->nservers;
     }
 
@@ -186,14 +200,14 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
     {
       channel->domains = malloc(options->ndomains * sizeof(char *));
       if (!channel->domains && options->ndomains != 0)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
       for (i = 0; i < options->ndomains; i++)
-	{
-	  channel->ndomains = i;
-	  channel->domains[i] = strdup(options->domains[i]);
-	  if (!channel->domains[i])
-	    return ARES_ENOMEM;
-	}
+        {
+          channel->ndomains = i;
+          channel->domains[i] = strdup(options->domains[i]);
+          if (!channel->domains[i])
+            return ARES_ENOMEM;
+        }
       channel->ndomains = options->ndomains;
     }
 
@@ -202,7 +216,7 @@ static int init_by_options(ares_channel channel, struct ares_options *options,
     {
       channel->lookups = strdup(options->lookups);
       if (!channel->lookups)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
     }
 
   return ARES_SUCCESS;
@@ -218,7 +232,7 @@ static int init_by_environment(ares_channel channel)
     {
       status = set_search(channel, localdomain);
       if (status != ARES_SUCCESS)
-	return status;
+        return status;
     }
 
   res_options = getenv("RES_OPTIONS");
@@ -226,29 +240,29 @@ static int init_by_environment(ares_channel channel)
     {
       status = set_options(channel, res_options);
       if (status != ARES_SUCCESS)
-	return status;
+        return status;
     }
 
   return ARES_SUCCESS;
 }
-#ifdef WIN32
-static int get_res_size_nt(HKEY hKey, char *subkey, int *size)
-{
-  return RegQueryValueEx(hKey, subkey, 0, NULL, NULL, size);
-}
 
-/* Warning: returns a dynamically allocated buffer, the user MUST
+#ifdef WIN32
+/*
+ * Warning: returns a dynamically allocated buffer, the user MUST
  * use free() if the function returns 1
  */
-static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
+static int get_res_nt(HKEY hKey, const char *subkey, char **obuf)
 {
   /* Test for the size we need */
-  int size = 0;
+  DWORD size = 0;
   int result;
+
   result = RegQueryValueEx(hKey, subkey, 0, NULL, NULL, &size);
   if ((result != ERROR_SUCCESS && result != ERROR_MORE_DATA) || !size)
     return 0;
   *obuf = malloc(size+1);
+  if (!*obuf)
+    return 0;
 
   if (RegQueryValueEx(hKey, subkey, 0, NULL, *obuf, &size) != ERROR_SUCCESS)
   {
@@ -263,29 +277,99 @@ static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
   return 1;
 }
 
-static int get_res_interfaces_nt(HKEY hKey, char *subkey, char **obuf)
+static int get_res_interfaces_nt(HKEY hKey, const char *subkey, char **obuf)
 {
   char enumbuf[39]; /* GUIDs are 38 chars + 1 for NULL */
-  int enum_size = 39;
+  DWORD enum_size = 39;
   int idx = 0;
   HKEY hVal;
+
   while (RegEnumKeyEx(hKey, idx++, enumbuf, &enum_size, 0,
                       NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS)
   {
+    int rc;
+
     enum_size = 39;
     if (RegOpenKeyEx(hKey, enumbuf, 0, KEY_QUERY_VALUE, &hVal) !=
         ERROR_SUCCESS)
       continue;
-    if (!get_res_nt(hVal, subkey, obuf))
-      RegCloseKey(hVal);
-    else
-    {
+    rc = get_res_nt(hVal, subkey, obuf);
       RegCloseKey(hVal);
+    if (rc)
       return 1;
     }
-  }
   return 0;
 }
+
+static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
+{
+  FIXED_INFO    *fi   = alloca (sizeof(*fi));
+  DWORD          size = sizeof (*fi);
+  DWORD (WINAPI *GetNetworkParams) (FIXED_INFO*, DWORD*);  /* available only on Win-98/2000+ */
+  HMODULE        handle;
+  IP_ADDR_STRING *ipAddr;
+  int            i, count = 0;
+  int            debug  = 0;
+  size_t         ip_size = sizeof("255.255.255.255,")-1;
+  size_t         left = ret_size;
+  char          *ret = ret_buf;
+
+  if (!fi)
+     return (0);
+
+  handle = LoadLibrary ("iphlpapi.dll");
+  if (!handle)
+     return (0);
+
+  (void*)GetNetworkParams = GetProcAddress (handle, "GetNetworkParams");
+  if (!GetNetworkParams)
+     goto quit;
+
+  if ((*GetNetworkParams) (fi, &size) != ERROR_BUFFER_OVERFLOW)
+     goto quit;
+
+  fi = alloca (size);
+  if (!fi || (*GetNetworkParams) (fi, &size) != ERROR_SUCCESS)
+     goto quit;
+
+  if (debug)
+  {
+    printf ("Host Name: %s\n", fi->HostName);
+    printf ("Domain Name: %s\n", fi->DomainName);
+    printf ("DNS Servers:\n"
+            "    %s (primary)\n", fi->DnsServerList.IpAddress.String);
+  }
+  if (inet_addr(fi->DnsServerList.IpAddress.String) != INADDR_NONE &&
+      left > ip_size)
+  {
+    ret += sprintf (ret, "%s,", fi->DnsServerList.IpAddress.String);
+    left -= ret - ret_buf;
+    count++;
+  }
+
+  for (i = 0, ipAddr = fi->DnsServerList.Next; ipAddr && left > ip_size;
+       ipAddr = ipAddr->Next, i++)
+  {
+    if (inet_addr(ipAddr->IpAddress.String) != INADDR_NONE)
+    {
+       ret += sprintf (ret, "%s,", ipAddr->IpAddress.String);
+       left -= ret - ret_buf;
+       count++;
+    }
+    if (debug)
+       printf ("    %s (secondary %d)\n", ipAddr->IpAddress.String, i+1);
+  }
+
+quit:
+  if (handle)
+     FreeLibrary (handle);
+
+  if (debug && left <= ip_size)
+     printf ("Too many nameservers. Truncating to %d addressess", count);
+  if (ret > ret_buf)
+     ret[-1] = '\0';
+  return (count);
+}
 #endif
 
 static int init_by_resolv_conf(ares_channel channel)
@@ -298,19 +382,24 @@ static int init_by_resolv_conf(ares_channel channel)
 #ifdef WIN32
 
     /*
+  NameServer info via IPHLPAPI (IP helper API):
+    GetNetworkParams() should be the trusted source for this.
+    Available in Win-98/2000 and later. If that fail, fall-back to
+    registry information.
+
   NameServer Registry:
 
    On Windows 9X, the DNS server can be found in:
 HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\VxD\MSTCP\NameServer
 
-	On Windows NT/2000/XP/2003:
+        On Windows NT/2000/XP/2003:
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\NameServer
-	or
+        or
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\DhcpNameServer
-	or
+        or
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\
 NameServer
-	or
+        or
 HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\{AdapterID}\
 DhcpNameServer
    */
@@ -320,11 +409,19 @@ DhcpNameServer
   DWORD data_type;
   DWORD bytes;
   DWORD result;
-  DWORD keysize = MAX_PATH;
+  char  buf[256];
 
-  status = ARES_EFILE;
+  if (channel->nservers > -1)  /* don't override ARES_OPT_SERVER */
+     return ARES_SUCCESS;
 
-  if (IsNT) 
+  if (get_iphlpapi_dns_info(buf,sizeof(buf)) > 0)
+  {
+    status = config_nameserver(&servers, &nservers, buf);
+    if (status == ARES_SUCCESS)
+      goto okay;
+  }
+
+  if (IsNT)
   {
     if (RegOpenKeyEx(
           HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
@@ -368,7 +465,7 @@ DhcpNameServer
       if ((result = RegQueryValueEx(
              mykey, NAMESERVER, NULL, &data_type,
              NULL, &bytes
-             ) 
+             )
             ) == ERROR_SUCCESS ||
           result == ERROR_MORE_DATA)
       {
@@ -384,19 +481,12 @@ DhcpNameServer
           free(line);
         }
       }
-    } 
+    }
     RegCloseKey(mykey);
   }
-  
-  if (status != ARES_EFILE)
-  {
-    /*
-      if (!channel->lookups) {
-      status = config_lookup(channel, "file bind");
-      }
-    */
+
+  if (status == ARES_SUCCESS)
     status = ARES_EOF;
-  }
 
 #elif defined(riscos)
 
@@ -404,7 +494,7 @@ DhcpNameServer
      system variable Inet$Resolvers, space separated. */
 
   line = getenv("Inet$Resolvers");
-  status = ARES_EFILE;
+  status = ARES_EOF;
   if (line) {
     char *resolvers = strdup(line), *pos, *space;
 
@@ -424,16 +514,34 @@ DhcpNameServer
 
     if (status == ARES_SUCCESS)
       status = ARES_EOF;
-    
+
     free(resolvers);
   }
 
+#elif defined(WATT32)
+  int i;
+
+  sock_init();
+  for (i = 0; def_nameservers[i]; i++)
+      ;
+  if (i == 0)
+    return ARES_SUCCESS; /* use localhost DNS server */
+
+  nservers = i;
+  servers = calloc(sizeof(*servers), i);
+  if (!servers)
+     return ARES_ENOMEM;
+
+  for (i = 0; def_nameservers[i]; i++)
+      servers[i].addr.s_addr = htonl(def_nameservers[i]);
+  status = ARES_EOF;
+
 #else
   {
     char *p;
     FILE *fp;
     int linesize;
-   
+
     fp = fopen(PATH_RESOLV_CONF, "r");
     if (!fp)
       return (errno == ENOENT) ? ARES_SUCCESS : ARES_EFILE;
@@ -442,7 +550,7 @@ DhcpNameServer
       if ((p = try_config(line, "domain")))
         status = config_domain(channel, p);
       else if ((p = try_config(line, "lookup")) && !channel->lookups)
-        status = config_lookup(channel, p);
+        status = config_lookup(channel, p, "bind", "file");
       else if ((p = try_config(line, "search")))
         status = set_search(channel, p);
       else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
@@ -456,9 +564,49 @@ DhcpNameServer
       if (status != ARES_SUCCESS)
         break;
     }
+    fclose(fp);
+
+    if (!channel->lookups) {
+      /* Many systems (Solaris, Linux, BSD's) use nsswitch.conf */
+      fp = fopen("/etc/nsswitch.conf", "r");
+      if (fp) {
+        while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+        {
+          if ((p = try_config(line, "hosts:")) && !channel->lookups)
+            status = config_lookup(channel, p, "dns", "files");
+        }
+        fclose(fp);
+      }
+    }
+
+    if (!channel->lookups) {
+      /* Linux / GNU libc 2.x and possibly others have host.conf */
+      fp = fopen("/etc/host.conf", "r");
+      if (fp) {
+        while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+        {
+          if ((p = try_config(line, "order")) && !channel->lookups)
+            status = config_lookup(channel, p, "bind", "hosts");
+        }
+        fclose(fp);
+      }
+    }
+
+    if (!channel->lookups) {
+      /* Tru64 uses /etc/svc.conf */
+      fp = fopen("/etc/svc.conf", "r");
+      if (fp) {
+        while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+        {
+          if ((p = try_config(line, "hosts=")) && !channel->lookups)
+            status = config_lookup(channel, p, "bind", "local");
+        }
+        fclose(fp);
+      }
+    }
+
     if(line)
       free(line);
-    fclose(fp);
   }
 
 #endif
@@ -474,6 +622,9 @@ DhcpNameServer
     }
 
   /* If we got any name server entries, fill them in. */
+#ifdef WIN32
+okay:
+#endif
   if (servers)
     {
       channel->servers = servers;
@@ -512,7 +663,7 @@ static int init_by_defaults(ares_channel channel)
       /* If nobody specified servers, try a local named. */
       channel->servers = malloc(sizeof(struct server_state));
       if (!channel->servers)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
       channel->servers[0].addr.s_addr = htonl(INADDR_LOOPBACK);
       channel->nservers = 1;
     }
@@ -523,22 +674,22 @@ static int init_by_defaults(ares_channel channel)
        * or set it to empty if the hostname isn't helpful.
        */
       if (gethostname(hostname, sizeof(hostname)) == -1
-	  || !strchr(hostname, '.'))
-	{
-	  channel->domains = malloc(0);
-	  channel->ndomains = 0;
-	}
+          || !strchr(hostname, '.'))
+        {
+          channel->domains = malloc(0);
+          channel->ndomains = 0;
+        }
       else
-	{
-	  channel->domains = malloc(sizeof(char *));
-	  if (!channel->domains)
-	    return ARES_ENOMEM;
-	  channel->ndomains = 0;
-	  channel->domains[0] = strdup(strchr(hostname, '.') + 1);
-	  if (!channel->domains[0])
-	    return ARES_ENOMEM;
-	  channel->ndomains = 1;
-	}
+        {
+          channel->domains = malloc(sizeof(char *));
+          if (!channel->domains)
+            return ARES_ENOMEM;
+          channel->ndomains = 0;
+          channel->domains[0] = strdup(strchr(hostname, '.') + 1);
+          if (!channel->domains[0])
+            return ARES_ENOMEM;
+          channel->ndomains = 1;
+        }
     }
 
   if (channel->nsort == -1)
@@ -549,9 +700,9 @@ static int init_by_defaults(ares_channel channel)
 
   if (!channel->lookups)
     {
-      channel->lookups = strdup("bf");
+      channel->lookups = strdup("fb");
       if (!channel->lookups)
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
     }
 
   return ARES_SUCCESS;
@@ -569,7 +720,8 @@ static int config_domain(ares_channel channel, char *str)
   return set_search(channel, str);
 }
 
-static int config_lookup(ares_channel channel, const char *str)
+static int config_lookup(ares_channel channel, const char *str,
+                         const char *bindch, const char *filech)
 {
   char lookups[3], *l;
   const char *p;
@@ -582,12 +734,14 @@ static int config_lookup(ares_channel channel, const char *str)
   p = str;
   while (*p)
     {
-      if ((*p == 'b' || *p == 'f') && l < lookups + 2)
-	*l++ = *p;
-      while (*p && !isspace((unsigned char)*p))
-	p++;
-      while (isspace((unsigned char)*p))
-	p++;
+      if ((*p == *bindch || *p == *filech) && l < lookups + 2) {
+        if (*p == *bindch) *l++ = 'b';
+        else *l++ = 'f';
+      }
+      while (*p && !isspace((unsigned char)*p) && (*p != ','))
+        p++;
+      while (*p && (isspace((unsigned char)*p) || (*p == ',')))
+        p++;
     }
   *l = 0;
   channel->lookups = strdup(lookups);
@@ -595,7 +749,7 @@ static int config_lookup(ares_channel channel, const char *str)
 }
 
 static int config_nameserver(struct server_state **servers, int *nservers,
-			     char *str)
+                             char *str)
 {
   struct in_addr addr;
   struct server_state *newserv;
@@ -656,7 +810,7 @@ static int config_nameserver(struct server_state **servers, int *nservers,
 }
 
 static int config_sortlist(struct apattern **sortlist, int *nsort,
-			   const char *str)
+                           const char *str)
 {
   struct apattern pat, *newsort;
   const char *q;
@@ -666,37 +820,37 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
     {
       q = str;
       while (*q && *q != '/' && *q != ';' && !isspace((unsigned char)*q))
-	q++;
+        q++;
       if (ip_addr(str, (int)(q - str), &pat.addr) == 0)
-	{
-	  /* We have a pattern address; now determine the mask. */
-	  if (*q == '/')
-	    {
-	      str = q + 1;
-	      while (*q && *q != ';' && !isspace((unsigned char)*q))
-		q++;
-	      if (ip_addr(str, (int)(q - str), &pat.mask) != 0)
-		natural_mask(&pat);
-	    }
-	  else
-	    natural_mask(&pat);
+        {
+          /* We have a pattern address; now determine the mask. */
+          if (*q == '/')
+            {
+              str = q + 1;
+              while (*q && *q != ';' && !isspace((unsigned char)*q))
+                q++;
+              if (ip_addr(str, (int)(q - str), &pat.mask) != 0)
+                natural_mask(&pat);
+            }
+          else
+            natural_mask(&pat);
 
-	  /* Add this pattern to our list. */
-	  newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern));
-	  if (!newsort)
-	    return ARES_ENOMEM;
-	  newsort[*nsort] = pat;
-	  *sortlist = newsort;
-	  (*nsort)++;
-	}
+          /* Add this pattern to our list. */
+          newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern));
+          if (!newsort)
+            return ARES_ENOMEM;
+          newsort[*nsort] = pat;
+          *sortlist = newsort;
+          (*nsort)++;
+        }
       else
-	{
-	  while (*q && *q != ';' && !isspace((unsigned char)*q))
-	    q++;
-	}
+        {
+          while (*q && *q != ';' && !isspace((unsigned char)*q))
+            q++;
+        }
       str = q;
       while (isspace((unsigned char)*str))
-	str++;
+        str++;
     }
 
   return ARES_SUCCESS;
@@ -721,9 +875,9 @@ static int set_search(ares_channel channel, const char *str)
   while (*p)
     {
       while (*p && !isspace((unsigned char)*p))
-	p++;
+        p++;
       while (isspace((unsigned char)*p))
-	p++;
+        p++;
       n++;
     }
 
@@ -739,15 +893,15 @@ static int set_search(ares_channel channel, const char *str)
       channel->ndomains = n;
       q = p;
       while (*q && !isspace((unsigned char)*q))
-	q++;
+        q++;
       channel->domains[n] = malloc(q - p + 1);
       if (!channel->domains[n])
-	return ARES_ENOMEM;
+        return ARES_ENOMEM;
       memcpy(channel->domains[n], p, q - p);
       channel->domains[n][q - p] = 0;
       p = q;
       while (isspace((unsigned char)*p))
-	p++;
+        p++;
       n++;
     }
   channel->ndomains = n;
@@ -764,19 +918,19 @@ static int set_options(ares_channel channel, const char *str)
     {
       q = p;
       while (*q && !isspace((unsigned char)*q))
-	q++;
+        q++;
       val = try_option(p, q, "ndots:");
       if (val && channel->ndots == -1)
-	channel->ndots = atoi(val);
+        channel->ndots = atoi(val);
       val = try_option(p, q, "retrans:");
       if (val && channel->timeout == -1)
-	channel->timeout = atoi(val);
+        channel->timeout = atoi(val);
       val = try_option(p, q, "retry:");
       if (val && channel->tries == -1)
-	channel->tries = atoi(val);
+        channel->tries = atoi(val);
       p = q;
       while (isspace((unsigned char)*p))
-	p++;
+        p++;
     }
 
   return ARES_SUCCESS;

ares/ares_mkquery.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
@@ -46,15 +47,15 @@
  *
  * AA, TC, RA, and RCODE are only set in responses.  Brief description
  * of the remaining fields:
- *	ID	Identifier to match responses with queries
- *	QR	Query (0) or response (1)
- *	Opcode	For our purposes, always QUERY
- * 	RD	Recursion desired
- *	Z	Reserved (zero)
- *	QDCOUNT	Number of queries
- *	ANCOUNT	Number of answers
- *	NSCOUNT	Number of name server records
- *	ARCOUNT	Number of additional records
+ *      ID      Identifier to match responses with queries
+ *      QR      Query (0) or response (1)
+ *      Opcode  For our purposes, always QUERY
+ *      RD      Recursion desired
+ *      Z       Reserved (zero)
+ *      QDCOUNT Number of queries
+ *      ANCOUNT Number of answers
+ *      NSCOUNT Number of name server records
+ *      ARCOUNT Number of additional records
  *
  * Question format, from RFC 1035:
  *                                  1  1  1  1  1  1
@@ -76,7 +77,7 @@
  */
 
 int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
-		 int rd, unsigned char **buf, int *buflen)
+                 int rd, unsigned char **buf, int *buflen)
 {
   int len;
   unsigned char *q;
@@ -88,7 +89,7 @@ int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
   for (p = name; *p; p++)
     {
       if (*p == '\\' && *(p + 1) != 0)
-	p++;
+        p++;
       len++;
     }
   /* If there are n periods in the name, there are n + 1 labels, and
@@ -120,31 +121,31 @@ int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
   while (*name)
     {
       if (*name == '.')
-	return ARES_EBADNAME;
+        return ARES_EBADNAME;
 
       /* Count the number of bytes in this label. */
       len = 0;
       for (p = name; *p && *p != '.'; p++)
-	{
-	  if (*p == '\\' && *(p + 1) != 0)
-	    p++;
-	  len++;
-	}
+        {
+          if (*p == '\\' && *(p + 1) != 0)
+            p++;
+          len++;
+        }
       if (len > MAXLABEL)
-	return ARES_EBADNAME;
+        return ARES_EBADNAME;
 
       /* Encode the length and copy the data. */
       *q++ = len;
       for (p = name; *p && *p != '.'; p++)
-	{
-	  if (*p == '\\' && *(p + 1) != 0)
-	    p++;
-	  *q++ = *p;
-	}
+        {
+          if (*p == '\\' && *(p + 1) != 0)
+            p++;
+          *q++ = *p;
+        }
 
       /* Go to the next label and repeat, unless we hit the end. */
       if (!*p)
-	break;
+        break;
       name = p + 1;
     }
 

ares/ares_parse_a_reply.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -32,7 +33,7 @@
 #include "ares_private.h"
 
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
-		       struct hostent **host)
+                       struct hostent **host)
 {
   unsigned int qdcount, ancount;
   int status, i, rr_type, rr_class, rr_len, naddrs;
@@ -91,49 +92,49 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
       /* Decode the RR up to the data field. */
       status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
       if (status != ARES_SUCCESS)
-	break;
+        break;
       aptr += len;
       if (aptr + RRFIXEDSZ > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
       rr_type = DNS_RR_TYPE(aptr);
       rr_class = DNS_RR_CLASS(aptr);
       rr_len = DNS_RR_LEN(aptr);
       aptr += RRFIXEDSZ;
 
       if (rr_class == C_IN && rr_type == T_A
-	  && rr_len == sizeof(struct in_addr)
-	  && strcasecmp(rr_name, hostname) == 0)
-	{
-	  memcpy(&addrs[naddrs], aptr, sizeof(struct in_addr));
-	  naddrs++;
-	  status = ARES_SUCCESS;
-	}
+          && rr_len == sizeof(struct in_addr)
+          && strcasecmp(rr_name, hostname) == 0)
+        {
+          memcpy(&addrs[naddrs], aptr, sizeof(struct in_addr));
+          naddrs++;
+          status = ARES_SUCCESS;
+        }
 
       if (rr_class == C_IN && rr_type == T_CNAME)
-	{
-	  /* Record the RR name as an alias. */
-	  aliases[naliases] = rr_name;
-	  naliases++;
+        {
+          /* Record the RR name as an alias. */
+          aliases[naliases] = rr_name;
+          naliases++;
 
-	  /* Decode the RR data and replace the hostname with it. */
-	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
-	  if (status != ARES_SUCCESS)
-	    break;
-	  free(hostname);
-	  hostname = rr_data;
-	}
+          /* Decode the RR data and replace the hostname with it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          free(hostname);
+          hostname = rr_data;
+        }
       else
-	free(rr_name);
+        free(rr_name);
 
       aptr += rr_len;
       if (aptr > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
     }
 
   if (status == ARES_SUCCESS && naddrs == 0)
@@ -144,23 +145,23 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
       aliases[naliases] = NULL;
       hostent = malloc(sizeof(struct hostent));
       if (hostent)
-	{
-	  hostent->h_addr_list = malloc((naddrs + 1) * sizeof(char *));
-	  if (hostent->h_addr_list)
-	    {
-	      /* Fill in the hostent and return successfully. */
-	      hostent->h_name = hostname;
-	      hostent->h_aliases = aliases;
-	      hostent->h_addrtype = AF_INET;
-	      hostent->h_length = sizeof(struct in_addr);
-	      for (i = 0; i < naddrs; i++)
-		hostent->h_addr_list[i] = (char *) &addrs[i];
-	      hostent->h_addr_list[naddrs] = NULL;
-	      *host = hostent;
-	      return ARES_SUCCESS;
-	    }
-	  free(hostent);
-	}
+        {
+          hostent->h_addr_list = malloc((naddrs + 1) * sizeof(char *));
+          if (hostent->h_addr_list)
+            {
+              /* Fill in the hostent and return successfully. */
+              hostent->h_name = hostname;
+              hostent->h_aliases = aliases;
+              hostent->h_addrtype = AF_INET;
+              hostent->h_length = sizeof(struct in_addr);
+              for (i = 0; i < naddrs; i++)
+                hostent->h_addr_list[i] = (char *) &addrs[i];
+              hostent->h_addr_list[naddrs] = NULL;
+              *host = hostent;
+              return ARES_SUCCESS;
+            }
+          free(hostent);
+        }
       status = ARES_ENOMEM;
     }
   for (i = 0; i < naliases; i++)

ares/ares_parse_ptr_reply.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -31,7 +32,7 @@
 #include "ares_private.h"
 
 int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
-			 int addrlen, int family, struct hostent **host)
+                         int addrlen, int family, struct hostent **host)
 {
   unsigned int qdcount, ancount;
   int status, i, rr_type, rr_class, rr_len;
@@ -72,47 +73,47 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
       /* Decode the RR up to the data field. */
       status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);
       if (status != ARES_SUCCESS)
-	break;
+        break;
       aptr += len;
       if (aptr + RRFIXEDSZ > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
       rr_type = DNS_RR_TYPE(aptr);
       rr_class = DNS_RR_CLASS(aptr);
       rr_len = DNS_RR_LEN(aptr);
       aptr += RRFIXEDSZ;
 
       if (rr_class == C_IN && rr_type == T_PTR
-	  && strcasecmp(rr_name, ptrname) == 0)
-	{
-	  /* Decode the RR data and set hostname to it. */
-	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
-	  if (status != ARES_SUCCESS)
-	    break;
-	  if (hostname)
-	    free(hostname);
-	  hostname = rr_data;
-	}
+          && strcasecmp(rr_name, ptrname) == 0)
+        {
+          /* Decode the RR data and set hostname to it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          if (hostname)
+            free(hostname);
+          hostname = rr_data;
+        }
 
       if (rr_class == C_IN && rr_type == T_CNAME)
-	{
-	  /* Decode the RR data and replace ptrname with it. */
-	  status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
-	  if (status != ARES_SUCCESS)
-	    break;
-	  free(ptrname);
-	  ptrname = rr_data;
-	}
+        {
+          /* Decode the RR data and replace ptrname with it. */
+          status = ares_expand_name(aptr, abuf, alen, &rr_data, &len);
+          if (status != ARES_SUCCESS)
+            break;
+          free(ptrname);
+          ptrname = rr_data;
+        }
 
       free(rr_name);
       aptr += rr_len;
       if (aptr > abuf + alen)
-	{
-	  status = ARES_EBADRESP;
-	  break;
-	}
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
     }
 
   if (status == ARES_SUCCESS && !hostname)
@@ -122,33 +123,33 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
       /* We got our answer.  Allocate memory to build the host entry. */
       hostent = malloc(sizeof(struct hostent));
       if (hostent)
-	{
-	  hostent->h_addr_list = malloc(2 * sizeof(char *));
-	  if (hostent->h_addr_list)
-	    {
-	      hostent->h_addr_list[0] = malloc(addrlen);
-	      if (hostent->h_addr_list[0])
-		{
-		  hostent->h_aliases = malloc(sizeof (char *));
-		  if (hostent->h_aliases)
-		    {
-		      /* Fill in the hostent and return successfully. */
-		      hostent->h_name = hostname;
-		      hostent->h_aliases[0] = NULL;
-		      hostent->h_addrtype = family;
-		      hostent->h_length = addrlen;
-		      memcpy(hostent->h_addr_list[0], addr, addrlen);
-		      hostent->h_addr_list[1] = NULL;
-		      *host = hostent;
-		      free(ptrname);
-		      return ARES_SUCCESS;
-		    }
-		  free(hostent->h_addr_list[0]);
-		}
-	      free(hostent->h_addr_list);
-	    }
-	  free(hostent);
-	}
+        {
+          hostent->h_addr_list = malloc(2 * sizeof(char *));
+          if (hostent->h_addr_list)
+            {
+              hostent->h_addr_list[0] = malloc(addrlen);
+              if (hostent->h_addr_list[0])
+                {
+                  hostent->h_aliases = malloc(sizeof (char *));
+                  if (hostent->h_aliases)
+                    {
+                      /* Fill in the hostent and return successfully. */
+                      hostent->h_name = hostname;
+                      hostent->h_aliases[0] = NULL;
+                      hostent->h_addrtype = family;
+                      hostent->h_length = addrlen;
+                      memcpy(hostent->h_addr_list[0], addr, addrlen);
+                      hostent->h_addr_list[1] = NULL;
+                      *host = hostent;
+                      free(ptrname);
+                      return ARES_SUCCESS;
+                    }
+                  free(hostent->h_addr_list[0]);
+                }
+              free(hostent->h_addr_list);
+            }
+          free(hostent);
+        }
       status = ARES_ENOMEM;
     }
   if (hostname)

ares/ares_private.h

@@ -18,38 +18,53 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#ifdef WIN32
-
-#else
+#if !defined(WIN32) || defined(WATT32)
 #include <netinet/in.h>
 /* We define closesocket() here so that we can use this function all over
    the source code for closing sockets. */
 #define closesocket(x) close(x)
 #endif
 
-#define	DEFAULT_TIMEOUT		5
-#define DEFAULT_TRIES		4
-#ifndef INADDR_NONE
-#define	INADDR_NONE 0xffffffff
+#ifdef WATT32
+#include <tcp.h>
+#include <sys/ioctl.h>
+#undef  closesocket
+#define closesocket(s)    close_s(s)
+#define writev(s,v,c)     writev_s(s,v,c)
 #endif
 
-#ifdef WIN32
+#define DEFAULT_TIMEOUT         5
+#define DEFAULT_TRIES           4
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
+#if defined(WIN32) && !defined(WATT32)
 
 #define IsNT ((int)GetVersion()>0)
 #define WIN_NS_9X      "System\\CurrentControlSet\\Services\\VxD\\MSTCP"
 #define WIN_NS_NT_KEY  "System\\CurrentControlSet\\Services\\Tcpip\\Parameters"
 #define NAMESERVER     "NameServer"
 #define DHCPNAMESERVER "DhcpNameServer"
-#define PATH_HOSTS_NT  "\\drivers\\etc\\hosts"
-#define PATH_HOSTS_9X  "\\hosts"
-          
+#define DATABASEPATH   "DatabasePath"
+#define WIN_PATH_HOSTS  "\\hosts"
+
+#elif defined(WATT32)
+
+#define PATH_RESOLV_CONF "/dev/ENV/etc/resolv.conf"
+
+#elif defined(NETWARE)
+
+#define PATH_RESOLV_CONF "sys:/etc/resolv.cfg"
+#define PATH_HOSTS              "sys:/etc/hosts"
+
 #else
 
-#define PATH_RESOLV_CONF	"/etc/resolv.conf"
+#define PATH_RESOLV_CONF        "/etc/resolv.conf"
 #ifdef ETC_INET
-#define PATH_HOSTS		"/etc/inet/hosts"
+#define PATH_HOSTS              "/etc/inet/hosts"
 #else
-#define PATH_HOSTS		"/etc/hosts"
+#define PATH_HOSTS              "/etc/hosts"
 #endif
 
 #endif
@@ -65,8 +80,8 @@ struct send_request {
 
 struct server_state {
   struct in_addr addr;
-  int udp_socket;
-  int tcp_socket;
+  ares_socket_t udp_socket;
+  ares_socket_t tcp_socket;
 
   /* Mini-buffer for reading the length word */
   unsigned char tcp_lenbuf[2];

ares/ares_process.c

@@ -13,44 +13,57 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
+
 #else
 #include <sys/socket.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#endif
 
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
+
 #include "ares.h"
 #include "ares_dns.h"
 #include "ares_private.h"
 
+#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
+#define GET_ERRNO()  WSAGetLastError()
+#else
+#define GET_ERRNO()  errno
+#endif
+
 static void write_tcp_data(ares_channel channel, fd_set *write_fds,
-			   time_t now);
+                           time_t now);
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now);
 static void read_udp_packets(ares_channel channel, fd_set *read_fds,
-			     time_t now);
+                             time_t now);
 static void process_timeouts(ares_channel channel, time_t now);
 static void process_answer(ares_channel channel, unsigned char *abuf,
-			   int alen, int whichserver, int tcp, int now);
+                           int alen, int whichserver, int tcp, int now);
 static void handle_error(ares_channel channel, int whichserver, time_t now);
-static void next_server(ares_channel channel, struct query *query, time_t now);
+static struct query *next_server(ares_channel channel, struct query *query, time_t now);
 static int open_tcp_socket(ares_channel channel, struct server_state *server);
 static int open_udp_socket(ares_channel channel, struct server_state *server);
 static int same_questions(const unsigned char *qbuf, int qlen,
-			  const unsigned char *abuf, int alen);
-static void end_query(ares_channel channel, struct query *query, int status,
-		      unsigned char *abuf, int alen);
+                          const unsigned char *abuf, int alen);
+static struct query *end_query(ares_channel channel, struct query *query, int status,
+                      unsigned char *abuf, int alen);
 
 /* Something interesting happened on the wire, or there was a timeout.
  * See what's up and respond accordingly.
@@ -74,95 +87,91 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
   struct server_state *server;
   struct send_request *sendreq;
   struct iovec *vec;
-  int i, n, count;
+  int i;
+  ssize_t scount;
+  int wcount;
+  size_t n;
 
   for (i = 0; i < channel->nservers; i++)
     {
       /* Make sure server has data to send and is selected in write_fds. */
       server = &channel->servers[i];
-      if (!server->qhead || server->tcp_socket == -1
-	  || !FD_ISSET(server->tcp_socket, write_fds))
-	continue;
+      if (!server->qhead || server->tcp_socket == ARES_SOCKET_BAD
+          || !FD_ISSET(server->tcp_socket, write_fds))
+        continue;
 
       /* Count the number of send queue items. */
       n = 0;
       for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
-	n++;
+        n++;
 
-#ifdef WIN32
-      vec = NULL;
-#else
       /* Allocate iovecs so we can send all our data at once. */
       vec = malloc(n * sizeof(struct iovec));
-#endif
       if (vec)
-	{
-#ifdef WIN32
-#else
-	  /* Fill in the iovecs and send. */
-	  n = 0;
-	  for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
-	    {
-	      vec[n].iov_base = (char *) sendreq->data;
-	      vec[n].iov_len = sendreq->len;
-	      n++;
-	    }
-	  count = writev(server->tcp_socket, vec, n);
-	  free(vec);
-	  if (count < 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+        {
+          /* Fill in the iovecs and send. */
+          n = 0;
+          for (sendreq = server->qhead; sendreq; sendreq = sendreq->next)
+            {
+              vec[n].iov_base = (char *) sendreq->data;
+              vec[n].iov_len = sendreq->len;
+              n++;
+            }
+          wcount = writev(server->tcp_socket, vec, n);
+          free(vec);
+          if (wcount < 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }
 
-	  /* Advance the send queue by as many bytes as we sent. */
-	  while (count)
-	    {
-	      sendreq = server->qhead;
-	      if ((size_t)count >= sendreq->len)
-		{
-		  count -= sendreq->len;
-		  server->qhead = sendreq->next;
-		  if (server->qhead == NULL)
-		    server->qtail = NULL;
-		  free(sendreq);
-		}
-	      else
-		{
-		  sendreq->data += count;
-		  sendreq->len -= count;
-		  break;
-		}
-	    }
-#endif
-	}
+          /* Advance the send queue by as many bytes as we sent. */
+          while (wcount)
+            {
+              sendreq = server->qhead;
+              if ((size_t)wcount >= sendreq->len)
+                {
+                  wcount -= sendreq->len;
+                  server->qhead = sendreq->next;
+                  if (server->qhead == NULL)
+                    server->qtail = NULL;
+                  free(sendreq);
+                }
+              else
+                {
+                  sendreq->data += wcount;
+                  sendreq->len -= wcount;
+                  break;
+                }
+            }
+        }
       else
-	{
-	  /* Can't allocate iovecs; just send the first request. */
-	  sendreq = server->qhead;
+        {
+          /* Can't allocate iovecs; just send the first request. */
+          sendreq = server->qhead;
 
-          count = send(server->tcp_socket, sendreq->data, sendreq->len, 0);
+          scount = send(server->tcp_socket, sendreq->data, sendreq->len, 0);
 
-	  if (count < 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+          if (scount < 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }
 
-	  /* Advance the send queue by as many bytes as we sent. */
-	  if ((size_t)count == sendreq->len)
-	    {
-	      server->qhead = sendreq->next;
-	      if (server->qhead == NULL)
-		server->qtail = NULL;
-	      free(sendreq);
-	    }
-	  else
-	    {
-	      sendreq->data += count;
-	      sendreq->len -= count;
-	    }
-	}
+          /* Advance the send queue by as many bytes as we sent. */
+          if ((size_t)scount == sendreq->len)
+            {
+              server->qhead = sendreq->next;
+              if (server->qhead == NULL)
+                server->qtail = NULL;
+              free(sendreq);
+            }
+          else
+            {
+              sendreq->data += scount;
+              sendreq->len -= scount;
+            }
+        }
     }
 }
 
@@ -179,68 +188,70 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
     {
       /* Make sure the server has a socket and is selected in read_fds. */
       server = &channel->servers[i];
-      if (server->tcp_socket == -1 || !FD_ISSET(server->tcp_socket, read_fds))
-	continue;
+      if (server->tcp_socket == ARES_SOCKET_BAD ||
+          !FD_ISSET(server->tcp_socket, read_fds))
+        continue;
 
       if (server->tcp_lenbuf_pos != 2)
-	{
-	  /* We haven't yet read a length word, so read that (or
-	   * what's left to read of it).
-	   */
+        {
+          /* We haven't yet read a length word, so read that (or
+           * what's left to read of it).
+           */
           count = recv(server->tcp_socket,
                        server->tcp_lenbuf + server->tcp_buffer_pos,
                        2 - server->tcp_buffer_pos, 0);
-	  if (count <= 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+          if (count <= 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }
 
-	  server->tcp_lenbuf_pos += count;
-	  if (server->tcp_lenbuf_pos == 2)
-	    {
-	      /* We finished reading the length word.  Decode the
+          server->tcp_lenbuf_pos += count;
+          if (server->tcp_lenbuf_pos == 2)
+            {
+              /* We finished reading the length word.  Decode the
                * length and allocate a buffer for the data.
-	       */
-	      server->tcp_length = server->tcp_lenbuf[0] << 8
-		| server->tcp_lenbuf[1];
-	      server->tcp_buffer = malloc(server->tcp_length);
-	      if (!server->tcp_buffer)
-		handle_error(channel, i, now);
-	      server->tcp_buffer_pos = 0;
-	    }
-	}
+               */
+              server->tcp_length = server->tcp_lenbuf[0] << 8
+                | server->tcp_lenbuf[1];
+              server->tcp_buffer = malloc(server->tcp_length);
+              if (!server->tcp_buffer)
+                handle_error(channel, i, now);
+              server->tcp_buffer_pos = 0;
+            }
+        }
       else
-	{
-	  /* Read data into the allocated buffer. */
-       	  count = recv(server->tcp_socket,
-		       server->tcp_buffer + server->tcp_buffer_pos,
-		       server->tcp_length - server->tcp_buffer_pos, 0);
-	  if (count <= 0)
-	    {
-	      handle_error(channel, i, now);
-	      continue;
-	    }
+        {
+          /* Read data into the allocated buffer. */
+          count = recv(server->tcp_socket,
+                       server->tcp_buffer + server->tcp_buffer_pos,
+                       server->tcp_length - server->tcp_buffer_pos, 0);
+          if (count <= 0)
+            {
+              handle_error(channel, i, now);
+              continue;
+            }
 
-	  server->tcp_buffer_pos += count;
-	  if (server->tcp_buffer_pos == server->tcp_length)
-	    {
-	      /* We finished reading this answer; process it and
+          server->tcp_buffer_pos += count;
+          if (server->tcp_buffer_pos == server->tcp_length)
+            {
+              /* We finished reading this answer; process it and
                * prepare to read another length word.
-	       */
-	      process_answer(channel, server->tcp_buffer, server->tcp_length,
-			     i, 1, now);
-	      free(server->tcp_buffer);
-	      server->tcp_buffer = NULL;
-	      server->tcp_lenbuf_pos = 0;
-	    }
-	}
+               */
+              process_answer(channel, server->tcp_buffer, server->tcp_length,
+                             i, 1, now);
+          if (server->tcp_buffer)
+                        free(server->tcp_buffer);
+              server->tcp_buffer = NULL;
+              server->tcp_lenbuf_pos = 0;
+            }
+        }
     }
 }
 
 /* If any UDP sockets select true for reading, process them. */
 static void read_udp_packets(ares_channel channel, fd_set *read_fds,
-			     time_t now)
+                             time_t now)
 {
   struct server_state *server;
   int i, count;
@@ -251,12 +262,13 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
       /* Make sure the server has a socket and is selected in read_fds. */
       server = &channel->servers[i];
 
-      if (server->udp_socket == -1 || !FD_ISSET(server->udp_socket, read_fds))
-	continue;
+      if (server->udp_socket == ARES_SOCKET_BAD ||
+          !FD_ISSET(server->udp_socket, read_fds))
+        continue;
 
       count = recv(server->udp_socket, buf, sizeof(buf), 0);
       if (count <= 0)
-	handle_error(channel, i, now);
+        handle_error(channel, i, now);
 
       process_answer(channel, buf, count, i, 0, now);
     }
@@ -271,16 +283,16 @@ static void process_timeouts(ares_channel channel, time_t now)
     {
       next = query->next;
       if (query->timeout != 0 && now >= query->timeout)
-	{
-	  query->error_status = ARES_ETIMEOUT;
-	  next_server(channel, query, now);
-	}
+        {
+          query->error_status = ARES_ETIMEOUT;
+          next = next_server(channel, query, now);
+        }
     }
 }
 
 /* Handle an answer from a server. */
 static void process_answer(ares_channel channel, unsigned char *abuf,
-			   int alen, int whichserver, int tcp, int now)
+                           int alen, int whichserver, int tcp, int now)
 {
   int id, tc, rcode;
   struct query *query;
@@ -299,7 +311,7 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
   for (query = channel->queries; query; query = query->next)
     {
       if (query->qid == id)
-	break;
+        break;
     }
   if (!query)
     return;
@@ -311,10 +323,10 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
   if ((tc || alen > PACKETSZ) && !tcp && !(channel->flags & ARES_FLAG_IGNTC))
     {
       if (!query->using_tcp)
-	{
-	  query->using_tcp = 1;
-	  ares__send_query(channel, query, now);
-	}
+        {
+          query->using_tcp = 1;
+          ares__send_query(channel, query, now);
+        }
       return;
     }
 
@@ -330,18 +342,18 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
   if (!(channel->flags & ARES_FLAG_NOCHECKRESP))
     {
       if (rcode == SERVFAIL || rcode == NOTIMP || rcode == REFUSED)
-	{
-	  query->skip_server[whichserver] = 1;
-	  if (query->server == whichserver)
-	    next_server(channel, query, now);
-	  return;
-	}
+        {
+          query->skip_server[whichserver] = 1;
+          if (query->server == whichserver)
+            next_server(channel, query, now);
+          return;
+        }
       if (!same_questions(query->qbuf, query->qlen, abuf, alen))
-	{
-	  if (query->server == whichserver)
-	    next_server(channel, query, now);
-	  return;
-	}
+        {
+          if (query->server == whichserver)
+            next_server(channel, query, now);
+          return;
+        }
     }
 
   end_query(channel, query, ARES_SUCCESS, abuf, alen);
@@ -349,7 +361,7 @@ static void process_answer(ares_channel channel, unsigned char *abuf,
 
 static void handle_error(ares_channel channel, int whichserver, time_t now)
 {
-  struct query *query;
+  struct query *query, *next;
 
   /* Reset communications with this server. */
   ares__close_sockets(&channel->servers[whichserver]);
@@ -357,37 +369,39 @@ static void handle_error(ares_channel channel, int whichserver, time_t now)
   /* Tell all queries talking to this server to move on and not try
    * this server again.
    */
-  for (query = channel->queries; query; query = query->next)
+
+  for (query = channel->queries; query; query = next)
     {
+      next = query->next;
       if (query->server == whichserver)
-	{
-	  query->skip_server[whichserver] = 1;
-	  next_server(channel, query, now);
-	}
+        {
+          query->skip_server[whichserver] = 1;
+          next = next_server(channel, query, now);
+        }
     }
 }
 
-static void next_server(ares_channel channel, struct query *query, time_t now)
+static struct query *next_server(ares_channel channel, struct query *query, time_t now)
 {
   /* Advance to the next server or try. */
   query->server++;
   for (; query->try < channel->tries; query->try++)
     {
       for (; query->server < channel->nservers; query->server++)
-	{
-	  if (!query->skip_server[query->server])
-	    {
-	      ares__send_query(channel, query, now);
-	      return;
-	    }
-	}
+        {
+          if (!query->skip_server[query->server])
+            {
+              ares__send_query(channel, query, now);
+              return (query->next);
+            }
+        }
       query->server = 0;
 
       /* Only one try if we're using TCP. */
       if (query->using_tcp)
-	break;
+        break;
     }
-  end_query(channel, query, query->error_status, NULL, 0);
+  return end_query(channel, query, query->error_status, NULL, 0);
 }
 
 void ares__send_query(ares_channel channel, struct query *query, time_t now)
@@ -401,64 +415,68 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
       /* Make sure the TCP socket for this server is set up and queue
        * a send request.
        */
-      if (server->tcp_socket == -1)
-	{
-	  if (open_tcp_socket(channel, server) == -1)
-	    {
-	      query->skip_server[query->server] = 1;
-	      next_server(channel, query, now);
-	      return;
-	    }
-	}
-      sendreq = malloc(sizeof(struct send_request));
+      if (server->tcp_socket == ARES_SOCKET_BAD)
+        {
+          if (open_tcp_socket(channel, server) == -1)
+            {
+              query->skip_server[query->server] = 1;
+              next_server(channel, query, now);
+              return;
+            }
+        }
+      sendreq = calloc(sizeof(struct send_request), 1);
       if (!sendreq)
-	end_query(channel, query, ARES_ENOMEM, NULL, 0);
+        {
+        end_query(channel, query, ARES_ENOMEM, NULL, 0);
+          return;
+        }
       sendreq->data = query->tcpbuf;
       sendreq->len = query->tcplen;
       sendreq->next = NULL;
       if (server->qtail)
-	server->qtail->next = sendreq;
+        server->qtail->next = sendreq;
       else
-	server->qhead = sendreq;
+        server->qhead = sendreq;
       server->qtail = sendreq;
       query->timeout = 0;
     }
   else
     {
-      if (server->udp_socket == -1)
-	{
-	  if (open_udp_socket(channel, server) == -1)
-	    {
-	      query->skip_server[query->server] = 1;
-	      next_server(channel, query, now);
-	      return;
-	    }
-	}
+      if (server->udp_socket == ARES_SOCKET_BAD)
+        {
+          if (open_udp_socket(channel, server) == -1)
+            {
+              query->skip_server[query->server] = 1;
+              next_server(channel, query, now);
+              return;
+            }
+        }
       if (send(server->udp_socket, query->qbuf, query->qlen, 0) == -1)
-	{
-	  query->skip_server[query->server] = 1;
-	  next_server(channel, query, now);
-	  return;
-	}
+        {
+          query->skip_server[query->server] = 1;
+          next_server(channel, query, now);
+          return;
+        }
       query->timeout = now
-	  + ((query->try == 0) ? channel->timeout
-	     : channel->timeout << query->try / channel->nservers);
+          + ((query->try == 0) ? channel->timeout
+             : channel->timeout << query->try / channel->nservers);
     }
 }
 
 static int open_tcp_socket(ares_channel channel, struct server_state *server)
 {
-  int s, flags;
+  ares_socket_t s;
+  int flags;
   struct sockaddr_in sockin;
 
   /* Acquire a socket. */
   s = socket(AF_INET, SOCK_STREAM, 0);
-  if (s == -1)
+  if (s == ARES_SOCKET_BAD)
     return -1;
 
   /* Set the socket non-blocking. */
 
-#ifdef WIN32
+#if defined(WIN32) || defined(WATT32)
   flags = 1;
   ioctlsocket(s, FIONBIO, &flags);
 #else
@@ -466,41 +484,44 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
 
   if (flags == -1)
     {
-      close(s);
+      closesocket(s);
       return -1;
     }
   flags |= O_NONBLOCK;
   if (fcntl(s, F_SETFL, flags) == -1)
     {
-      close(s);
+      closesocket(s);
       return -1;
     }
 #endif
-  
+
   /* Connect to the server. */
   memset(&sockin, 0, sizeof(sockin));
   sockin.sin_family = AF_INET;
   sockin.sin_addr = server->addr;
   sockin.sin_port = channel->tcp_port;
-  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1
-      && errno != EINPROGRESS)
-    {
+  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1) {
+    int err = GET_ERRNO();
+
+    if (err != EINPROGRESS && err != EWOULDBLOCK) {
       closesocket(s);
       return -1;
     }
+  }
 
+  server->tcp_buffer_pos = 0;
   server->tcp_socket = s;
   return 0;
 }
 
 static int open_udp_socket(ares_channel channel, struct server_state *server)
 {
-  int s;
+  ares_socket_t s;
   struct sockaddr_in sockin;
 
   /* Acquire a socket. */
   s = socket(AF_INET, SOCK_DGRAM, 0);
-  if (s == -1)
+  if (s == ARES_SOCKET_BAD)
     return -1;
 
   /* Connect to the server. */
@@ -519,7 +540,7 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
 }
 
 static int same_questions(const unsigned char *qbuf, int qlen,
-			  const unsigned char *abuf, int alen)
+                          const unsigned char *abuf, int alen)
 {
   struct {
     const unsigned char *p;
@@ -546,14 +567,14 @@ static int same_questions(const unsigned char *qbuf, int qlen,
     {
       /* Decode the question in the query. */
       if (ares_expand_name(q.p, qbuf, qlen, &q.name, &q.namelen)
-	  != ARES_SUCCESS)
-	return 0;
+          != ARES_SUCCESS)
+        return 0;
       q.p += q.namelen;
       if (q.p + QFIXEDSZ > qbuf + qlen)
-	{
-	  free(q.name);
-	  return 0;
-	}
+        {
+          free(q.name);
+          return 0;
+        }
       q.type = DNS_QUESTION_TYPE(q.p);
       q.dnsclass = DNS_QUESTION_CLASS(q.p);
       q.p += QFIXEDSZ;
@@ -561,55 +582,59 @@ static int same_questions(const unsigned char *qbuf, int qlen,
       /* Search for this question in the answer. */
       a.p = abuf + HFIXEDSZ;
       for (j = 0; j < a.qdcount; j++)
-	{
-	  /* Decode the question in the answer. */
-	  if (ares_expand_name(a.p, abuf, alen, &a.name, &a.namelen)
-	      != ARES_SUCCESS)
-	    {
-	      free(q.name);
-	      return 0;
-	    }
-	  a.p += a.namelen;
-	  if (a.p + QFIXEDSZ > abuf + alen)
-	    {
-	      free(q.name);
-	      free(a.name);
-	      return 0;
-	    }
-	  a.type = DNS_QUESTION_TYPE(a.p);
-	  a.dnsclass = DNS_QUESTION_CLASS(a.p);
-	  a.p += QFIXEDSZ;
+        {
+          /* Decode the question in the answer. */
+          if (ares_expand_name(a.p, abuf, alen, &a.name, &a.namelen)
+              != ARES_SUCCESS)
+            {
+              free(q.name);
+              return 0;
+            }
+          a.p += a.namelen;
+          if (a.p + QFIXEDSZ > abuf + alen)
+            {
+              free(q.name);
+              free(a.name);
+              return 0;
+            }
+          a.type = DNS_QUESTION_TYPE(a.p);
+          a.dnsclass = DNS_QUESTION_CLASS(a.p);
+          a.p += QFIXEDSZ;
 
-	  /* Compare the decoded questions. */
-	  if (strcasecmp(q.name, a.name) == 0 && q.type == a.type
-	      && q.dnsclass == a.dnsclass)
-	    {
-	      free(a.name);
-	      break;
-	    }
-	  free(a.name);
-	}
+          /* Compare the decoded questions. */
+          if (strcasecmp(q.name, a.name) == 0 && q.type == a.type
+              && q.dnsclass == a.dnsclass)
+            {
+              free(a.name);
+              break;
+            }
+          free(a.name);
+        }
 
       free(q.name);
       if (j == a.qdcount)
-	return 0;
+        return 0;
     }
   return 1;
 }
 
-static void end_query(ares_channel channel, struct query *query, int status,
-		      unsigned char *abuf, int alen)
+static struct query *end_query (ares_channel channel, struct query *query, int status,
+                      unsigned char *abuf, int alen)
 {
-  struct query **q;
+  struct query **q, *next;
   int i;
 
   query->callback(query->arg, status, abuf, alen);
   for (q = &channel->queries; *q; q = &(*q)->next)
     {
       if (*q == query)
-	break;
+        break;
     }
   *q = query->next;
+  if (*q)
+    next = (*q)->next;
+  else
+    next = NULL;
   free(query->tcpbuf);
   free(query->skip_server);
   free(query);
@@ -620,6 +645,7 @@ static void end_query(ares_channel channel, struct query *query, int status,
   if (!channel->queries && !(channel->flags & ARES_FLAG_STAYOPEN))
     {
       for (i = 0; i < channel->nservers; i++)
-	ares__close_sockets(&channel->servers[i]);
+        ares__close_sockets(&channel->servers[i]);
     }
+  return (next);
 }

ares/ares_query.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
@@ -35,7 +36,7 @@ struct qquery {
 static void qcallback(void *arg, int status, unsigned char *abuf, int alen);
 
 void ares_query(ares_channel channel, const char *name, int dnsclass,
-		int type, ares_callback callback, void *arg)
+                int type, ares_callback callback, void *arg)
 {
   struct qquery *qquery;
   unsigned char *qbuf;
@@ -44,7 +45,7 @@ void ares_query(ares_channel channel, const char *name, int dnsclass,
   /* Compose the query. */
   rd = !(channel->flags & ARES_FLAG_NORECURSE);
   status = ares_mkquery(name, dnsclass, type, channel->next_id, rd, &qbuf,
-			&qlen);
+                        &qlen);
   channel->next_id++;
   if (status != ARES_SUCCESS)
     {
@@ -84,26 +85,26 @@ static void qcallback(void *arg, int status, unsigned char *abuf, int alen)
 
       /* Convert errors. */
       switch (rcode)
-	{
-	case NOERROR:
-	  status = (ancount > 0) ? ARES_SUCCESS : ARES_ENODATA;
-	  break;
-	case FORMERR:
-	  status = ARES_EFORMERR;
-	  break;
-	case SERVFAIL:
-	  status = ARES_ESERVFAIL;
-	  break;
-	case NXDOMAIN:
-	  status = ARES_ENOTFOUND;
-	  break;
-	case NOTIMP:
-	  status = ARES_ENOTIMP;
-	  break;
-	case REFUSED:
-	  status = ARES_EREFUSED;
-	  break;
-	}
+        {
+        case NOERROR:
+          status = (ancount > 0) ? ARES_SUCCESS : ARES_ENODATA;
+          break;
+        case FORMERR:
+          status = ARES_EFORMERR;
+          break;
+        case SERVFAIL:
+          status = ARES_ESERVFAIL;
+          break;
+        case NXDOMAIN:
+          status = ARES_ENOTFOUND;
+          break;
+        case NOTIMP:
+          status = ARES_ENOTIMP;
+          break;
+        case REFUSED:
+          status = ARES_EREFUSED;
+          break;
+        }
       qquery->callback(qquery->arg, status, abuf, alen);
     }
   free(qquery);

ares/ares_search.c

@@ -13,12 +13,13 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #endif
 
@@ -28,26 +29,26 @@
 struct search_query {
   /* Arguments passed to ares_search */
   ares_channel channel;
-  char *name;			/* copied into an allocated buffer */
+  char *name;                   /* copied into an allocated buffer */
   int dnsclass;
   int type;
   ares_callback callback;
   void *arg;
 
-  int status_as_is;		/* error status from trying as-is */
-  int next_domain;		/* next search domain to try */
-  int trying_as_is;		/* current query is for name as-is */
+  int status_as_is;             /* error status from trying as-is */
+  int next_domain;              /* next search domain to try */
+  int trying_as_is;             /* current query is for name as-is */
 };
 
 static void search_callback(void *arg, int status, unsigned char *abuf,
-			    int alen);
+                            int alen);
 static void end_squery(struct search_query *squery, int status,
-		       unsigned char *abuf, int alen);
+                       unsigned char *abuf, int alen);
 static int cat_domain(const char *name, const char *domain, char **s);
 static int single_domain(ares_channel channel, const char *name, char **s);
 
 void ares_search(ares_channel channel, const char *name, int dnsclass,
-		 int type, ares_callback callback, void *arg)
+                 int type, ares_callback callback, void *arg)
 {
   struct search_query *squery;
   char *s;
@@ -98,7 +99,7 @@ void ares_search(ares_channel channel, const char *name, int dnsclass,
   for (p = name; *p; p++)
     {
       if (*p == '.')
-	ndots++;
+        ndots++;
     }
 
   /* If ndots is at least the channel ndots threshold (usually 1),
@@ -119,22 +120,22 @@ void ares_search(ares_channel channel, const char *name, int dnsclass,
       squery->trying_as_is = 0;
       status = cat_domain(name, channel->domains[0], &s);
       if (status == ARES_SUCCESS)
-	{
-	  ares_query(channel, s, dnsclass, type, search_callback, squery);
-	  free(s);
-	}
+        {
+          ares_query(channel, s, dnsclass, type, search_callback, squery);
+          free(s);
+        }
       else
       {
         /* failed, free the malloc()ed memory */
         free(squery->name);
         free(squery);
-	callback(arg, status, NULL, 0);
+        callback(arg, status, NULL, 0);
       }
     }
 }
 
 static void search_callback(void *arg, int status, unsigned char *abuf,
-			    int alen)
+                            int alen)
 {
   struct search_query *squery = (struct search_query *) arg;
   ares_channel channel = squery->channel;
@@ -148,37 +149,37 @@ static void search_callback(void *arg, int status, unsigned char *abuf,
     {
       /* Save the status if we were trying as-is. */
       if (squery->trying_as_is)
-	squery->status_as_is = status;
+        squery->status_as_is = status;
       if (squery->next_domain < channel->ndomains)
-	{
-	  /* Try the next domain. */
-	  status = cat_domain(squery->name,
-			      channel->domains[squery->next_domain], &s);
-	  if (status != ARES_SUCCESS)
-	    end_squery(squery, status, NULL, 0);
-	  else
-	    {
-	      squery->trying_as_is = 0;
-	      squery->next_domain++;
-	      ares_query(channel, s, squery->dnsclass, squery->type,
-			 search_callback, squery);
-	      free(s);
-	    }
-	}
+        {
+          /* Try the next domain. */
+          status = cat_domain(squery->name,
+                              channel->domains[squery->next_domain], &s);
+          if (status != ARES_SUCCESS)
+            end_squery(squery, status, NULL, 0);
+          else
+            {
+              squery->trying_as_is = 0;
+              squery->next_domain++;
+              ares_query(channel, s, squery->dnsclass, squery->type,
+                         search_callback, squery);
+              free(s);
+            }
+        }
       else if (squery->status_as_is == -1)
-	{
-	  /* Try the name as-is at the end. */
-	  squery->trying_as_is = 1;
-	  ares_query(channel, squery->name, squery->dnsclass, squery->type,
-		     search_callback, squery);
-	}
+        {
+          /* Try the name as-is at the end. */
+          squery->trying_as_is = 1;
+          ares_query(channel, squery->name, squery->dnsclass, squery->type,
+                     search_callback, squery);
+        }
       else
-	end_squery(squery, squery->status_as_is, NULL, 0);
+        end_squery(squery, squery->status_as_is, NULL, 0);
     }
 }
 
 static void end_squery(struct search_query *squery, int status,
-		       unsigned char *abuf, int alen)
+                       unsigned char *abuf, int alen)
 {
   squery->callback(squery->arg, status, abuf, alen);
   free(squery->name);
@@ -228,41 +229,41 @@ static int single_domain(ares_channel channel, const char *name, char **s)
       /* The name might be a host alias. */
       hostaliases = getenv("HOSTALIASES");
       if (hostaliases)
-	{
-	  fp = fopen(hostaliases, "r");
-	  if (fp)
-	    {
-	      while ((status = ares__read_line(fp, &line, &linesize))
-		     == ARES_SUCCESS)
-		{
-		  if (strncasecmp(line, name, len) != 0 ||
-		      !isspace((unsigned char)line[len]))
-		    continue;
-		  p = line + len;
-		  while (isspace((unsigned char)*p))
-		    p++;
-		  if (*p)
-		    {
-		      q = p + 1;
-		      while (*q && !isspace((unsigned char)*q))
-			q++;
-		      *s = malloc(q - p + 1);
-		      if (*s)
-			{
-			  memcpy(*s, p, q - p);
-			  (*s)[q - p] = 0;
-			}
-		      free(line);
-		      fclose(fp);
-		      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
-		    }
-		}
-	      free(line);
-	      fclose(fp);
-	      if (status != ARES_SUCCESS)
-		return status;
-	    }
-	}
+        {
+          fp = fopen(hostaliases, "r");
+          if (fp)
+            {
+              while ((status = ares__read_line(fp, &line, &linesize))
+                     == ARES_SUCCESS)
+                {
+                  if (strncasecmp(line, name, len) != 0 ||
+                      !isspace((unsigned char)line[len]))
+                    continue;
+                  p = line + len;
+                  while (isspace((unsigned char)*p))
+                    p++;
+                  if (*p)
+                    {
+                      q = p + 1;
+                      while (*q && !isspace((unsigned char)*q))
+                        q++;
+                      *s = malloc(q - p + 1);
+                      if (*s)
+                        {
+                          memcpy(*s, p, q - p);
+                          (*s)[q - p] = 0;
+                        }
+                      free(line);
+                      fclose(fp);
+                      return (*s) ? ARES_SUCCESS : ARES_ENOMEM;
+                    }
+                }
+              free(line);
+              fclose(fp);
+              if (status != ARES_SUCCESS)
+                return status;
+            }
+        }
     }
 
   if (channel->flags & ARES_FLAG_NOSEARCH || channel->ndomains == 0)

ares/ares_send.c

@@ -13,9 +13,10 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
@@ -30,7 +31,7 @@
 #include "ares_private.h"
 
 void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
-	       ares_callback callback, void *arg)
+               ares_callback callback, void *arg)
 {
   struct query *query;
   int i;

ares/ares_strerror.c

@@ -13,6 +13,7 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <assert.h>
 #include "ares.h"
 

ares/ares_timeout.c

@@ -13,20 +13,20 @@
  * without express or implied warranty.
  */
 
+#include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
-
-#else
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
 #include <time.h>
+
 #include "ares.h"
 #include "ares_private.h"
 
 struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
-			     struct timeval *tvbuf)
+                             struct timeval *tvbuf)
 {
   struct query *query;
   time_t now;
@@ -42,12 +42,12 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
   for (query = channel->queries; query; query = query->next)
     {
       if (query->timeout == 0)
-	continue;
+        continue;
       offset = query->timeout - now;
       if (offset < 0)
-	offset = 0;
+        offset = 0;
       if (min_offset == -1 || offset < min_offset)
-	min_offset = offset;
+        min_offset = offset;
     }
 
   /* If we found a minimum timeout and it's sooner than the one

ares/ares_version.c

@@ -1,5 +1,6 @@
 /* $Id$ */
 
+#include "setup.h"
 #include "ares_version.h"
 
 const char *ares_version(int *version)

ares/buildconf

@@ -1,4 +1,7 @@
 #!/bin/sh
 
+libtoolize --copy --automake --force
 aclocal
+autoheader
 autoconf
+automake --add-missing

ares/configure.ac

@@ -1,17 +1,22 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(ares_init.c)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(c-ares, CVS)
 
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_RANLIB
 
-AC_CANONICAL_HOST
 case $host_os in
 solaris*)
-	AC_DEFINE(ETC_INET)
+	AC_DEFINE(ETC_INET, 1, [if a /etc/inet dir is being used])
 	;;
 esac
 
+# check for ssize_t
+AC_CHECK_TYPE(ssize_t, ,
+   AC_DEFINE(ssize_t, int, [the signed version of size_t]))
+
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(socket, socket)
 
@@ -30,6 +35,9 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
        ;;
   *)   AC_MSG_RESULT(yes)
 
+    dnl when doing the debug stuff, use static library only
+    AC_DISABLE_SHARED
+
     dnl Checks for standard header files, to make memdebug.h inclusions bettter
     AC_HEADER_STDC
 
@@ -45,12 +53,14 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
        AC_MSG_RESULT(no)
 )
 
+AC_PROG_LIBTOOL
+
 dnl check for a few basic system headers we need
-dnl AC_CHECK_HEADERS(
-dnl        sys/types.h \
-dnl        sys/time.h \
-dnl        sys/select.h \
-dnl        sys/socket.h \
-dnl        )
+AC_CHECK_HEADERS(
+       sys/types.h \
+       sys/time.h \
+       sys/select.h \
+       sys/socket.h \
+       )
 
 AC_OUTPUT(Makefile)

ares/maketgz

@@ -2,8 +2,6 @@
 
 $version = $ARGV[0];
 
-$name="c-ares";
-
 if($version eq "") {
     print "Enter version number!\n";
     exit;
@@ -15,86 +13,25 @@ if(!-f "ares.h") {
 }
 
 if(!-f "configure") {
-    `autoconf`;
+    print "running buildconf\n";
+    `./buildconf`;
 }
+print "adding $version in the configure.ac file\n";
+`sed -e 's/AM_INIT_AUTOMAKE(c-ares, CVS)/AM_INIT_AUTOMAKE(c-ares, $version)/' < configure.ac > configure.ac-rel`;
 
-@files=`find . -name FILES`;
+# now make a new configure script with this
+print "makes a new configure script\n";
+`autoconf configure.ac-rel >configure`;
 
-my @entries;
+# now run this new configure to get a fine makefile
+print "running configure\n";
+`./configure`;
 
-sub dirpart {
-    my ($file)=@_;
-    my @p=split("/", $file);
-    $p[$#p]=""; # blank the last one
-    my $dir=join("/", @p);
+# now make the actual tarball
+print "running make dist\n";
+`make dist`;
 
-    $dir =~ s/^\.\///; # cut off ./ beginnings
-
-    $dir =~ s/\/$//;  # off / trailers
-
-    if(!$dir) {
-        $dir = ".";
-    }
-
-    return $dir;
-}
-
-sub add {
-    my ($file)=@_;
-
-    my $dir=dirpart($file);
-
-    open(FILE, "<$file");
-    while(<FILE>) {
-        if($_ =~ /^ *\#/) {
-            next;
-        }
-        chomp;
-        push @entries, "$dir/$_";
-    }
-    close(FILE);
-}
-
-for(@files) {
-    chomp;
-    add($_);
-}
-
-sub mkalldir {
-    my ($dir) = @_;
-
-    my @parts = split("/", $dir);
-
-    #print "IN: $dir\n";
-
-    my $sub="";
-    for(@parts) {
-        #print "PART: $_\n";
-
-        $sub .= "$_";
-        if($_ eq "") {
-            next;
-        }
-        mkdir($sub, 0777);
-        #print "make $sub\n";
-        $sub .= "/";
-    }
-    
-}
-
-for(@entries) {
-    my $dir = dirpart("$name-$version/$_");
- #   print "Create $dir\n";
-    mkalldir($dir);
- #   print "Copy $_ to $dir\n";
-    `cp -p $_ $dir`;
-}
-
-# make a tarball
-`tar -cf $name-$version.tar $name-$version`;
-# gzip the tarball
-`gzip -9 $name-$version.tar`;
-# remove the dir
-`rm -rf $name-$version`;
+print "removing temporary configure.ac file\n";
+`rm configure.ac-rel`;
 
 print "NOTE: now cvs tag this release!\n";

ares/nameser.h

@@ -4,13 +4,18 @@
 /* Windows-only header file provided by liren@vivisimo.com to make his Windows
    port build */
 
+#ifndef NETWARE
 #include <windows.h>
 #include <process.h> /* for the _getpid() proto */
+#endif  /* !NETWARE */
 #include <sys/types.h>
 
+#ifndef NETWARE
+
 #define MAXHOSTNAMELEN 256
 
 #define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
 
 /* Structure for scatter/gather I/O.  */
 struct iovec
@@ -21,11 +26,16 @@ struct iovec
 
 #define getpid() _getpid()
 
+int ares_writev (SOCKET s, const struct iovec *vector, size_t count);
+#define writev(s,vect,count)  ares_writev(s,vect,count)
+
 struct timezone { int dummy; };
 
 int ares_gettimeofday(struct timeval *tv, struct timezone *tz);
 #define gettimeofday(tv,tz) ares_gettimeofday(tv,tz)
 
+#endif  /* !NETWARE */
+
 #define NS_CMPRSFLGS  0xc0  
 
 
@@ -211,16 +221,4 @@ typedef enum __ns_rcode {
 #define T_MAILA         ns_t_maila
 #define T_ANY           ns_t_any
 
-#ifndef __MINGW32__
-/* protos for the functions we provide in windows_port.c */
-int ares_strncasecmp(const char *s1, const char *s2, size_t n);
-int ares_strcasecmp(const char *s1, const char *s2);
-
-/* use this define magic to prevent us from adding symbol names to the library
-   that is a high-risk to collide with another libraries' attempts to do the
-   same */
-#define strncasecmp(a,b,c) ares_strncasecmp(a,b,c)
-#define strcasecmp(a,b) ares_strcasecmp(a,b)
-#endif
-
 #endif /* ARES_NAMESER_H */

ares/setup.h

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

ares/vc/areslib/areslib.dsp

@@ -7,19 +7,19 @@
 CFG=areslib - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "areslib.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -74,7 +74,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -109,10 +109,6 @@ SOURCE=..\..\ares_fds.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\ares_free_errmem.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\ares_free_hostent.c
 # End Source File
 # Begin Source File

ares/vc/areslib/areslib.mak

@@ -1,361 +1,351 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on areslib.dsp
-!IF "$(CFG)" == ""
-CFG=areslib - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to areslib - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "areslib - Win32 Release" && "$(CFG)" != "areslib - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "areslib - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\areslib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\ares__close_sockets.obj"
-	-@erase "$(INTDIR)\ares__get_hostent.obj"
-	-@erase "$(INTDIR)\ares__read_line.obj"
-	-@erase "$(INTDIR)\ares_destroy.obj"
-	-@erase "$(INTDIR)\ares_expand_name.obj"
-	-@erase "$(INTDIR)\ares_fds.obj"
-	-@erase "$(INTDIR)\ares_free_errmem.obj"
-	-@erase "$(INTDIR)\ares_free_hostent.obj"
-	-@erase "$(INTDIR)\ares_free_string.obj"
-	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
-	-@erase "$(INTDIR)\ares_gethostbyname.obj"
-	-@erase "$(INTDIR)\ares_init.obj"
-	-@erase "$(INTDIR)\ares_mkquery.obj"
-	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
-	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
-	-@erase "$(INTDIR)\ares_process.obj"
-	-@erase "$(INTDIR)\ares_query.obj"
-	-@erase "$(INTDIR)\ares_search.obj"
-	-@erase "$(INTDIR)\ares_send.obj"
-	-@erase "$(INTDIR)\ares_strerror.obj"
-	-@erase "$(INTDIR)\ares_timeout.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\windows_port.obj"
-	-@erase "$(OUTDIR)\areslib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\ares__close_sockets.obj" \
-	"$(INTDIR)\ares__get_hostent.obj" \
-	"$(INTDIR)\ares__read_line.obj" \
-	"$(INTDIR)\ares_destroy.obj" \
-	"$(INTDIR)\ares_expand_name.obj" \
-	"$(INTDIR)\ares_fds.obj" \
-	"$(INTDIR)\ares_free_errmem.obj" \
-	"$(INTDIR)\ares_free_hostent.obj" \
-	"$(INTDIR)\ares_free_string.obj" \
-	"$(INTDIR)\ares_gethostbyaddr.obj" \
-	"$(INTDIR)\ares_gethostbyname.obj" \
-	"$(INTDIR)\ares_init.obj" \
-	"$(INTDIR)\ares_mkquery.obj" \
-	"$(INTDIR)\ares_parse_a_reply.obj" \
-	"$(INTDIR)\ares_parse_ptr_reply.obj" \
-	"$(INTDIR)\ares_process.obj" \
-	"$(INTDIR)\ares_query.obj" \
-	"$(INTDIR)\ares_search.obj" \
-	"$(INTDIR)\ares_send.obj" \
-	"$(INTDIR)\ares_strerror.obj" \
-	"$(INTDIR)\ares_timeout.obj" \
-	"$(INTDIR)\windows_port.obj"
-
-"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "areslib - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\areslib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\ares__close_sockets.obj"
-	-@erase "$(INTDIR)\ares__get_hostent.obj"
-	-@erase "$(INTDIR)\ares__read_line.obj"
-	-@erase "$(INTDIR)\ares_destroy.obj"
-	-@erase "$(INTDIR)\ares_expand_name.obj"
-	-@erase "$(INTDIR)\ares_fds.obj"
-	-@erase "$(INTDIR)\ares_free_errmem.obj"
-	-@erase "$(INTDIR)\ares_free_hostent.obj"
-	-@erase "$(INTDIR)\ares_free_string.obj"
-	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
-	-@erase "$(INTDIR)\ares_gethostbyname.obj"
-	-@erase "$(INTDIR)\ares_init.obj"
-	-@erase "$(INTDIR)\ares_mkquery.obj"
-	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
-	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
-	-@erase "$(INTDIR)\ares_process.obj"
-	-@erase "$(INTDIR)\ares_query.obj"
-	-@erase "$(INTDIR)\ares_search.obj"
-	-@erase "$(INTDIR)\ares_send.obj"
-	-@erase "$(INTDIR)\ares_strerror.obj"
-	-@erase "$(INTDIR)\ares_timeout.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\windows_port.obj"
-	-@erase "$(OUTDIR)\areslib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\ares__close_sockets.obj" \
-	"$(INTDIR)\ares__get_hostent.obj" \
-	"$(INTDIR)\ares__read_line.obj" \
-	"$(INTDIR)\ares_destroy.obj" \
-	"$(INTDIR)\ares_expand_name.obj" \
-	"$(INTDIR)\ares_fds.obj" \
-	"$(INTDIR)\ares_free_errmem.obj" \
-	"$(INTDIR)\ares_free_hostent.obj" \
-	"$(INTDIR)\ares_free_string.obj" \
-	"$(INTDIR)\ares_gethostbyaddr.obj" \
-	"$(INTDIR)\ares_gethostbyname.obj" \
-	"$(INTDIR)\ares_init.obj" \
-	"$(INTDIR)\ares_mkquery.obj" \
-	"$(INTDIR)\ares_parse_a_reply.obj" \
-	"$(INTDIR)\ares_parse_ptr_reply.obj" \
-	"$(INTDIR)\ares_process.obj" \
-	"$(INTDIR)\ares_query.obj" \
-	"$(INTDIR)\ares_search.obj" \
-	"$(INTDIR)\ares_send.obj" \
-	"$(INTDIR)\ares_strerror.obj" \
-	"$(INTDIR)\ares_timeout.obj" \
-	"$(INTDIR)\windows_port.obj"
-
-"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("areslib.dep")
-!INCLUDE "areslib.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "areslib.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "areslib - Win32 Release" || "$(CFG)" == "areslib - Win32 Debug"
-SOURCE=..\..\ares__close_sockets.c
-
-"$(INTDIR)\ares__close_sockets.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares__get_hostent.c
-
-"$(INTDIR)\ares__get_hostent.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares__read_line.c
-
-"$(INTDIR)\ares__read_line.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_destroy.c
-
-"$(INTDIR)\ares_destroy.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_expand_name.c
-
-"$(INTDIR)\ares_expand_name.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_fds.c
-
-"$(INTDIR)\ares_fds.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_free_errmem.c
-
-"$(INTDIR)\ares_free_errmem.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_free_hostent.c
-
-"$(INTDIR)\ares_free_hostent.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_free_string.c
-
-"$(INTDIR)\ares_free_string.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_gethostbyaddr.c
-
-"$(INTDIR)\ares_gethostbyaddr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_gethostbyname.c
-
-"$(INTDIR)\ares_gethostbyname.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_init.c
-
-"$(INTDIR)\ares_init.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_mkquery.c
-
-"$(INTDIR)\ares_mkquery.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_parse_a_reply.c
-
-"$(INTDIR)\ares_parse_a_reply.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_parse_ptr_reply.c
-
-"$(INTDIR)\ares_parse_ptr_reply.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_process.c
-
-"$(INTDIR)\ares_process.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_query.c
-
-"$(INTDIR)\ares_query.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_search.c
-
-"$(INTDIR)\ares_search.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_send.c
-
-"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_strerror.c
-
-"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\ares_timeout.c
-
-"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\windows_port.c
-
-"$(INTDIR)\windows_port.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on areslib.dsp
+!IF "$(CFG)" == ""
+CFG=areslib - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to areslib - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "areslib - Win32 Release" && "$(CFG)" != "areslib - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "areslib.mak" CFG="areslib - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "areslib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "areslib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "areslib - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\areslib.lib"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\ares__close_sockets.obj"
+	-@erase "$(INTDIR)\ares__get_hostent.obj"
+	-@erase "$(INTDIR)\ares__read_line.obj"
+	-@erase "$(INTDIR)\ares_destroy.obj"
+	-@erase "$(INTDIR)\ares_expand_name.obj"
+	-@erase "$(INTDIR)\ares_fds.obj"
+	-@erase "$(INTDIR)\ares_free_hostent.obj"
+	-@erase "$(INTDIR)\ares_free_string.obj"
+	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
+	-@erase "$(INTDIR)\ares_gethostbyname.obj"
+	-@erase "$(INTDIR)\ares_init.obj"
+	-@erase "$(INTDIR)\ares_mkquery.obj"
+	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
+	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
+	-@erase "$(INTDIR)\ares_process.obj"
+	-@erase "$(INTDIR)\ares_query.obj"
+	-@erase "$(INTDIR)\ares_search.obj"
+	-@erase "$(INTDIR)\ares_send.obj"
+	-@erase "$(INTDIR)\ares_strerror.obj"
+	-@erase "$(INTDIR)\ares_timeout.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\windows_port.obj"
+	-@erase "$(OUTDIR)\areslib.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib"
+LIB32_OBJS= \
+	"$(INTDIR)\ares__close_sockets.obj" \
+	"$(INTDIR)\ares__get_hostent.obj" \
+	"$(INTDIR)\ares__read_line.obj" \
+	"$(INTDIR)\ares_destroy.obj" \
+	"$(INTDIR)\ares_expand_name.obj" \
+	"$(INTDIR)\ares_fds.obj" \
+	"$(INTDIR)\ares_free_hostent.obj" \
+	"$(INTDIR)\ares_free_string.obj" \
+	"$(INTDIR)\ares_gethostbyaddr.obj" \
+	"$(INTDIR)\ares_gethostbyname.obj" \
+	"$(INTDIR)\ares_init.obj" \
+	"$(INTDIR)\ares_mkquery.obj" \
+	"$(INTDIR)\ares_parse_a_reply.obj" \
+	"$(INTDIR)\ares_parse_ptr_reply.obj" \
+	"$(INTDIR)\ares_process.obj" \
+	"$(INTDIR)\ares_query.obj" \
+	"$(INTDIR)\ares_search.obj" \
+	"$(INTDIR)\ares_send.obj" \
+	"$(INTDIR)\ares_strerror.obj" \
+	"$(INTDIR)\ares_timeout.obj" \
+	"$(INTDIR)\windows_port.obj"
+
+"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "areslib - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\areslib.lib"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\ares__close_sockets.obj"
+	-@erase "$(INTDIR)\ares__get_hostent.obj"
+	-@erase "$(INTDIR)\ares__read_line.obj"
+	-@erase "$(INTDIR)\ares_destroy.obj"
+	-@erase "$(INTDIR)\ares_expand_name.obj"
+	-@erase "$(INTDIR)\ares_fds.obj"
+	-@erase "$(INTDIR)\ares_free_hostent.obj"
+	-@erase "$(INTDIR)\ares_free_string.obj"
+	-@erase "$(INTDIR)\ares_gethostbyaddr.obj"
+	-@erase "$(INTDIR)\ares_gethostbyname.obj"
+	-@erase "$(INTDIR)\ares_init.obj"
+	-@erase "$(INTDIR)\ares_mkquery.obj"
+	-@erase "$(INTDIR)\ares_parse_a_reply.obj"
+	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"
+	-@erase "$(INTDIR)\ares_process.obj"
+	-@erase "$(INTDIR)\ares_query.obj"
+	-@erase "$(INTDIR)\ares_search.obj"
+	-@erase "$(INTDIR)\ares_send.obj"
+	-@erase "$(INTDIR)\ares_strerror.obj"
+	-@erase "$(INTDIR)\ares_timeout.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\windows_port.obj"
+	-@erase "$(OUTDIR)\areslib.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\areslib.lib"
+LIB32_OBJS= \
+	"$(INTDIR)\ares__close_sockets.obj" \
+	"$(INTDIR)\ares__get_hostent.obj" \
+	"$(INTDIR)\ares__read_line.obj" \
+	"$(INTDIR)\ares_destroy.obj" \
+	"$(INTDIR)\ares_expand_name.obj" \
+	"$(INTDIR)\ares_fds.obj" \
+	"$(INTDIR)\ares_free_hostent.obj" \
+	"$(INTDIR)\ares_free_string.obj" \
+	"$(INTDIR)\ares_gethostbyaddr.obj" \
+	"$(INTDIR)\ares_gethostbyname.obj" \
+	"$(INTDIR)\ares_init.obj" \
+	"$(INTDIR)\ares_mkquery.obj" \
+	"$(INTDIR)\ares_parse_a_reply.obj" \
+	"$(INTDIR)\ares_parse_ptr_reply.obj" \
+	"$(INTDIR)\ares_process.obj" \
+	"$(INTDIR)\ares_query.obj" \
+	"$(INTDIR)\ares_search.obj" \
+	"$(INTDIR)\ares_send.obj" \
+	"$(INTDIR)\ares_strerror.obj" \
+	"$(INTDIR)\ares_timeout.obj" \
+	"$(INTDIR)\windows_port.obj"
+
+"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("areslib.dep")
+!INCLUDE "areslib.dep"
+!ELSE
+!MESSAGE Warning: cannot find "areslib.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "areslib - Win32 Release" || "$(CFG)" == "areslib - Win32 Debug"
+SOURCE=..\..\ares__close_sockets.c
+
+"$(INTDIR)\ares__close_sockets.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares__get_hostent.c
+
+"$(INTDIR)\ares__get_hostent.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares__read_line.c
+
+"$(INTDIR)\ares__read_line.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_destroy.c
+
+"$(INTDIR)\ares_destroy.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_expand_name.c
+
+"$(INTDIR)\ares_expand_name.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_fds.c
+
+"$(INTDIR)\ares_fds.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_free_hostent.c
+
+"$(INTDIR)\ares_free_hostent.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_free_string.c
+
+"$(INTDIR)\ares_free_string.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_gethostbyaddr.c
+
+"$(INTDIR)\ares_gethostbyaddr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_gethostbyname.c
+
+"$(INTDIR)\ares_gethostbyname.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_init.c
+
+"$(INTDIR)\ares_init.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_mkquery.c
+
+"$(INTDIR)\ares_mkquery.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_parse_a_reply.c
+
+"$(INTDIR)\ares_parse_a_reply.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_parse_ptr_reply.c
+
+"$(INTDIR)\ares_parse_ptr_reply.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_process.c
+
+"$(INTDIR)\ares_process.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_query.c
+
+"$(INTDIR)\ares_query.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_search.c
+
+"$(INTDIR)\ares_search.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_send.c
+
+"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_strerror.c
+
+"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\ares_timeout.c
+
+"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\windows_port.c
+
+"$(INTDIR)\windows_port.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+
+!ENDIF
+

ares/windows_port.c

@@ -1,15 +1,28 @@
+#include "setup.h"
+
+/* only do the following on windows
+ */
+#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <errno.h>
+#include <malloc.h>
 
+#ifdef WATT32
+#include <sys/socket.h>
+#else
 #include "nameser.h"
+#endif
+#include "ares.h"
+#include "ares_private.h"
 
 #ifndef __MINGW32__
 int
-ares_strncasecmp(const char *a, const char *b, size_t n)
+ares_strncasecmp(const char *a, const char *b, int n)
 {
-    size_t i;
+    int i;
 
     for (i = 0; i < n; i++) {
         int c1 = isupper(a[i]) ? tolower(a[i]) : a[i];
@@ -26,8 +39,8 @@ ares_strcasecmp(const char *a, const char *b)
 }
 #endif
 
-int 
-ares_gettimeofday(struct timeval *tv, struct timezone *tz) 
+int
+ares_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
     FILETIME        ft;
     LARGE_INTEGER   li;
@@ -40,24 +53,47 @@ ares_gettimeofday(struct timeval *tv, struct timezone *tz)
         li.LowPart  = ft.dwLowDateTime;
         li.HighPart = ft.dwHighDateTime;
         t  = li.QuadPart;       /* In 100-nanosecond intervals */
-        //t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+#if 0
+        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+#endif
         t /= 10;                /* In microseconds */
         tv->tv_sec  = (long)(t / 1000000);
         tv->tv_usec = (long)(t % 1000000);
     }
 
-#if 0
-    if (tz)
-    {
-        if (!tzflag)
-        {
-            _tzset();
-            tzflag++;
-        }
-        tz->tz_minuteswest = _timezone / 60;
-        tz->tz_dsttime = _daylight;
-    }
-#endif
-
     return 0;
 }
+
+int
+ares_writev (ares_socket_t s, const struct iovec *vector, size_t count)
+{
+  char *buffer, *bp;
+  size_t i, bytes = 0;
+
+  /* Find the total number of bytes to write
+   */
+  for (i = 0; i < count; i++)
+      bytes += vector[i].iov_len;
+
+  if (bytes == 0)   /* not an error */
+     return (0);
+
+  /* Allocate a temporary buffer to hold the data
+   */
+  buffer = bp = (char*) alloca (bytes);
+  if (!buffer)
+  {
+    errno = ENOMEM;
+    return (-1);
+  }
+
+  /* Copy the data into buffer.
+   */
+  for (i = 0; i < count; ++i)
+  {
+    memcpy (bp, vector[i].iov_base, vector[i].iov_len);
+    bp += vector[i].iov_len;
+  }
+  return send (s, (const void*)buffer, bytes, 0);
+}
+#endif /* WIN32 builds only */

buildconf

@@ -101,6 +101,10 @@ libtool=`findtool glibtool 2>/dev/null`
 if test ! -x "$libtool"; then
   libtool=`findtool libtool`
 fi
+
+# set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
+LIBTOOLIZE="${libtool}ize"
+
 lt_pversion=`$libtool --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
 if test -z "$lt_pversion"; then
   echo "buildconf: libtool not found."

buildconf.bat

@@ -7,9 +7,6 @@ REM create ca-bundle.h
 echo /* This file is generated automatically */ >lib\ca-bundle.h
 echo #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") >>lib\ca-bundle.h
 
-REM create getdate.c
-copy lib\getdate.c.cvs lib\getdate.c
-
 REM create hugehelp.c
 copy src\hugehelp.c.cvs src\hugehelp.c
 

configure.ac

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
 
 dnl We don't know the version number "staticly" so we use a dash here
-AC_INIT(curl, [-], [curl-bug@haxx.se])
+AC_INIT(curl, [-], [a suitable curl mailing list => http://curl.haxx.se/mail/])
 
 dnl configure script copyright
 AC_COPYRIGHT([Copyright (c) 1998 - 2004 Daniel Stenberg, <daniel@haxx.se>
@@ -87,7 +87,7 @@ dnl check for cygwin stuff
 AC_LIBTOOL_WIN32_DLL
 
 dnl libtool setup
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 AC_MSG_CHECKING([if we need -no-undefined])
 case $host in
@@ -102,6 +102,7 @@ AC_MSG_RESULT($need_no_undefined)
 AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
 
 AC_MSG_CHECKING([if we need -mimpure-text])
+mimpure=no
 case $host in
   *-*-solaris2*)
     if test "$GCC" = "yes"; then
@@ -109,7 +110,6 @@ case $host in
     fi
     ;;
   *)
-    mimpure=no
     ;;
 esac
 AC_MSG_RESULT($mimpure)
@@ -287,7 +287,7 @@ then
   AC_TRY_LINK( ,
              [gethostbyname();],
              [ dnl found it!
-             HAVE_GETHOSTBYNAME="1",
+             HAVE_GETHOSTBYNAME="1"
              AC_MSG_RESULT([yes])],
              [ dnl failed!
              AC_MSG_RESULT([no])
@@ -560,7 +560,7 @@ then
       AC_CHECK_HEADERS(krb.h)
 
       dnl we found the required libraries, add to LIBS
-      LIBS="-lkrb -ldes $LIBS"
+      LIBS="-lkrb -lcom_err -ldes $LIBS"
 
       dnl Check for function krb_get_our_ip_for_realm
       dnl this is needed for NAT networks
@@ -707,45 +707,53 @@ else
   CLEANCPPFLAGS="$CPPFLAGS"
   CLEANLIBS="$LIBS"
 
-  dnl Detect the pkg-config tool, as it may have extra info about the openssl
-  dnl installation we can use. I *believe* this is what we are expected to do
-  dnl on really recent Redhat Linux hosts.
-
-  AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
-  if test "$PKGCONFIG" != "no" ; then
-    AC_MSG_CHECKING([OpenSSL options with pkg-config])
-
-    $PKGCONFIG --exists openssl
-    SSL_EXISTS=$?
-
-    if test "$SSL_EXISTS" -eq "0"; then
-      SSL_LIBS=`$PKGCONFIG --libs-only-l openssl 2>/dev/null`
-      SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null`
-      SSL_CPPFLAGS=`$PKGCONFIG --cflags-only-I openssl 2>/dev/null`
-
-      dnl use the values pkg-config reported
-      LIBS="$LIBS $SSL_LIBS"
-      CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
-      LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
-      AC_MSG_RESULT([found])
-    else
-      AC_MSG_RESULT([no])
-    fi
-  fi
-
   case "$OPT_SSL" in
   yes)
+    dnl --with-ssl (without path) used
+    PKGTEST="yes"
     EXTRA_SSL=/usr/local/ssl ;;
   off)
+    dnl no --with-ssl option given, just check default places
+    PKGTEST="yes"
     EXTRA_SSL= ;;
   *)
-    dnl check the given spot right away!
+    dnl check the given --with-ssl spot
+    PKGTEST="no"
     EXTRA_SSL=$OPT_SSL
     LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
     CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
     ;;
   esac
 
+  if test "$PKGTEST" = "yes"; then
+
+    dnl Detect the pkg-config tool, as it may have extra info about the
+    dnl openssl installation we can use. I *believe* this is what we are
+    dnl expected to do on really recent Redhat Linux hosts.
+
+    AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
+    if test "$PKGCONFIG" != "no" ; then
+      AC_MSG_CHECKING([OpenSSL options with pkg-config])
+
+      $PKGCONFIG --exists openssl
+      SSL_EXISTS=$?
+
+      if test "$SSL_EXISTS" -eq "0"; then
+        SSL_LIBS=`$PKGCONFIG --libs-only-l openssl 2>/dev/null`
+        SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null`
+        SSL_CPPFLAGS=`$PKGCONFIG --cflags-only-I openssl 2>/dev/null`
+
+        dnl use the values pkg-config reported
+        LIBS="$LIBS $SSL_LIBS"
+        CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
+        LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
+        AC_MSG_RESULT([found])
+      else
+        AC_MSG_RESULT([no])
+      fi
+    fi
+  fi
+
   AC_CHECK_LIB(crypto, CRYPTO_lock,[
      HAVECRYPTO="yes"
      ],[
@@ -945,26 +953,31 @@ case "$LIBIDN" in
        AC_MSG_RESULT(no)
        ;;
   *)   AC_MSG_RESULT(yes)
-       AC_CHECK_LIB(idn, idna_to_ascii_lz, ,
-                    [
-                    dnl if there was a given path, try it
-                    nolibidn="true"
-                    if test "x$LIBIDN" != "xyes"; then
-                      nolibidn="" dnl reset to test again
-                      oldLDFLAGS=$LDFLAGS
-                      oldCPPFLAGS=$CPPFLAGS
-                      LDFLAGS="$LDFLAGS -L$LIBIDN/lib"
-                      CPPFLAGS="$CPPFLAGS -I$LIBIDN/include"
-                      AC_CHECK_LIB(idn, idna_to_ascii_4i, ,
-                                   nolibidn="true"
-                                   LDFLAGS=$oldLDFLAGS
-                                   CPPFLAGS=$oldCPPFLAGS)
-                    fi
-                    ])
-       if test "x$nolibidn" != "xtrue"; then
+
+       idn=""
+       dnl if there is a given path, check that FIRST
+       if test "x$LIBIDN" != "xyes"; then
+          oldLDFLAGS=$LDFLAGS
+          oldCPPFLAGS=$CPPFLAGS
+          LDFLAGS="$LDFLAGS -L$LIBIDN/lib"
+          CPPFLAGS="$CPPFLAGS -I$LIBIDN/include"
+          idn="yes"
+          AC_CHECK_LIB(idn, idna_to_ascii_4i, ,
+                       idn=""
+                       LDFLAGS=$oldLDFLAGS
+                       CPPFLAGS=$oldCPPFLAGS)
+       fi
+
+       if test "x$idn" != "xyes"; then
+          dnl check with default paths
+          AC_CHECK_LIB(idn, idna_to_ascii_lz, ,
+                       idn="")
+       fi
+
+       if test "x$idn" = "xyes"; then
          curl_idn_msg="enabled"
          dnl different versions of libidn have different setups of these:
-         AC_CHECK_FUNCS( idn_free )
+         AC_CHECK_FUNCS( idn_free idna_strerror tld_strerror)
          AC_CHECK_HEADERS( idn-free.h )
        fi
                     
@@ -1014,7 +1027,7 @@ else
     CURL_CHECK_GETHOSTBYNAME_R()
 
     dnl dig around for gethostbyaddr_r()
-    CURL_CHECK_GETHOSTBYADDR_R()
+    dnl CURL_CHECK_GETHOSTBYADDR_R()
   fi
 
   dnl poke around for inet_ntoa_r()
@@ -1038,6 +1051,24 @@ dnl http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/ \
 dnl genprogc/thread_quick_ref.htm
 
 if test "x$RECENTAIX" = "xyes"; then
+
+  AC_DEFINE(_THREAD_SAFE, 1, [define this if you need it to compile thread-safe code])
+
+  dnl check if this is the IMB xlc compiler
+  dnl Details thanks to => http://predef.sourceforge.net/
+  AC_MSG_CHECKING([if this is the xlc compiler])
+  AC_EGREP_CPP([^__xlC__], [__xlC__],
+         dnl action if the text is found, this it has not been replaced by the
+         dnl cpp
+         XLC="no"
+         AC_MSG_RESULT([no]),
+         dnl the text was not found, it was replaced by the cpp
+         XLC="yes"
+         AC_MSG_RESULT([yes])
+         CFLAGS="$CFLAGS -qthreaded"
+       )
+
+
   dnl is there a localtime_r()
   CURL_CHECK_LOCALTIME_R()
 
@@ -1089,6 +1120,7 @@ AC_CHECK_HEADERS(
         utime.h \
         sys/utime.h \
         sys/poll.h \
+        libgen.h \
         setjmp.h,
 dnl to do if not found
 [],
@@ -1124,9 +1156,22 @@ AC_CHECK_SIZEOF(curl_off_t, ,[
 #include "$srcdir/include/curl/curl.h"
 ])
 AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(long)
 
 AC_CHECK_TYPE(long long,
-   [AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports 'long long'])])
+   [AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports long long])]
+   longlong="yes"  
+)
+
+if test "xyes" = "x$longlong"; then
+  AC_MSG_CHECKING([if numberLL works])
+  AC_COMPILE_IFELSE([long long val = 1000LL;],
+   [AC_DEFINE(HAVE_LL, 1, [if your compiler supports LL])]
+   AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no)
+  )
+fi
+
 
 # check for ssize_t
 AC_CHECK_TYPE(ssize_t, ,
@@ -1171,6 +1216,7 @@ AC_CHECK_FUNCS( strtoll \
                 dlopen \
                 utime \
                 sigsetjmp \
+                basename \
                 poll,
 dnl if found
 [],
@@ -1201,6 +1247,41 @@ if test "$ac_cv_func_sigsetjmp" != "yes"; then
                )
 fi
 
+AC_CHECK_DECL(basename, ,
+              AC_DEFINE(NEED_BASENAME_PROTO, 1, [If you lack a fine basename() prototype]),
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif
+)
+
+dnl poll() might be badly emulated, as in Mac OS X 10.3 (and other BSDs?) and
+dnl to find out we make an extra check here!
+if test "$ac_cv_func_poll" = "yes"; then
+  AC_MSG_CHECKING([if poll works with NULL inputs])
+  AC_RUN_IFELSE([
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
+
+  int main(void)
+  {
+    /* make this return 0 == timeout since there's nothing to read from */
+    return poll((void *)0, 0, 10 /*ms*/);
+  }
+],
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_POLL_FINE, 1, [If you have a fine poll]),
+  AC_MSG_RESULT(no),
+  AC_MSG_RESULT(cross-compiling assumes yes)
+  AC_DEFINE(HAVE_POLL_FINE, 1, [If you have a fine poll])
+  ) dnl end of AC_RUN_IFELSE
+fi
+
+
+
 AC_PATH_PROG( PERL, perl, , 
   $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
 AC_SUBST(PERL)
@@ -1239,22 +1320,6 @@ then
   USE_MANUAL="no";
 fi
 
-AC_PROG_YACC
-
-if test -z "$YACC"
-then
-  AC_MSG_CHECKING([if OK to build without bison/yacc])
-  dnl no yacc is a big deal if we have no pre-fixed getdate.y
-  if test -r "$srcdir/lib/getdate.c"
-  then
-    dnl all is well, we don't have to generate it!
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([no yacc or bison found, can't build libcurl!])
-  fi
-fi
-
 dnl *************************************************************************
 dnl If the manual variable still is set, then we go with providing a built-in
 dnl manual
@@ -1365,6 +1430,8 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
        AC_MSG_RESULT(no)
 )
 
+AM_CONDITIONAL(CROSSCOMPILING, test x$cross_compiling = xyes)
+
 AC_CONFIG_FILES([Makefile \
 	   docs/Makefile \
            docs/examples/Makefile \

curl-style.el

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

docs/BINDINGS

@@ -1,7 +1,7 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
                                libcurl bindings
@@ -17,22 +17,27 @@ archives, but must be downloaded and installed separately.
 
 Ada95
 
-  Writtten by Andreas Almroth.
+  Writtten by Andreas Almroth
   http://www.almroth.com/adacurl/index.html
 
 Basic
 
-  ScriptBasic bindings to libcurl. Writtten by Peter Verhas.
+  ScriptBasic bindings to libcurl. Writtten by Peter Verhas
   http://scriptbasic.com/
 
 C++
 
-  Written by Jean-Philippe Barrette-LaPierre.
+  Written by Jean-Philippe Barrette-LaPierre
   http://www.sourceforge.net/projects/curlpp
 
+Ch
+
+  Written by Stephen Nestinger and Jonathan Rogado
+  http://chcurl.sourceforge.net/
+
 Cocoa
 
-  Written by Dan Wood.
+  Written by Dan Wood
   http://curlhandle.sourceforge.net/
 
 D
@@ -42,25 +47,33 @@ D
 
 Dylan
 
-  Written by Chris Double.
+  Written by Chris Double
   http://dylanlibs.sourceforge.net/
 
 Euphoria
 
-  Written by Ray Smith.
+  Written by Ray Smith
   http://rays-web.com/eulibcurl.htm
 
 Ferite
+  Written by Paul Querna
   http://www.ferite.org/
 
+Gambas
+  http://gambas.sourceforge.net
+
+glib/GTK+
+  Written by Richard Atterer
+  http://atterer.net/glibcurl/
+
 Java
 
-  Written by Daniel Stenberg.
+  Written by Daniel Stenberg
   http://curl.haxx.se/libcurl/java/
 
 Lua
 
-  Written by Steve Dekorte.
+  Written by Steve Dekorte
   http://curl.haxx.se/libcurl/lua/
 
 Object-Pascal
@@ -70,7 +83,7 @@ Object-Pascal
 
 O'Caml
 
-  Written by Lars Nilsson.
+  Written by Lars Nilsson
   http://sourceforge.net/projects/ocurl/
 
 Pascal
@@ -80,40 +93,49 @@ Pascal
 
 Perl
 
-  Maintained by Cris Bailiff.
+  Maintained by Cris Bailiff
   http://curl.haxx.se/libcurl/perl/
 
 PHP
 
-  Written by Sterling Hughes.
+  Written by Sterling Hughes
   http://curl.haxx.se/libcurl/php/
 
 PostgreSQL
 
-  Written by Gian Paolo Ciceri.
+  Written by Gian Paolo Ciceri
   http://gborg.postgresql.org/project/pgcurl/projdisplay.php
 
 Python
 
-  Written by Kjetil Jacobsen.
+  Written by Kjetil Jacobsen
   http://pycurl.sourceforge.net/
 
 Rexx
 
-  Written Mark Hessling. 
+  Written Mark Hessling
   http://rexxcurl.sourceforge.net/
 
 Ruby
 
-  Written by Hirotaka Matsuyuki. 
+  Written by Hirotaka Matsuyuki
   http://www.d1.dion.ne.jp/~matuyuki/ruby.html
 
 Scheme
 
-  Bigloo binding written by Kirill Lisovsky.
+  Bigloo binding written by Kirill Lisovsky
   http://curl.haxx.se/libcurl/scheme/
 
 Tcl
 
-  Written by Andr<64>s Garc<72>a. 
+  Written by Andr<64>s Garc<72>a
   http://personal1.iddeo.es/andresgarci/tclcurl/english/docs.html
+
+Q
+
+  http://q-lang.sourceforge.net/
+
+wxWidgets
+
+  Written by Casey O'Donnell
+  http://homepage.mac.com/codonnell/wxcurldav/

docs/CONTRIBUTE

@@ -1,7 +1,7 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
 To Think About When Contributing Source Code
@@ -138,15 +138,15 @@ How To Make a Patch
 
  If you have modified a single file, try something like:
 
-     diff -u undmodified-file.c my-changed-one.c > my-fixes.diff
+     diff -u unmodified-file.c my-changed-one.c > my-fixes.diff
 
  If you have modified several files, possibly in different directories, you
  can use diff recursively:
 
-     diff -ur curl-original-dir curl-modfied-sources-dir > my-fixes.diff
+     diff -ur curl-original-dir curl-modified-sources-dir > my-fixes.diff
 
  The GNU diff and GNU patch tools exist for virtually all platforms, including
- all kinds of unixes and Windows:
+ all kinds of Unixes and Windows:
 
  For unix-like operating systems:
 

docs/FAQ

@@ -1,4 +1,4 @@
-Updated: March 16, 2004 (http://curl.haxx.se/docs/faq.html)
+Updated: August 18, 2004 (http://curl.haxx.se/docs/faq.html)
                                   _   _ ____  _
                               ___| | | |  _ \| |
                              / __| | | | |_) | |
@@ -10,20 +10,20 @@ FAQ
  1. Philosophy
   1.1 What is cURL?
   1.2 What is libcurl?
-  1.3 What is cURL not?
+  1.3 What is curl not?
   1.4 When will you make curl do XXXX ?
-  1.5 Who makes cURL?
-  1.6 What do you get for making cURL?
+  1.5 Who makes curl?
+  1.6 What do you get for making curl?
   1.7 What about CURL from curl.com?
   1.8 I have a problem who do I mail?
 
  2. Install Related Problems
   2.1 configure doesn't find OpenSSL even when it is installed
-   2.1.1. native linker doesn't find OpenSSL
-   2.1.2. only the libssl lib is missing
+   2.1.1 native linker doesn't find OpenSSL
+   2.1.2 only the libssl lib is missing
   2.2 Does curl work/build with other SSL libraries?
   2.3 Where can I find a copy of LIBEAY32.DLL?
-  2.4 Does cURL support Socks (RFC 1928) ?
+  2.4 Does curl support Socks (RFC 1928) ?
 
  3. Usage Problems
   3.1 curl: (1) SSL is disabled, https: not supported
@@ -41,6 +41,7 @@ FAQ
   3.13 Why does my single/double quotes fail?
   3.14 Does curl support javascript or pac (automated proxy config)?
   3.15 Can I do recursive fetches with curl?
+  3.16 What certificates do I need when I use SSL?
 
  4. Running Problems
   4.1 Problems connecting to SSL servers.
@@ -70,6 +71,8 @@ FAQ
   5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ?
   5.6 What about Keep-Alive or persistent connections?
   5.7 Link errors when building libcurl on Windows!
+  5.8 libcurl.so.3: open failed: No such file or directory
+  5.9 How does libcurl resolve host names?
 
  6. License Issues
   6.1 I have a GPL program, can I use the libcurl library?
@@ -79,24 +82,50 @@ FAQ
   6.5 Can I modify curl/libcurl for my program and keep the changes secret?
   6.6 Can you please change the curl/libcurl license to XXXX?
 
+ 7. PHP/CURL Issues
+  7.1 What is PHP/CURL?
+  7.2 Who write PHP/CURL?
+  7.3 Can I perform multiple requests using the same handle?
+
 ==============================================================================
 
 1. Philosophy
 
   1.1 What is cURL?
 
-  cURL (or simply just 'curl') is a command line tool for getting or sending
-  files using URL syntax. The name is a play on 'Client for URLs', originally
-  with URL spelled in uppercase to make it obvious it deals with URLs. The
-  fact it can also be pronounced 'see URL' also helped, it works as an
-  abbrivation for "Client URL Request Library" or why not the recursive
+  cURL is the name of the project. The name is a play on 'Client for URLs',
+  originally with URL spelled in uppercase to make it obvious it deals with
+  URLs. The fact it can also be pronounced 'see URL' also helped, it works as
+  an abbrivation for "Client URL Request Library" or why not the recursive
   version: "Curl URL Request Library".
 
-  Curl supports a range of common Internet protocols, currently including
-  HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and FILE.
+  The cURL project produces two products:
 
-  We spell it cURL or just curl. We pronounce it with an initial k sound:
-  [kurl].
+  libcurl
+
+    A free and easy-to-use client-side URL transfer library, supporting FTP,
+    FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP.  libcurl supports
+    HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP
+    form based upload, proxies, cookies, user+password authentication, file
+    transfer resume, http proxy tunneling and more!
+
+    libcurl is highly portable, it builds and works identically on numerous
+    platforms, including Solaris, NetBSD, FreeBSD, OpenBSD, Darwin, HPUX,
+    IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, BeOs, Mac
+    OS X, Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS and more...
+
+    libcurl is free, thread-safe, IPv6 compatible, feature rich, well
+    supported and fast.
+    
+  curl
+
+    A command line tool for getting or sending files using URL syntax.
+
+    Since curl uses libcurl, it supports a range of common Internet protocols,
+    currently including HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and
+    FILE.
+
+  We pronounce curl and cURL with an initial k sound: [kurl].
 
   NOTE: there are numerous sub-projects and related projects that also use the
   word curl in the project names in various combinations, but you should take
@@ -112,7 +141,7 @@ FAQ
   You can use libcurl for free in your application, be it open source,
   commercial or closed-source.
 
-  1.3 What is cURL not?
+  1.3 What is curl not?
 
   Curl is *not* a wget clone. That is a common misconception.  Never, during
   curl's development, have we intended curl to replace wget or compete on its
@@ -127,7 +156,7 @@ FAQ
   script (or write a new program that interfaces libcurl) and do it.
 
   Curl is not a PHP tool, even though it works perfectly well when used from
-  or with PHP.
+  or with PHP (when using the PHP/CURL module).
 
   Curl is not a single-OS program. Curl exists, compiles, builds and runs
   under a wide range of operating systems, including all modern Unixes (and a
@@ -161,9 +190,9 @@ FAQ
   * If you write the code, chances are bigger that it will get into curl
     faster.
 
-  1.5 Who makes cURL?
+  1.5 Who makes curl?
 
-  cURL and libcurl are not made by any single individual. Sure, Daniel
+  curl and libcurl are not made by any single individual. Sure, Daniel
   Stenberg writes the major parts, but other persons' submissions are
   important and crucial. Anyone can contribute and post their changes and
   improvements and have them inserted in the main sources (of course on the
@@ -175,14 +204,16 @@ FAQ
 
   curl is developed by a community, with Daniel at the wheel.
 
-  1.6 What do you get for making cURL?
+  1.6 What do you get for making curl?
 
   Project cURL is entirely free and open. No person gets paid for developing
-  curl. We do this voluntarily on our spare time.
+  (lib)curl. We do this voluntarily on our spare time.
 
   We get some help from companies. Contactor Data hosts the curl web site,
   Haxx owns the curl web site's domain and sourceforge.net hosts project
-  services we take advantage from, like the bug tracker.
+  services we take advantage from, like the bug tracker. Also, some companies
+  have sponsored certain parts of the development in the past and I hope some
+  will continue to do so in the future.
 
   If you want to support our project with a donation or similar, one way of
   doing that would be to buy "gift certificates" at useful online shopping
@@ -223,11 +254,11 @@ FAQ
 
 2. Install Related Problems
 
-  2.1. configure doesn't find OpenSSL even when it is installed
+  2.1 configure doesn't find OpenSSL even when it is installed
 
   This may be because of several reasons.
 
-    2.1.1. native linker doesn't find openssl
+    2.1.1 native linker doesn't find openssl
 
     Affected platforms:
       Solaris (native cc compiler)
@@ -249,7 +280,7 @@ FAQ
 
     Solution submitted by: Bob Allison <allisonb@users.sourceforge.net>
 
-    2.1.2. only the libssl lib is missing
+    2.1.2 only the libssl lib is missing
 
     If all include files and the libcrypto lib is present, with only the
     libssl being missing according to configure, this is mostly likely because
@@ -262,14 +293,14 @@ FAQ
     configure. Make sure that you remove the config.cache file before you
     rerun configure with the new flags.
 
-  2.2. Does curl work/build with other SSL libraries?
+  2.2 Does curl work/build with other SSL libraries?
 
   Curl has been written to use OpenSSL, although there should not be much
   problems using a different library. If anyone does "port" curl to use a
   different SSL library, we are of course very interested in getting the
   patch!
 
-  2.3. Where can I find a copy of LIBEAY32.DLL?
+  2.3 Where can I find a copy of LIBEAY32.DLL?
 
   That is an OpenSSL binary built for Windows.
 
@@ -278,14 +309,14 @@ FAQ
   accurate and up-to-date pointers to recent OpenSSL DLLs and other binary
   packages.
 
-  2.4. Does cURL support Socks (RFC 1928) ?
+  2.4 Does curl support Socks (RFC 1928) ?
 
-  Yes, SOCKS5 is supported when curl is built with IPv6 support disabled.
+  Yes, SOCKS5 is supported.
 
 
 3. Usage problems
 
-  3.1. curl: (1) SSL is disabled, https: not supported
+  3.1 curl: (1) SSL is disabled, https: not supported
 
   If you get this output when trying to get anything from a https:// server,
   it means that the configure script couldn't find all libs and include files
@@ -300,13 +331,13 @@ FAQ
   Also, check out the other paragraph in this FAQ labeled "configure doesn't
   find OpenSSL even when it is installed".
 
-  3.2. How do I tell curl to resume a transfer?
+  3.2 How do I tell curl to resume a transfer?
 
   Curl supports resumed transfers both ways on both FTP and HTTP.
 
   Try the -C option.
 
-  3.3. Why doesn't my posting using -F work?
+  3.3 Why doesn't my posting using -F work?
 
   You can't simply use -F or -d at your choice. The web server that will
   receive your post assumes one of the formats. If the form you're trying to
@@ -320,7 +351,7 @@ FAQ
   through the mailing list archives for old postings and questions regarding
   this.
 
-  3.4. How do I tell curl to run custom FTP commands?
+  3.4 How do I tell curl to run custom FTP commands?
 
   You can tell curl to perform optional commands both before and/or after a
   file transfer. Study the -Q/--quote option.
@@ -329,13 +360,13 @@ FAQ
   FTP commands without transferring anything. Therefore you must always specify
   a URL to transfer to/from even when doing custom FTP commands.
 
-  3.5. How can I disable the Pragma: nocache header?
+  3.5 How can I disable the Pragma: nocache header?
 
   You can change all internally generated headers by adding a replacement with
   the -H/--header option. By adding a header with empty contents you safely
   disable that one. Use -H "Pragma:" to disable that specific header.
 
-  3.6. Does curl support ASP, XML, XHTML or HTML version Y?
+  3.6 Does curl support ASP, XML, XHTML or HTML version Y?
 
   To curl, all contents are alike. It doesn't matter how the page was
   generated. It may be ASP, PHP, Perl, shell-script, SSI or plain
@@ -344,7 +375,7 @@ FAQ
 
   See also item 3.14 regarding javascript.
 
-  3.7. Can I use curl to delete/rename a file through FTP?
+  3.7 Can I use curl to delete/rename a file through FTP?
 
   Yes. You specify custom FTP commands with -Q/--quote.
 
@@ -369,8 +400,7 @@ FAQ
 
   Find out more about which languages that support curl directly, and how to
   install and use them, in the libcurl section of the curl web site:
-
-        http://curl.haxx.se/libcurl/
+  http://curl.haxx.se/libcurl/
 
   In February 2003, there are interfaces available for the following
   languages: Basic, C, C++, Cocoa, Dylan, Euphoria, Java, Lua, Object-Pascal,
@@ -443,28 +473,57 @@ FAQ
 
   Some work-arounds usually suggested to overcome this javascript dependency:
 
-    - Depending on the javascript complexity, write up a script that
-      translates it to another language and execute that.
+  - Depending on the javascript complexity, write up a script that
+    translates it to another language and execute that.
 
-    - Read the javascript code and rewrite the same logic in another language.
+  - Read the javascript code and rewrite the same logic in another language.
 
-    - Implement a javascript interpreter, people have successfully used the
-      Mozilla javascript engine in the past.
+  - Implement a javascript interpreter, people have successfully used the
+    Mozilla javascript engine in the past.
 
-    - Ask your admins to stop this, for a static proxy setup or similar.
+  - Ask your admins to stop this, for a static proxy setup or similar.
 
   3.15 Can I do recursive fetches with curl?
 
   No. curl itself has no code that performs recursive operations, such as
-  those performed by wget.
+  those performed by wget and similar tools.
 
   There exist wrapper scripts with that functionality (for example the
   curlmirror perl script), and you can write programs based on libcurl to do
   it, but the command line tool curl itself cannot.
 
+  3.16 What certificates do I need when I use SSL?
+
+  There are three different kinds of "certificates" to keep track of when we
+  talk about using SSL-based protocols (HTTPS or FTPS) using curl or libcurl.
+
+  - Client certificate. The server you communicate may require that you can
+    provide this in order to prove that you actually are who you claim to be.
+    If the server doesn't require this, you don't need a client certificate.
+
+  - Server certificate. The server you communicate with has a server
+    certificate. You can and should verify this certficate to make sure that
+    you are truly talking to the real server and not a server impersonating
+    it. The server certificate verifaction process is made by using a
+    Certificate Authority certificate ("CA cert") that was used to sign the
+    server certificate. Server certificate verification is enabled by default
+    in curl and libcurl and is often the reason for problems as explained in
+    FAQ entry 4.12 and the SSLCERTS document
+    (http://curl.haxx.se/docs/sslcerts.html). Server certificates that are
+    "self-signed" or otherwise signed by a CA that you do not have a CA cert
+    for, cannot be verified. If the verification during a connect fails, you
+    are refused access. You then need to explicitly disable the verification
+    to connect to the server.
+
+  - Certificate Authority certificate ("CA cert"). You often have several CA
+    certs in a CA cert bundle that can be used to verify a server certificate
+    that was signed by one of the authorities in the bundle. curl comes with a
+    default CA cert bundle. You can override the default.
+
+
 4. Running Problems
 
-  4.1. Problems connecting to SSL servers.
+  4.1 Problems connecting to SSL servers.
 
   It took a very long time before we could sort out why curl had problems to
   connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.  The
@@ -479,7 +538,7 @@ FAQ
   There have also been examples where the remote server didn't like the SSLv2
   request and instead you had to force curl to use SSLv3 with -3/--sslv3.
 
-  4.2. Why do I get problems when I use & or % in the URL?
+  4.2 Why do I get problems when I use & or % in the URL?
 
   In general unix shells, the & letter is treated special and when used, it
   runs the specified command in the background. To safely send the & as a part
@@ -497,7 +556,7 @@ FAQ
   pass in a POST using -d/--data you must encode it as '%25' (which then also
   needs the %-letter doubled on Windows machines).
 
-  4.3. How can I use {, }, [ or ] to specify multiple URLs?
+  4.3 How can I use {, }, [ or ] to specify multiple URLs?
 
   Because those letters have a special meaning to the shell, and to be used in
   a URL specified to curl you must quote them.
@@ -511,7 +570,7 @@ FAQ
 
     curl -g 'www.site.com/weirdname[].html'
 
-  4.4. Why do I get downloaded data even though the web page doesn't exist?
+  4.4 Why do I get downloaded data even though the web page doesn't exist?
 
   Curl asks remote servers for the page you specify. If the page doesn't exist
   at the server, the HTTP protocol defines how the server should respond and
@@ -562,14 +621,14 @@ FAQ
     slash. Try the same operation again _with_ the trailing URL, or use the
     -L/--location option to follow the redirection.
 
-  4.6. Can you tell me what error code 142 means?
+  4.6 Can you tell me what error code 142 means?
 
   All error codes that are larger than the highest documented error code means
   that curl has exited due to a crash. This is a serious error, and we
   appreciate a detailed bug report from you that describes how we could go
   ahead and repeat this!
 
-  4.7. How do I keep user names and passwords secret in Curl command lines?
+  4.7 How do I keep user names and passwords secret in Curl command lines?
 
   This problem has two sides:
 
@@ -603,7 +662,7 @@ FAQ
   If there is a bug, read the BUGS document first. Then report it as described
   in there.
 
-  4.9. Curl can't authenticate to the server that requires NTLM?
+  4.9 Curl can't authenticate to the server that requires NTLM?
 
   This is supported in curl 7.10.6 or later. No earlier curl version knows
   of this magic.
@@ -651,9 +710,10 @@ FAQ
   Details are also in the SSLCERTS file in the release archives, found online
   here: http://curl.haxx.se/docs/sslcerts.html
 
+
 5. libcurl Issues
 
-  5.1. Is libcurl thread-safe?
+  5.1 Is libcurl thread-safe?
 
   Yes.
 
@@ -687,7 +747,7 @@ FAQ
         size_t
         WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
         {
-          register int realsize = size * nmemb;
+          size_t realsize = size * nmemb;
           struct MemoryStruct *mem = (struct MemoryStruct *)data;
 
           mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
@@ -743,6 +803,47 @@ FAQ
 
   (Provided by Andrew Francis)
 
+  5.8 libcurl.so.3: open failed: No such file or directory
+
+  This is an error message you might get when you try to run a program linked
+  with a shared version of libcurl and your run-time linker (ld.so) couldn't
+  find the shared library named libcurl.so.3.
+
+  You need to make sure that ld.so finds libcurl.so.3. You can do that
+  multiple ways, and it differs somewhat between different operating systems,
+  but they are usually:
+
+  * Add an option to the linker command line that specify the hard-coded path
+    the run-time linker should check for the lib (usually -R)
+
+  * Set an environment variable (LD_LIBRARY_PATH for example) where ld.so
+    should check for libs
+
+  * Adjust the system's config to check for libs in the directory where you've
+    put the dir (like Linux's /etc/ld.so.conf)
+
+  'man ld.so' and 'man ld' will tell you more details
+
+  5.9 How does libcurl resolve host names?
+
+  libcurl includes a number of different name resolve functions:
+
+  - The non-ipv6 resolver that can use one out of four host name resolve calls
+    (depending on what your system supports):
+
+    A - gethostbyname()
+    B - gethostbyname_r() with 3 arguments
+    C - gethostbyname_r() with 5 arguments
+    D - gethostbyname_r() with 6 arguments
+
+  - The ipv6-resolver that uses getaddrinfo()
+
+  - The c-ares based name resolver that uses the c-ares library for resolves.
+
+  - The Windows threaded resolver. It use:
+
+    A - gethostbyname() on plain ipv4 windows hosts
+    B - getaddrinfo() on ipv6-enabled windows hosts
 
 6. License Issues
 
@@ -751,32 +852,32 @@ FAQ
   is just a brief summary for the cases we get the most questions. (Parts of
   this section was much enhanced by Bjorn Reese.)
 
-  6.1. I have a GPL program, can I use the libcurl library?
+  6.1 I have a GPL program, can I use the libcurl library?
 
   Yes!
 
   Since libcurl may be distributed under the MIT/X derivate license, it can be
   used together with GPL in any software.
 
-  6.2. I have a closed-source program, can I use the libcurl library?
+  6.2 I have a closed-source program, can I use the libcurl library?
 
   Yes!
 
   libcurl does not put any restrictions on the program that uses the library.
 
-  6.3. I have a BSD licensed program, can I use the libcurl library?
+  6.3 I have a BSD licensed program, can I use the libcurl library?
 
   Yes!
 
   libcurl does not put any restrictions on the program that uses the library.
 
-  6.4. I have a program that uses LGPL libraries, can I use libcurl?
+  6.4 I have a program that uses LGPL libraries, can I use libcurl?
 
   Yes!
 
   The LGPL license doesn't clash with other licenses.
 
-  6.5. Can I modify curl/libcurl for my program and keep the changes secret?
+  6.5 Can I modify curl/libcurl for my program and keep the changes secret?
 
   Yes!
 
@@ -784,7 +885,7 @@ FAQ
   the sources, on the condition that the copyright texts in the sources are
   left intact.
 
-  6.6. Can you please change the curl/libcurl license to XXXX?
+  6.6 Can you please change the curl/libcurl license to XXXX?
 
   No.
 
@@ -794,3 +895,26 @@ FAQ
   we want on curl/libcurl and it does not spread to other programs or
   libraries that use it. It should be possible for everyone to use libcurl or
   curl in their projects, no matter what license they already have in use.
+
+7. PHP/CURL Issues
+
+  7.1 What is PHP/CURL?
+
+  The module for PHP that makes it possible for PHP programs to access curl-
+  functions from within PHP. We often call it PHP/CURL to differentiate from
+  curl the command line tool and libcurl the library.
+
+  7.2 Who write PHP/CURL?
+
+  PHP/CURL is a module that comes with the regular PHP package. It depends and
+  uses libcurl, so you need to have libcurl installed properly first before
+  PHP/CURL can be used. PHP/CURL is written by Sterling Hughes.
+
+  7.3 Can I perform multiple requests using the same handle?
+
+  Yes - at least in PHP version 4.3.8 and later (this has been known to not
+  work in earlier versions, but the exact version when it started to work is
+  unknown to me).
+
+  After a transfer, you just set new options in the handle and make another
+  transfer. This will make libcurl to re-use the same connection if it can.

docs/FEATURES

@@ -6,26 +6,33 @@
 
 FEATURES
 
-Misc
- - full URL syntax
+curl tool
+ - config file support
+ - multiple URLs in a single command line
+ - range "globbing" support: [0-13], {one,two,three}
+ - multiple file upload on a single command line
+ - custom maximum transfer rate
+ - redirectable stderr
+
+libcurl supports
+ - full URL syntax with no length limit
  - custom maximum download time
  - custom least download speed acceptable
  - custom output result after completion
- - multiple URLs
  - guesses protocol from host name unless specified
  - uses .netrc
  - progress bar/time specs while downloading
  - "standard" proxy environment variables support
- - config file support
  - compiles on win32 (reported builds on 40+ operating systems)
- - redirectable stderr
  - selectable network interface for outgoing traffic
- - IPv6 support
+ - IPv6 support on unix and Windows
  - persistant connections
  - socks5 support
  - supports user name + password in proxy environment variables
  - operations through proxy "tunnel" (using CONNECT)
- - supports transfers of large files (>2GB and >4GB)
+ - supports large files (>2GB and >4GB) both upload/download
+ - replacable memory functions (malloc, free, realloc, etc)
+ - asynchronous name resolving (*6)
 
 HTTP
  - HTTP/1.1 compliant (optionally uses 1.0)
@@ -35,7 +42,7 @@ HTTP
  - POST
  - multipart formpost (RFC1867-style)
  - authentication: Basic, Digest, NTLM(*1), GSS-Negotiate/Negotiate(*3) and
-   SPNEGO (*4)
+   SPNEGO (*4) to server and proxy
  - resume (both GET and PUT)
  - follow redirects
  - maximum amount of redirects to follow
@@ -80,6 +87,8 @@ FTP
  - via http-proxy
  - all operations can be tunneled through a http-proxy
  - customizable to retrieve file modification date
+ - third party transfers
+ - no dir depth limit
 
 FTPS (*1)
  - explicit ftps:// support that use SSL on both connections
@@ -103,6 +112,8 @@ GOPHER
 
 FILE
  - URL support
+ - "uploads"
+ - resume
 
 FOOTNOTES
 =========
@@ -112,3 +123,4 @@ FOOTNOTES
   *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
   *4 = requires FBopenssl
   *5 = requires a krb4 library, such as the MIT one or similar.
+  *6 = requires c-ares

docs/HISTORY

@@ -1,7 +1,7 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
                           How cURL Became Like This
@@ -126,3 +126,16 @@ visitors to the curl.haxx.se site. Five official web mirrors.
 December 2003, full-fledged SSL for FTP is supported.
 
 January 2004: curl 7.11.0 introduced large file support.
+
+June 2004: curl 7.12.0 introduced IDN support. 10 official web mirrors.
+
+August 2004:
+ Curl and libcurl 7.12.1
+
+ Public curl release number:               82
+ Releases counted from the very beginning: 109
+ Available command line options:           96
+ Available curl_easy_setopt() options:     120
+ Number of public functions in libcurl:    36
+ Amount of public web site mirrors:        12
+ Number of known libcurl bindings:         26

docs/HOWTO-RELEASE

@@ -1,25 +0,0 @@
-Steps To Perform When Building a Public Release
-
-* "make distcheck"
-
-* ./maketgz
- then upload the 3 curl packages maketgz created
-
-* update these files:
-  www/_download.html
-  www/_changes.html
-  www/_newslog.html
-  www/Makefile
-
-* commit the web changes
-
-* 'cvs commit'
-
-* 'cvs tag'
-
-* write the release announcement, including:
-  - changes / bugfixes
-  - other curl-related news
-  - contributors
-
-* mail release-announcement to curl-announce and curl-users

docs/INSTALL

@@ -158,17 +158,9 @@ Win32
         Make the sources in the src/ drawer be a "win32 console application"
         project. Name it curl.
 
-        With VC++, add 'ws2_32.lib' to the link libs when you build curl!
-        Borland seems to do that itself magically. Of course you have to make
-        sure it links with the libcurl too!
-
         For VC++ 6, there's an included Makefile.vc6 that should be possible
         to use out-of-the-box.
 
-        Microsoft note: add /Zm200 to the compiler options to increase the
-        compiler's memory allocation limit, as the hugehelp.c won't compile
-        due to "too long puts string".
-
 
    With SSL:
 
@@ -189,28 +181,33 @@ Win32
       Microsoft command line style
       ----------------------------
 
+        Run the 'vcvars32.bat' file to get a proper environment. The
+        vcvars32.bat file is part of the Microsoft development environment and
+        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
+        provided that you installed Visual C/C++ 6 in the default directory.
+
+        Then run 'nmake vc' in curl's root directory.
+
+        If you want to compile with zlib support, you will need to build
+        zlib (http://www.gzip.org/zlib/) as well. Please read the zlib 
+        documentation on how to compile zlib. Define the ZLIB_PATH environment 
+        variable to the location of zlib.h and zlib.lib, for example:
+
+          set ZLIB_PATH=c:\zlib-1.2.1
+
+        Then run 'nmake vc-zlib' in curl's root directory.
+
+        If you want to compile with SSL support you need the OpenSSL package.
         Please read the OpenSSL documentation on how to compile and install
         the OpenSSL libraries.  The build process of OpenSSL generates the
         libeay32.dll and ssleay32.dll files in the out32dll subdirectory in
         the OpenSSL home directory.  OpenSSL static libraries (libeay32.lib,
         ssleay32.lib, RSAglue.lib) are created in the out32 subdirectory.
 
-        Run the 'vcvars32.bat' file to get a proper environment. The
-        vcvars32.bat file is part of the Microsoft development environment and
-        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
-        provided that you installed Visual C/C++ 6 in the default directory.
-
         Before running nmake define the OPENSSL_PATH environment variable with
         the root/base directory of OpenSSL, for example:
 
-          set OPENSSL_PATH=c:\openssl-0.9.7a
-
-        lib/Makefile.vc6 depends on zlib (http://www.gzip.org/zlib/) as well.
-        Please read the zlib documentation on how to compile zlib.  Define the
-        ZLIB_PATH environment variable to the location of zlib.h and zlib.lib,
-        for example:
-
-          set ZLIB_PATH=c:\zlib-1.1.4
+          set OPENSSL_PATH=c:\openssl-0.9.7d
 
         Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
         directory.  'nmake vc-ssl' will create a libcurl static and dynamic
@@ -219,10 +216,11 @@ Win32
         version is a standalone executable not requiring any DLL at
         runtime. This make method requires that you have the static OpenSSL
         libraries available in OpenSSL's out32 subdirectory.
-	'nmake vc-ssl-dll' creates the libcurl dynamic library and
-	links curl.exe against libcurl and OpenSSL dynamically.
-	This executable requires libcurl.dll and the OpenSSL DLLs
-	at runtime.
+        'nmake vc-ssl-dll' creates the libcurl dynamic library and
+        links curl.exe against libcurl and OpenSSL dynamically.
+        This executable requires libcurl.dll and the OpenSSL DLLs
+        at runtime. 
+        Run 'nmake vc-ssl-zlib' to build with both ssl and zlib support.
 
       Microsoft / Borland style
       -------------------------
@@ -361,12 +359,12 @@ VMS
    the name can be fetched from external or internal message libraries
    Errorcode - the errodes assigned by the application
    Sev. - severity: Even = error, off = non error
-		0 = Warning
-		1 = Success
-		2 = Error
-		3 = Information
-		4 = Fatal 
-		<5-7> reserved.
+      0 = Warning
+      1 = Success
+      2 = Error
+      3 = Information
+      4 = Fatal 
+      <5-7> reserved.
 
    This all presents itself with:
    %<FACILITY>-<SeV>-<Errorname>, <Error message>
@@ -379,7 +377,7 @@ VMS
 
    This was all compiled with:
 
-	Compaq C V6.2-003 on OpenVMS Alpha V7.1-1H2
+      Compaq C V6.2-003 on OpenVMS Alpha V7.1-1H2
 
    So far for porting notes as of:
    13-jul-2001
@@ -472,6 +470,39 @@ AmigaOS
    you can find a precompiled package at http://amiga.sourceforge.net/OpenSSL/
 
 
+NetWare
+=======
+
+   To compile curl.nlm / libcurl.nlm you need:
+   - either any gcc / nlmconv, or CodeWarrior 7 PDK 4 or later.
+   - gnu make and awk running on the platform you compile on;
+     native Win32 versions can be downloaded from:
+     http://www.gknw.com/development/prgtools/ 
+   - recent Novell LibC SDK availabable from:
+     http://developer.novell.com/ndk/libc.htm
+   - optional zlib sources (at the moment only dynamic linking with zlib.imp); 
+     sources with NetWare Makefile can be optained from:
+     http://www.gknw.com/mirror/zlib/
+
+   Set a search path to your compiler, linker and tools; if you want to have
+   zlib support then set the environment var ZLIB_PATH pointing to your zlib
+   sources, on Linux make sure the var OSTYPE contains the string 'linux';
+   and finally type 'make netware' from the top source directory...
+   I found on some Linux systems (RH9) that OS detection didnt work although
+   a 'set | grep OSTYPE' shows the var present and set; I simply overwrote it
+   with 'OSTYPE=linux-rh9-gnu' and the detection in the Makefile worked...;
+   other options are currently not supported, although partly prepared.
+   The Ares lib builds arlready fine, and both test tools work fine at least 
+   when build with CodeWarrior...; dont know yet why they fail when build with
+   gcc though; if you want to compile with Ares support then set an env var
+   WITH_ARES=1; I've not tested yet including libcares into curl.
+   Any help in testing appreciated!
+   Buils automatically created 4 times a day from current CVS are here:
+   http://www.gknw.com/mirror/curl/autobuilds/
+   the status of these buids can be viewed at the autobuild table:
+   http://curl.haxx.se/auto/
+
+
 PORTS
 =====
    This is a probably incomplete list of known hardware and operating systems
@@ -527,25 +558,10 @@ PORTS
         - s390 Linux 
         - XScale/PXA250 Linux 2.4
 
-OpenSSL
-=======
-
-   You'll find OpenSSL information at:
-
-      http://www.openssl.org
-
-
-MingW32/Cygwin
-==============
-
-   You'll find MingW32 and Cygwin information at:
-
-      http://www.mingw.org
-
-OpenLDAP
-========
-
-   You'll find OpenLDAP information at:
-
-      http://www.openldap.org
+Useful URLs
+===========
 
+OpenSSL   http://www.openssl.org
+MingW     http://www.mingw.org
+OpenLDAP  http://www.openldap.org
+Zlib      http://www.gzip.org/zlib/

docs/KNOWN_BUGS

@@ -3,6 +3,21 @@ join in and help us correct one or more of these! Also be sure to check the
 changelog of the current development status, as one or more of these problems
 may have been fixed since this was written!
 
+* curl version 7.12.2 fails on AIX if compiled with --enable-ares.
+  The workaround is to combine --enable-ares with --disable-shared
+
+* When connecting to a SOCKS proxy, the (connect) timeout is not properly
+  acknowledged after the actual TCP connect (during the SOCKS "negotiate"
+  phase). Pointed out by Lucas. Fix: need to select() and timeout properly.
+
+* Using configure --disable-[protocol] may cause 'make test' to fail for
+  tests using the disabled protocol(s).
+
+* To get HTTP Negotiate authentication to work fine, you need to provide a
+  (fake) user name (this concerns both curl and the lib) because the code
+  wrongly only considers authentication if there's a user name provided.
+  Bug report #1004841. How? http://curl.haxx.se/mail/lib-2004-08/0182.html
+
 * If you use a very large amount of file descriptors (more than FD_SETSIZE)
   and then use libcurl, it might crash on its use of select() which then
   stores data out of bounds. Bug report #948950.
@@ -32,18 +47,11 @@ may have been fixed since this was written!
   libcurl thinks of it as the *compressed* lenght. Some explanations are here:
   http://curl.haxx.se/mail/lib-2003-06/0146.html
 
-* Downloading 0 (zero) bytes files over FTP will not create a zero byte file
-  locally, which is because libcurl doesn't call the write callback with zero
-  bytes. Explained here: http://curl.haxx.se/mail/archive-2003-04/0143.html
-
 * IPv6 support on AIX 4.3.3 doesn't work due to a missing sockaddr_storage
   struct. It has been reported to work on AIX 5.1 though.
 
 * GOPHER transfers seem broken
 
-* configure --disable-http is not fully supported. All other protocols seem
-  to work to disable.
-
 * If a HTTP server responds to a HEAD request and includes a body (thus
   violating the RFC2616), curl won't wait to read the response but just stop
   reading and return back. If a second request (let's assume a GET) is then

docs/LICENSE-MIXING

@@ -10,13 +10,14 @@ can lead to for end users.
 
 I am not a lawyer and this is not legal advice!
 
-One common dilemma is that GPL[*]-licensed code is not allowed to be linked
+One common dilemma is that GPL[1]-licensed code is not allowed to be linked
 with code licensed under the Original BSD license (with the announcement
 clause, unless there's a specified exception in the GPL-licensed module). You
 may still build your own copies that use them all, but distributing them as
-binaries would be to violate the GPL license. This particular problem was
-addressed when the Modified BSD license was created, which does not have the
-annoncement clause that collides with GPL.
+binaries would be to violate the GPL license - unless you accompany your
+license with an exception[2]. This particular problem was addressed when the
+Modified BSD license was created, which does not have the annoncement clause
+that collides with GPL.
 
 libcurl http://curl.haxx.se/docs/copyright.html
 
@@ -80,4 +81,6 @@ OpenLDAP http://www.openldap.org/software/release/license.html
         linked with libcurl in an app.
 
 
-[*] = GPL - GNU General Public License: http://www.gnu.org/licenses/gpl.html
+[1] = GPL - GNU General Public License: http://www.gnu.org/licenses/gpl.html
+[2] = http://www.fsf.org/licenses/gpl-faq.html#GPLIncompatibleLibs details on
+      how to write such an exception to the GPL

docs/MANUAL

@@ -580,11 +580,11 @@ NETWORK INTERFACE
 
   Get a web page from a server using a specified port for the interface:
 
-	curl --interface eth0:1 http://www.netscape.com/
+        curl --interface eth0:1 http://www.netscape.com/
 
   or
 
-	curl --interface 192.168.1.10 http://www.netscape.com/
+        curl --interface 192.168.1.10 http://www.netscape.com/
 
 HTTPS
 
@@ -851,7 +851,7 @@ MAILING LISTS
 
   For your convenience, we have several open mailing lists to discuss curl,
   its development and things relevant to this. Get all info at
-  http://curl.haxx.se/mail/. The lists available are:
+  http://curl.haxx.se/mail/. Some of the lists available are:
 
   curl-users
 
@@ -865,24 +865,18 @@ MAILING LISTS
 
   curl-announce
 
-    Low-traffic. Only announcements of new public versions.
+    Low-traffic. Only receives announcements of new public versions. At worst,
+    that makes something like one or two mails per month, but usually only one
+    mail every second month.
 
-  curl-and-PHP
+  curl-and-php
 
     Using the curl functions in PHP. Everything curl with a PHP angle. Or PHP
     with a curl angle.
 
-  curl-commits
+  curl-and-python
 
-    Receives notifications on all CVS commits done to the curl source module.
-    This can become quite a large amount of mails during intense development,
-    be aware. This is for us who like email...
-
-  curl-www-commits
-
-    Receives notifications on all CVS commits done to the curl www module
-    (basicly the web site).  This can become quite a large amount of mails
-    during intense changing, be aware. This is for us who like email...
+    Python hackers using curl with or without the python binding pycurl.
 
   Please direct curl questions, feature requests and trouble reports to one of
   these mailing lists instead of mailing any individual.

docs/Makefile.am

@@ -17,7 +17,7 @@ CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)
 EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS	\
  README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS	\
  KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) HISTORY INSTALL		\
- libcurl-the-guide $(PDFPAGES) LICENSE-MIXING
+ $(PDFPAGES) LICENSE-MIXING README.netware
 
 MAN2HTML= roffit < $< >$@
 

docs/README.netware

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

docs/SSLCERTS

@@ -1,32 +1,30 @@
                       Peer SSL Certificate Verification
                       =================================
 
-Since version 7.10, libcurl performs peer SSL certificate verification by
-default. This is done by installing a default CA cert bundle on 'make install'
-(or similar), that CA bundle package is used by default on operations against
-SSL servers.
+libcurl performs peer SSL certificate verification by default. This is done by
+installing a default CA cert bundle on 'make install' (or similar), that CA
+bundle package is used by default on operations against SSL servers.
 
-Alas, if you communicate with HTTPS servers using certificates that are signed
-by CAs present in the bundle, you will not notice any changed behavior and you
-will seamlessly get a higher security level on your SSL connections since you
-can be sure that the remote server really is the one it claims to be.
+If you communicate with HTTPS or FTPS servers using certificates that are
+signed by CAs present in the bundle, you can be sure that the remote server
+really is the one it claims to be.
 
 If the remote server uses a self-signed certificate, if you don't install
 curl's CA cert bundle, if the server uses a certificate signed by a CA that
-isn't included in the bundle or if the remoste host is an imposter
-impersonating your favourite site, and you want to transfer files from this
+isn't included in the bundle or if the remote host is an impostor
+impersonating your favorite site, and you want to transfer files from this
 server, do one of the following:
 
  1. Tell libcurl to *not* verify the peer. With libcurl you disable with with
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
 
-    With the curl command tool, you disable this with -k/--insecure.
+    With the curl command line tool, you disable this with -k/--insecure.
 
  2. Get a CA certificate that can verify the remote server and use the proper
     option to point out this CA cert for verification when connecting. For
     libcurl hackers: curl_easy_setopt(curl, CURLOPT_CAPATH, capath);
 
-    With the curl command tool: --cacert [file]
+    With the curl command line tool: --cacert [file]
 
  3. Add the CA cert for your server to the existing default CA cert bundle.
     The default path of the CA bundle installed with the curl package is:
@@ -34,15 +32,61 @@ server, do one of the following:
     configure with the --with-ca-bundle option pointing out the path of your
     choice.
 
-Neglecting to use one of the above menthods when dealing with a server using a
-certficate that isn't signed by one of the certficates in the installed CA
+    To do this, you need to get the CA cert for your server in PEM format and
+    then append that to your CA cert bundle.
+
+    If you use Internet Explorer, this is one way to get extract the CA cert
+    for a particular server:
+
+     o View the certificate by double-clicking the padlock
+     o Find out where the CA certificate is kept (Certificate>
+       Authority Information Access>URL)
+     o Get a copy of the crt file using curl
+     o Convert it from crt to PEM using the openssl tool:
+       openssl x509 -inform DES -in yourdownloaded.crt \
+       -out outcert.pem -text
+     o Append the 'outcert.pem' to the CA cert bundle or use it stand-alone
+       as described below.
+
+     (Thanks to Frankie V for this description)
+
+    If you use the 'openssl' tool, this is one way to get extract the CA cert
+    for a particular server:
+
+     o openssl s_client -connect xxxxx.com:443 |tee logfile
+     o type "QUIT", followed by the "ENTER" key
+     o The certificate will have "BEGIN CERTIFICATE" and "END CERTIFICATE"
+       markers.
+     o If you want to see the data in the certificate, you can do: "openssl
+       x509 -inform PEM -in certfile -text -out certdata" where certfile is
+       the cert you extracted from logfile. Look in certdata.
+     o If you want to trust the certificate, you can append it to your
+       cert_bundle or use it stand-alone as described. Just remember that the
+       security is no better than the way you obtained the certificate.
+
+     (Thanks to Doug Kaufman for this description)
+
+ 4. If you're using the curl command line tool, you can specify your own CA
+    cert path by setting the environment variable CURL_CA_BUNDLE to the path
+    of your choice.
+
+    If you're using the curl command line tool on Windows, curl will search
+    for a CA cert file named "curl-ca-bundle.crt" in these directories and in
+    this order:
+      1. application's directory
+      2. current working directory
+      3. Windows System directory (e.g. C:\windows\system32)
+      4. Windows Directory (e.g. C:\windows)
+      5. all directories along %PATH%
+
+ 5. Get a better/different/newer CA cert bundle! One option is to extract the
+    one a recent Mozilla browser uses, by following the instruction found
+    here:
+
+        http://curl.haxx.se/docs/caextract.html
+
+Neglecting to use one of the above methods when dealing with a server using a
+certificate that isn't signed by one of the certificates in the installed CA
 cert bundle, will cause SSL to report an error ("certificate verify failed")
 during the handshake and SSL will then refuse further communication with that
 server.
-
-This procedure has been deemed The Right Thing even though it adds this extra
-trouble for some users, since it adds security to a majority of the SSL
-connections that previously weren't really secure. It turned out many people
-were using previous versions of curl/libcurl without realizing the need for
-the CA cert options to get truly secure SSL connections.
-

docs/TODO

@@ -33,12 +33,8 @@ TODO
    return informational stuff as errors, consider a new info returned by
    curl_easy_getinfo() #845941
 
- * Option to set the SO_KEEPALIVE socket option to make libcurl notice and
-   disconnect very long time idle connections.
-
- * When posting multipart forms, we should _not_ create the whole data chunk
-   in memory before the upload starts but do it in a "streaming" manner to
-   allow uploads that are way larger than the amount of system memory.
+ * Use 'struct lifreq' and SIOCGLIFADDR instead of 'struct ifreq' and
+   SIOCGIFADDR on newer Solaris versions as they claim the latter is obsolete.
 
  LIBCURL - multi interface
 
@@ -61,6 +57,18 @@ TODO
 
  FTP
 
+ * "PASV IP override" - When an FTPS host is behind a NAT firewall, passive
+   mode fails. The PASV response from the host ["227 PASV Entering passive
+   mode (_ip_address_, _port_)."] contains the private network IP address of
+   the host, which since it is encrypted, cannot be modified by the firewall
+   to the public IP address. What is needed is a cURL option to override the
+   IP address passed by the host "227 PASV" response. Requested by Ed
+   Hingsbergen
+
+ * Support GSS/Kerberos 5 for ftp file transfer. This will allow user
+   authentication and file encryption.  Possible libraries and example clients
+   are available from MIT or Heimdal. Requsted by Markus Moeller.
+
  * Optimize the way libcurl uses CWD on each new request over a persistent
    connection (on FTP) even if it doesn't have to.
 
@@ -89,9 +97,6 @@ TODO
 
  HTTP
 
- * GSS-Negotiate support for HTTP proxies. They only work on direct
-   connections to the server.
-
  * 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.
@@ -114,21 +119,19 @@ TODO
  * Evaluate/apply Gertjan van Wingerde's SSL patches:
    http://curl.haxx.se/mail/lib-2004-03/0087.html
 
- * If you really want to improve the SSL situation, you should probably have a
-   look at SSL cafile loading as well - quick traces look to me like these are
-   done on every request as well, when they should only be necessary once per
-   ssl context (or once per handle). Even better would be to support the SSL
-   CAdir option - instead of loading all of the root CA certs for every
-   request, this option allows you to only read the CA chain that is actually
-   required (into the cache)...
+ * "Look at SSL cafile - quick traces look to me like these are done on every
+   request as well, when they should only be necessary once per ssl context
+   (or once per handle)". The major improvement we can rather easily do is to
+   make sure we don't create and kill a new SSL "context" for every request,
+   but instead make one for every connection and re-use that SSL context in
+   the same style connections are re-used. It will make us use slightly more
+   memory but it will libcurl do less creations and deletions of SSL contexts.
 
  * Add an interface to libcurl that enables "session IDs" to get
    exported/imported. Cris Bailiff said: "OpenSSL has functions which can
    serialise the current SSL state to a buffer of your choice, and
    recover/reset the state from such a buffer at a later date - this is used
-   by mod_ssl for apache to implement and SSL session ID cache". This whole
-   idea might become moot if we enable the 'data sharing' as mentioned in the
-   LIBCURL label above.
+   by mod_ssl for apache to implement and SSL session ID cache".
 
  * OpenSSL supports a callback for customised verification of the peer
    certificate, but this doesn't seem to be exposed in the libcurl APIs. Could
@@ -137,8 +140,12 @@ TODO
 
  * Make curl's SSL layer option capable of using other free SSL libraries.
    Such as the Mozilla Security Services
-   (http://www.mozilla.org/projects/security/pki/nss/) and GNUTLS
-   (http://gnutls.hellug.gr/)
+   (http://www.mozilla.org/projects/security/pki/nss/) and GnuTLS
+   (http://www.gnu.org/software/gnutls/) This subject has been brought up
+   again recently since GPL-licensed applications that link with libcurl MAY
+   NOT distribute binaries that use OpenSSL without adding an exception clause
+   to the GPL license. See the LICENSE-MIXING document and this:
+   http://www.gnome.org/~markmc/openssl-and-the-gpl.html
 
  LDAP
 
@@ -148,6 +155,17 @@ TODO
 
  CLIENT
 
+ * "curl --sync http://example.com/feed[1-100].rss" or
+   "curl --sync http://example.net/{index,calendar,history}.html"
+
+   Downloads a range or set of URLs using the remote name, but only if the
+   remote file is newer than the local file. A Last-Modified HTTP date header
+   should also be used to set the mod date on the downloaded file.
+   (idea from "Brianiac")
+
+ * Globbing support for -d and -F, as in 'curl -d "name=foo[0-9]" URL'.
+   Requested by Dane Jensen and others. This is easily scripted though.
+
  * Add an option that prevents cURL from overwiting existing local files. When
    used, and there already is an existing file with the target file name
    (either -O or -o), a number should be appended (and increased if already
@@ -182,14 +200,14 @@ TODO
    http://curl.haxx.se/mail/archive-2003-11/0091.html (Kevin Roth suggested)
 
  * Provide a way to make options bound to a specific URL among several on the
-   command line. Possibly by adding a new option that separates options
-   between URLs, similar to this:
+   command line. Possibly by letting ':' separate options between URLs,
+   similar to this:
 
-      curl --data foo --url url.com --optionseparator
-           --url url2.com --optionseparator \
+      curl --data foo --url url.com : \
+          --url url2.com : \
           --url url3.com --data foo3
 
-   (--optionseparator used to show my point, it would need a better name)
+   (More details: http://curl.haxx.se/mail/archive-2004-07/0133.html)
 
    The example would do a POST-GET-POST combination on a single command line.
 
@@ -222,6 +240,8 @@ TODO
 
  * remove obsolete defines from curl/curl.h
 
+ * make several functions use size_t instead of int in their APIs
+
  * remove the following functions from the public API:
    curl_getenv
    curl_mprintf (and variations)

docs/TheArtOfHttpScripting

@@ -370,11 +370,11 @@ Version: 0.6
 
   In the HTTPS world, you use certificates to validate that you are the one
   you you claim to be, as an addition to normal passwords. Curl supports
-  client-side certificates. All certificates are locked with a PIN-code, why
-  you need to enter the unlock-code before the certificate can be used by
-  curl. The PIN-code can be specified on the command line or if not, entered
-  interactively when curl queries for it. Use a certificate with curl on a
-  HTTPS server like:
+  client-side certificates. All certificates are locked with a pass phrase,
+  which you need to enter before the certificate can be used by curl. The pass
+  phrase can be specified on the command line or if not, entered interactively
+  when curl queries for it. Use a certificate with curl on a HTTPS server
+  like:
 
         curl -E mycert.pem https://that.secure.server.com
 

docs/curl.1

@@ -335,10 +335,10 @@ If this option is used twice, the second will again disable silent failure.
 .IP "--ftp-ssl"
 (FTP) Make the FTP connection switch to use SSL/TLS. (Added in 7.11.0)
 
-If this option is used twice, the second will again disable silent failure.
+If this option is used twice, the second will again disable this.
 .IP "-F/--form <name=content>"
 (HTTP) This lets curl emulate a filled in form in which a user has pressed the
-submit button. This causes curl to POST data using the content-type
+submit button. This causes curl to POST data using the Content-Type
 multipart/form-data according to RFC1867. This enables uploading of binary
 files etc. To force the 'content' part to be be a file, prefix the file name
 with an @ sign. To just get the content part from a file, prefix the file name
@@ -355,11 +355,15 @@ input:
 To read the file's content from stdin insted of a file, use - where the file
 name should've been. This goes for both @ and < constructs.
 
-You can also tell curl what Content-Type to use for the file upload part, by
-using 'type=', in a manner similar to:
+You can also tell curl what Content-Type to use by using 'type=', in a manner
+similar to:
 
 \fBcurl\fP -F "web=@index.html;type=text/html" url.com
 
+or
+
+\fBcurl\fP -F "name=daniel;type=text/foo" url.com
+
 See further examples and details in the MANUAL.
 
 This option can be used multiple times.
@@ -662,13 +666,12 @@ instead of PORT by using \fI--disable-eprt\fP. EPRT is really PORT++.
 If used as the first parameter on the command line, the \fI$HOME/.curlrc\fP
 file will not be read and used as a config file.
 .IP "-Q/--quote <comand>"
-(FTP) Send an arbitrary command to the remote FTP server, by using the QUOTE
-command of the server. Not all servers support this command, and the set of
-QUOTE commands are server specific! Quote commands are sent BEFORE the
-transfer is taking place. To make commands take place after a successful
-transfer, prefix them with a dash '-'. You may specify any amount of commands
-to be run before and after the transfer. If the server returns failure for one
-of the commands, the entire operation will be aborted.
+(FTP) Send an arbitrary command to the remote FTP server. Quote commands are
+sent BEFORE the transfer is taking place. To make commands take place after a
+successful transfer, prefix them with a dash '-'. You may specify any amount
+of commands to be run before and after the transfer. If the server returns
+failure for one of the commands, the entire operation will be aborted. You
+must send syntactically correct FTP commands as RFC959 defines.
 
 This option can be used multiple times.
 .IP "--random-file <file>"
@@ -973,22 +976,18 @@ not set.
 
 If this option is used several times, the last one will be used.
 .IP "-z/--time-cond <date expression>"
-(HTTP)
-Request to get a file that has been modified later than the given time and
+(HTTP) Request a file that has been modified later than the given time and
 date, or one that has been modified before that time. The date expression can
 be all sorts of date strings or if it doesn't match any internal ones, it
 tries to get the time from a given file name instead! See the
-.BR "GNU date(1)"
-or
-.BR "curl_getdate(3)"
-man pages for date expression details.
+\fIcurl_getdate(3)\fP man pages for date expression details.
 
 Start the date expression with a dash (-) to make it request for a document
 that is older than the given date/time, default is a document that is newer
 than the specified date/time.
 
 If this option is used several times, the last one will be used.
-.IP "-Z/--max-redirs <num>"
+.IP "--max-redirs <num>"
 Set maximum number of redirection-followings allowed. If \fI-L/--location\fP
 is used, this option can be used to prevent curl from following redirections
 \&"in absurdum".

docs/examples/Makefile.am

@@ -9,7 +9,7 @@ EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c		\
  ftpupload.c httpput.c simplessl.c ftpgetresp.c http-post.c		\
  post-callback.c multi-app.c multi-double.c multi-single.c		\
  multi-post.c fopen.c simplepost.c makefile.dj curlx.c https.c		\
- multi-debugcallback.c fileupload.c
+ multi-debugcallback.c fileupload.c getinfo.c ftp3rdparty.c debug.c
 
 all:
 	@echo "done"

docs/examples/curlx.c

@@ -1,4 +1,4 @@
-/* 
+/*
   curlx.c  Authors: Peter Sylvester, Jean-Paul Merlin
 
   This is a little program to demonstrate the usage of
@@ -6,7 +6,7 @@
   - an ssl initialisation callback setting a user key and trustbases
     coming from a pkcs12 file
   - using an ssl application callback to find a URI in the
-    certificate presented during ssl session establishment. 
+    certificate presented during ssl session establishment.
 
 */
 
@@ -20,13 +20,13 @@
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, the following disclaimer,
- *    and the original OpenSSL and SSLeay Licences below. 
+ *    and the original OpenSSL and SSLeay Licences below.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions, the following disclaimer 
+ *    notice, this list of conditions, the following disclaimer
  *    and the original OpenSSL and SSLeay Licences below in
  *    the documentation and/or other materials provided with the
- *    distribution. 
+ *    distribution.
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgments:
@@ -100,7 +100,7 @@ static char *curlx_usage[]={
 " -envpass arg     - environement variable which content the tia private key password",
 " -out arg         - output file (response)- default stdout",
 " -in arg          - input file (request)- default stdin",
-" -connect arg     - URL of the server for the connection ex: www.openevidenve.org", 
+" -connect arg     - URL of the server for the connection ex: www.openevidenve.org",
 " -mimetype arg    - MIME type for data in ex : application/timestamp-query or application/dvcs -default application/timestamp-query",
 " -acceptmime arg  - MIME type acceptable for the response ex : application/timestamp-response or application/dvcs -default none",
 " -accesstype arg  - an Object identifier in an AIA/SIA method, e.g. AD_DVCS or ad_timestamping",
@@ -109,7 +109,7 @@ NULL
 
 /*
 
-  ./curlx -p12 psy.p12 -envpass XX -in request -verbose -accesstype AD_DVCS 
+  ./curlx -p12 psy.p12 -envpass XX -in request -verbose -accesstype AD_DVCS
   -mimetype application/dvcs -acceptmime application/dvcs -out response
 
 */
@@ -134,33 +134,33 @@ typedef struct sslctxparm_st {
 
 static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5)
 {
-	char *tmp;
-	if(!ia5 || !ia5->length) return NULL;
-	tmp = OPENSSL_malloc(ia5->length + 1);
-	memcpy(tmp, ia5->data, ia5->length);
-	tmp[ia5->length] = 0;
-	return tmp;
+        char *tmp;
+        if(!ia5 || !ia5->length) return NULL;
+        tmp = OPENSSL_malloc(ia5->length + 1);
+        memcpy(tmp, ia5->data, ia5->length);
+        tmp[ia5->length] = 0;
+        return tmp;
 }
 
 /* A conveniance routine to get an access URI. */
 
 static unsigned char *my_get_ext(X509 * cert, const int type, int extensiontype) {
 
-	int i;
-	STACK_OF(ACCESS_DESCRIPTION) * accessinfo ;
-	accessinfo =  X509_get_ext_d2i(cert, extensiontype, NULL, NULL) ;
+        int i;
+        STACK_OF(ACCESS_DESCRIPTION) * accessinfo ;
+        accessinfo =  X509_get_ext_d2i(cert, extensiontype, NULL, NULL) ;
 
-	if (!sk_ACCESS_DESCRIPTION_num(accessinfo)) return NULL;
-	for (i = 0; i < sk_ACCESS_DESCRIPTION_num(accessinfo); i++) {
-		ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
-		if (OBJ_obj2nid(ad->method) == type) {
-			if (ad->location->type == GEN_URI) {
-				return i2s_ASN1_IA5STRING(ad->location->d.ia5);
-			}
-			return NULL;
-		}
-	}	
-	return NULL;
+        if (!sk_ACCESS_DESCRIPTION_num(accessinfo)) return NULL;
+        for (i = 0; i < sk_ACCESS_DESCRIPTION_num(accessinfo); i++) {
+                ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
+                if (OBJ_obj2nid(ad->method) == type) {
+                        if (ad->location->type == GEN_URI) {
+                                return i2s_ASN1_IA5STRING(ad->location->d.ia5);
+                        }
+                        return NULL;
+                }
+        }
+        return NULL;
 }
 
 /* This is an application verification call back, it does not
@@ -170,192 +170,192 @@ static unsigned char *my_get_ext(X509 * cert, const int type, int extensiontype)
 */
 
 static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) {
-	sslctxparm * p = (sslctxparm *) arg;
-	int ok;
+        sslctxparm * p = (sslctxparm *) arg;
+        int ok;
 
-	if (p->verbose > 2) BIO_printf(p->errorbio,"entering ssl_app_verify_callback\n"); 
-	if ((ok= X509_verify_cert(ctx)) && ctx->cert) {
-		unsigned char * accessinfo ;
-		if (p->verbose > 1) X509_print_ex(p->errorbio,ctx->cert,0,0); 
-		if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_sinfo_access)) {
-        		if (p->verbose) BIO_printf(p->errorbio,"Setting URL from SIA to: %s\n",accessinfo); 
-			curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
-		} else 	if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_info_access)) {
-        		if (p->verbose) BIO_printf(p->errorbio,"Setting URL from AIA to: %s\n",accessinfo); 
-			curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
-		} 
-	}
-	if (p->verbose > 2) BIO_printf(p->errorbio,"leaving ssl_app_verify_callback with %d\n",ok); 
-	return(ok);
+        if (p->verbose > 2) BIO_printf(p->errorbio,"entering ssl_app_verify_callback\n");
+        if ((ok= X509_verify_cert(ctx)) && ctx->cert) {
+                unsigned char * accessinfo ;
+                if (p->verbose > 1) X509_print_ex(p->errorbio,ctx->cert,0,0);
+                if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_sinfo_access)) {
+                        if (p->verbose) BIO_printf(p->errorbio,"Setting URL from SIA to: %s\n",accessinfo);
+                        curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
+                } else  if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_info_access)) {
+                        if (p->verbose) BIO_printf(p->errorbio,"Setting URL from AIA to: %s\n",accessinfo);
+                        curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
+                }
+        }
+        if (p->verbose > 2) BIO_printf(p->errorbio,"leaving ssl_app_verify_callback with %d\n",ok);
+        return(ok);
 }
 
 
 /* This is an example of an curl SSL initialisation call back. The callback sets:
-  - a private key and certificate 
+  - a private key and certificate
   - a trusted ca certificate
   - a preferred cipherlist
   - an application verification callback (the function above)
 */
 
 static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) {
-      
-	sslctxparm * p = (sslctxparm *) parm;
-	SSL_CTX * ctx = (SSL_CTX *) sslctx ;
 
-	if (!SSL_CTX_use_certificate(ctx,p->usercert)) {
-		BIO_printf(p->errorbio, "SSL_CTX_use_certificate problem\n"); goto err;
-	}
-	if (!SSL_CTX_use_PrivateKey(ctx,p->pkey)) {
-		BIO_printf(p->errorbio, "SSL_CTX_use_PrivateKey\n"); goto err;
-	}
-		
-	if (!SSL_CTX_check_private_key(ctx)) {
-		BIO_printf(p->errorbio, "SSL_CTX_check_private_key\n"); goto err;
-	}
-		
-	SSL_CTX_set_quiet_shutdown(ctx,1);
-	SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
-	SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+        sslctxparm * p = (sslctxparm *) parm;
+        SSL_CTX * ctx = (SSL_CTX *) sslctx ;
 
-	X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,sk_X509_num(p->ca)-1)); 
+        if (!SSL_CTX_use_certificate(ctx,p->usercert)) {
+                BIO_printf(p->errorbio, "SSL_CTX_use_certificate problem\n"); goto err;
+        }
+        if (!SSL_CTX_use_PrivateKey(ctx,p->pkey)) {
+                BIO_printf(p->errorbio, "SSL_CTX_use_PrivateKey\n"); goto err;
+        }
 
-	SSL_CTX_set_verify_depth(ctx,2);
-	
-	SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL); 
+        if (!SSL_CTX_check_private_key(ctx)) {
+                BIO_printf(p->errorbio, "SSL_CTX_check_private_key\n"); goto err;
+        }
 
-	SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm); 
+        SSL_CTX_set_quiet_shutdown(ctx,1);
+        SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
+        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
 
-  
-	return CURLE_OK ;
-err: 
- 	ERR_print_errors(p->errorbio);
-	return CURLE_SSL_CERTPROBLEM;
+        X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,sk_X509_num(p->ca)-1));
+
+        SSL_CTX_set_verify_depth(ctx,2);
+
+        SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL);
+
+        SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);
+
+
+        return CURLE_OK ;
+err:
+        ERR_print_errors(p->errorbio);
+        return CURLE_SSL_CERTPROBLEM;
 
 }
 
 int main(int argc, char **argv) {
 
-	BIO* in=NULL;
-	BIO* out=NULL;
+        BIO* in=NULL;
+        BIO* out=NULL;
 
-   
-	char * outfile = NULL;
-	char * infile = NULL ;
 
-	int tabLength=100;
-	char *binaryptr;
-	char* mimetype;
-	char* mimetypeaccept=NULL;
-	char* contenttype;
-	char** pp;
-   	unsigned char* hostporturl = NULL;
-   	binaryptr=(char*)malloc(tabLength);
- 	BIO * p12bio ;
- 	char **args = argv + 1;
-	unsigned char * serverurl;
-	sslctxparm p;
-	char *response;
-	p.verbose = 0;
+        char * outfile = NULL;
+        char * infile = NULL ;
 
-	CURLcode res;
-	struct curl_slist * headers=NULL;
+        int tabLength=100;
+        char *binaryptr;
+        char* mimetype;
+        char* mimetypeaccept=NULL;
+        char* contenttype;
+        char** pp;
+        unsigned char* hostporturl = NULL;
+        binaryptr=(char*)malloc(tabLength);
+        BIO * p12bio ;
+        char **args = argv + 1;
+        unsigned char * serverurl;
+        sslctxparm p;
+        char *response;
+        p.verbose = 0;
 
-   	p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+        CURLcode res;
+        struct curl_slist * headers=NULL;
+
+        p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+
+        curl_global_init(CURL_GLOBAL_DEFAULT);
 
- 	curl_global_init(CURL_GLOBAL_DEFAULT);
- 
 /* we need some more for the P12 decoding */
 
         OpenSSL_add_all_ciphers();
-        OpenSSL_add_all_digests(); 
-	ERR_load_crypto_strings();
+        OpenSSL_add_all_digests();
+        ERR_load_crypto_strings();
 
 
-	int badarg=0;
+        int badarg=0;
 
-	while (*args && *args[0] == '-') {
-		if (!strcmp (*args, "-in")) {
-			if (args[1]) {
-				infile=*(++args);			  
-			} else badarg=1;
-		} else if (!strcmp (*args, "-out")) {
-			if (args[1]) {
-				outfile=*(++args);
-			} else badarg=1;
-		} else if (!strcmp (*args, "-p12")) {
-			if (args[1]) {
-				p.p12file = *(++args);
-			} else badarg=1;
-		} else if (strcmp(*args,"-envpass") == 0) {
-			if (args[1]) {
-				p.pst = getenv(*(++args));
-			} else badarg=1;
-		} else if (strcmp(*args,"-connect") == 0) {
-			if (args[1]) {
-				hostporturl = *(++args);
-			} else badarg=1;
-		} else if (strcmp(*args,"-mimetype") == 0) {
-			if (args[1]) {
-				mimetype = *(++args);
-			} else badarg=1; 
-		} else if (strcmp(*args,"-acceptmime") == 0) {
-			if (args[1]) {
-				mimetypeaccept = *(++args);
-			} else badarg=1; 
-		} else if (strcmp(*args,"-accesstype") == 0) {
-			if (args[1]) {
-				if ((p.accesstype = OBJ_obj2nid(OBJ_txt2obj(*++args,0))) == 0) badarg=1;
-		 	} else badarg=1; 
-		} else if (strcmp(*args,"-verbose") == 0) {
-			p.verbose++;
-		} else badarg=1;
-		args++;
-	}
-   
-	if (mimetype==NULL || mimetypeaccept == NULL) badarg = 1;
- 
-	if (badarg) {
-		for (pp=curlx_usage; (*pp != NULL); pp++)
-			BIO_printf(p.errorbio,"%s\n",*pp);
-		BIO_printf(p.errorbio,"\n");
-		goto err;
-	}
+        while (*args && *args[0] == '-') {
+                if (!strcmp (*args, "-in")) {
+                        if (args[1]) {
+                                infile=*(++args);
+                        } else badarg=1;
+                } else if (!strcmp (*args, "-out")) {
+                        if (args[1]) {
+                                outfile=*(++args);
+                        } else badarg=1;
+                } else if (!strcmp (*args, "-p12")) {
+                        if (args[1]) {
+                                p.p12file = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-envpass") == 0) {
+                        if (args[1]) {
+                                p.pst = getenv(*(++args));
+                        } else badarg=1;
+                } else if (strcmp(*args,"-connect") == 0) {
+                        if (args[1]) {
+                                hostporturl = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-mimetype") == 0) {
+                        if (args[1]) {
+                                mimetype = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-acceptmime") == 0) {
+                        if (args[1]) {
+                                mimetypeaccept = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-accesstype") == 0) {
+                        if (args[1]) {
+                                if ((p.accesstype = OBJ_obj2nid(OBJ_txt2obj(*++args,0))) == 0) badarg=1;
+                        } else badarg=1;
+                } else if (strcmp(*args,"-verbose") == 0) {
+                        p.verbose++;
+                } else badarg=1;
+                args++;
+        }
+
+        if (mimetype==NULL || mimetypeaccept == NULL) badarg = 1;
+
+        if (badarg) {
+                for (pp=curlx_usage; (*pp != NULL); pp++)
+                        BIO_printf(p.errorbio,"%s\n",*pp);
+                BIO_printf(p.errorbio,"\n");
+                goto err;
+        }
 
 
-  
-	/* set input */
-   
-	if ((in=BIO_new(BIO_s_file())) == NULL) {
-		BIO_printf(p.errorbio, "Error setting input bio\n");
-		goto err;
-	} else if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE|BIO_FP_TEXT);
-	else if (BIO_read_filename(in,infile) <= 0) {
-		BIO_printf(p.errorbio, "Error opening input file %s\n", infile);
-		BIO_free(in);
-		goto err;
-	}
-   
-	/* set output  */
-     
-	if ((out=BIO_new(BIO_s_file())) == NULL) {
-		BIO_printf(p.errorbio, "Error setting output bio.\n");
-		goto err;
-	} else if (outfile == NULL)
-		BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
-	else if (BIO_write_filename(out,outfile) <= 0) {
-		BIO_printf(p.errorbio, "Error opening output file %s\n", outfile);
-		BIO_free(out);
- 		goto err;
-	}
+
+        /* set input */
+
+        if ((in=BIO_new(BIO_s_file())) == NULL) {
+                BIO_printf(p.errorbio, "Error setting input bio\n");
+                goto err;
+        } else if (infile == NULL)
+                BIO_set_fp(in,stdin,BIO_NOCLOSE|BIO_FP_TEXT);
+        else if (BIO_read_filename(in,infile) <= 0) {
+                BIO_printf(p.errorbio, "Error opening input file %s\n", infile);
+                BIO_free(in);
+                goto err;
+        }
+
+        /* set output  */
+
+        if ((out=BIO_new(BIO_s_file())) == NULL) {
+                BIO_printf(p.errorbio, "Error setting output bio.\n");
+                goto err;
+        } else if (outfile == NULL)
+                BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
+        else if (BIO_write_filename(out,outfile) <= 0) {
+                BIO_printf(p.errorbio, "Error opening output file %s\n", outfile);
+                BIO_free(out);
+                goto err;
+        }
 
 
-  	p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
-  
-  	if (!(p.curl = curl_easy_init())) {
-		BIO_printf(p.errorbio, "Cannot init curl lib\n");
-		goto err;
-  	} 
+        p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+
+        if (!(p.curl = curl_easy_init())) {
+                BIO_printf(p.errorbio, "Cannot init curl lib\n");
+                goto err;
+        }
 
 
 
@@ -365,112 +365,112 @@ int main(int argc, char **argv) {
         if (!(p.p12 = d2i_PKCS12_bio (p12bio, NULL))) {
                 BIO_printf(p.errorbio, "Cannot decode P12 structure %s\n", p.p12file); goto err;
         }
-	
-	p.ca= NULL;
-	if (!(PKCS12_parse (p.p12, p.pst, &(p.pkey), &(p.usercert), &(p.ca) ) )) {
+
+        p.ca= NULL;
+        if (!(PKCS12_parse (p.p12, p.pst, &(p.pkey), &(p.usercert), &(p.ca) ) )) {
                 BIO_printf(p.errorbio,"Invalid P12 structure in %s\n", p.p12file); goto err;
-	}
+        }
 
-	if (sk_X509_num(p.ca) <= 0) {
+        if (sk_X509_num(p.ca) <= 0) {
                 BIO_printf(p.errorbio,"No trustworthy CA given.%s\n", p.p12file); goto err;
-	}
+        }
 
-	if (p.verbose > 1) X509_print_ex(p.errorbio,p.usercert,0,0); 
+        if (p.verbose > 1) X509_print_ex(p.errorbio,p.usercert,0,0);
 
-	/* determine URL to go */
+        /* determine URL to go */
 
-	if (hostporturl) {
-		serverurl=(char*) malloc(9+strlen(hostporturl));
-	  	sprintf(serverurl,"https://%s",hostporturl);
-	} else if (p.accesstype != 0) { /* see whether we can find an AIA or SIA for a given access type */
-		if (!(serverurl = my_get_ext(p.usercert,p.accesstype,NID_info_access))) {
-			BIO_printf(p.errorbio,"no service URL in user cert cherching in others certificats\n"); 
-			int j=0;
-			int find=0;
-			for (j=0;j<sk_X509_num(p.ca);j++) {
-	      			if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_info_access))) break; 
-	      			if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_sinfo_access))) break; 
-	 		}
-		}
-	}
+        if (hostporturl) {
+                serverurl=(char*) malloc(9+strlen(hostporturl));
+                sprintf(serverurl,"https://%s",hostporturl);
+        } else if (p.accesstype != 0) { /* see whether we can find an AIA or SIA for a given access type */
+                if (!(serverurl = my_get_ext(p.usercert,p.accesstype,NID_info_access))) {
+                        BIO_printf(p.errorbio,"no service URL in user cert cherching in others certificats\n");
+                        int j=0;
+                        int find=0;
+                        for (j=0;j<sk_X509_num(p.ca);j++) {
+                                if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_info_access))) break;
+                                if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_sinfo_access))) break;
+                        }
+                }
+        }
 
-	if (!serverurl) { 
-	       BIO_printf(p.errorbio, "no service URL in certificats, check '-accesstype (AD_DVCS | ad_timestamping)' or use '-connect'\n"); goto err;
-	}
-	
-	if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
-	curl_easy_setopt(p.curl, CURLOPT_URL, serverurl);
- 
-	/* Now specify the POST binary data */
+        if (!serverurl) {
+               BIO_printf(p.errorbio, "no service URL in certificats, check '-accesstype (AD_DVCS | ad_timestamping)' or use '-connect'\n"); goto err;
+        }
 
-	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
-     	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
-  
-	/* pass our list of custom made headers */
+        if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
+        curl_easy_setopt(p.curl, CURLOPT_URL, serverurl);
 
-	contenttype=(char*) malloc(15+strlen(mimetype));
-	sprintf(contenttype,"Content-type: %s",mimetype);
-    	headers = curl_slist_append(headers,contenttype);
-	curl_easy_setopt(p.curl, CURLOPT_HTTPHEADER, headers); 
+        /* Now specify the POST binary data */
 
-	if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
 
-	{
-		FILE *outfp;
-		BIO_get_fp(out,&outfp);
-		curl_easy_setopt(p.curl, CURLOPT_FILE,outfp); 
-        } 
+        /* pass our list of custom made headers */
 
-    	res = curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun)  ; 
+        contenttype=(char*) malloc(15+strlen(mimetype));
+        sprintf(contenttype,"Content-type: %s",mimetype);
+        headers = curl_slist_append(headers,contenttype);
+        curl_easy_setopt(p.curl, CURLOPT_HTTPHEADER, headers);
 
-    	if (res != CURLE_OK) 
-		BIO_printf(p.errorbio,"%d %s=%d %d\n", __LINE__, "CURLOPT_SSL_CTX_FUNCTION",CURLOPT_SSL_CTX_FUNCTION,res);
-   
-	curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_DATA, &p);  
+        if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
 
-	{
-		int lu; int i=0;
-		while ((lu = BIO_read (in,&binaryptr[i],tabLength-i)) >0 ) {
-			i+=lu;
-			if (i== tabLength) {
-				tabLength+=100;
-				binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */
-			}
-		}
-		tabLength = i;
-	}
-	/* Now specify the POST binary data */
+        {
+                FILE *outfp;
+                BIO_get_fp(out,&outfp);
+                curl_easy_setopt(p.curl, CURLOPT_FILE,outfp);
+        }
+
+        res = curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun)  ;
+
+        if (res != CURLE_OK)
+                BIO_printf(p.errorbio,"%d %s=%d %d\n", __LINE__, "CURLOPT_SSL_CTX_FUNCTION",CURLOPT_SSL_CTX_FUNCTION,res);
+
+        curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_DATA, &p);
+
+        {
+                int lu; int i=0;
+                while ((lu = BIO_read (in,&binaryptr[i],tabLength-i)) >0 ) {
+                        i+=lu;
+                        if (i== tabLength) {
+                                tabLength+=100;
+                                binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */
+                        }
+                }
+                tabLength = i;
+        }
+        /* Now specify the POST binary data */
+
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
 
-	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
-     	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
 
- 
     /* Perform the request, res will get the return code */
 
-	BIO_printf(p.errorbio,"%d %s %d\n", __LINE__, "curl_easy_perform", res = curl_easy_perform(p.curl));
+        BIO_printf(p.errorbio,"%d %s %d\n", __LINE__, "curl_easy_perform", res = curl_easy_perform(p.curl));
         {
-    		int result =curl_easy_getinfo(p.curl,CURLINFO_CONTENT_TYPE,&response);
-    		if( mimetypeaccept && p.verbose)   
-     			 if(!strcmp(mimetypeaccept,response)) 
-			BIO_printf(p.errorbio,"the response has a correct mimetype : %s\n",response);
-      		else
-			BIO_printf(p.errorbio,"the reponse doesn\'t has an acceptable mime type, it is %s instead of %s\n",response,mimetypeaccept);
-	}
+                int result =curl_easy_getinfo(p.curl,CURLINFO_CONTENT_TYPE,&response);
+                if( mimetypeaccept && p.verbose)
+                         if(!strcmp(mimetypeaccept,response))
+                        BIO_printf(p.errorbio,"the response has a correct mimetype : %s\n",response);
+                else
+                        BIO_printf(p.errorbio,"the reponse doesn\'t has an acceptable mime type, it is %s instead of %s\n",response,mimetypeaccept);
+        }
 
-    /*** code d'erreur si accept mime ***, egalement code return HTTP != 200 ***/ 
+    /*** code d'erreur si accept mime ***, egalement code return HTTP != 200 ***/
 
 /* free the header list*/
 
     curl_slist_free_all(headers);
- 
+
     /* always cleanup */
     curl_easy_cleanup(p.curl);
-   
+
     BIO_free(in);
     BIO_free(out);
     return (EXIT_SUCCESS);
-    
-    
+
+
  err: BIO_printf(p.errorbio,"error");
      exit(1);
 }

docs/examples/debug.c

@@ -0,0 +1,128 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+#include <stdio.h>
+#include <curl/curl.h>
+
+struct data {
+  char trace_ascii; /* 1 or 0 */
+};
+
+static
+void dump(const char *text,
+          FILE *stream, unsigned char *ptr, size_t size,
+          char nohex)
+{
+  size_t i;
+  size_t c;
+
+  unsigned int width=0x10;
+
+  if(nohex)
+    /* without the hex output, we can fit more on screen */
+    width = 0x40;
+
+  fprintf(stream, "%s, %zd bytes (0x%zx)\n", text, size, size);
+
+  for(i=0; i<size; i+= width) {
+
+    fprintf(stream, "%04zx: ", i);
+
+    if(!nohex) {
+      /* hex not disabled, show it */
+      for(c = 0; c < width; c++)
+        if(i+c < size)
+          fprintf(stream, "%02x ", ptr[i+c]);
+        else
+          fputs("   ", stream);
+    }
+
+    for(c = 0; (c < width) && (i+c < size); c++) {
+      /* check for 0D0A; if found, skip past and start a new line of output */
+      if (nohex && (i+c+1 < size) && ptr[i+c]==0x0D && ptr[i+c+1]==0x0A) {
+        i+=(c+2-width);
+        break;
+      }
+      fprintf(stream, "%c",
+              (ptr[i+c]>=0x20) && (ptr[i+c]<0x80)?ptr[i+c]:'.');
+      /* check again for 0D0A, to avoid an extra \n if it's at width */
+      if (nohex && (i+c+2 < size) && ptr[i+c+1]==0x0D && ptr[i+c+2]==0x0A) {
+        i+=(c+3-width);
+        break;
+      }
+    }
+    fputc('\n', stream); /* newline */
+  }
+  fflush(stream);
+}
+
+static
+int my_trace(CURL *handle, curl_infotype type,
+             unsigned char *data, size_t size,
+             void *userp)
+{
+  struct data *config = (struct data *)userp;
+  const char *text;
+  (void)handle; /* prevent compiler warning */
+
+  switch (type) {
+  case CURLINFO_TEXT:
+    fprintf(stderr, "== Info: %s", data);
+  default: /* in case a new one is introduced to shock us */
+    return 0;
+
+  case CURLINFO_HEADER_OUT:
+    text = "=> Send header";
+    break;
+  case CURLINFO_DATA_OUT:
+    text = "=> Send data";
+    break;
+  case CURLINFO_HEADER_IN:
+    text = "<= Recv header";
+    break;
+  case CURLINFO_DATA_IN:
+    text = "<= Recv data";
+    break;
+  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);
+  return 0;
+}
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+  struct data config;
+
+  config.trace_ascii = 1; /* enable ascii tracing */
+
+  curl = curl_easy_init();
+  if(curl) {
+    curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, my_trace);
+    curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &config);
+
+    /* the DEBUGFUNCTION has no effect until we enable VERBOSE */
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
+    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}

docs/examples/fileupload.c

@@ -22,7 +22,7 @@ int main(void)
   double speed_upload, total_time;
   FILE *fd;
 
-  fd = fopen("debugit", "r"); /* open file to upload */
+  fd = fopen("debugit", "rb"); /* open file to upload */
   if(!fd) {
 
     return 1; /* can't continue */

docs/examples/fopen.c

@@ -55,16 +55,16 @@ enum fcurl_type_e { CFTYPE_NONE=0, CFTYPE_FILE=1, CFTYPE_CURL=2 };
 
 struct fcurl_data
 {
-    enum fcurl_type_e type;	/* type of handle */
+    enum fcurl_type_e type;     /* type of handle */
     union {
-	CURL *curl;
-	FILE *file;
-    } handle;			/* handle */
+        CURL *curl;
+        FILE *file;
+    } handle;                   /* handle */
 
-    char *buffer;		/* buffer to store cached data*/
-    int buffer_len;		/* currently allocated buffers length */
-    int buffer_pos;		/* end of data in buffer*/
-    int still_running;		/* Is background url fetch still in progress */
+    char *buffer;               /* buffer to store cached data*/
+    int buffer_len;             /* currently allocated buffers length */
+    int buffer_pos;             /* end of data in buffer*/
+    int still_running;          /* Is background url fetch still in progress */
 };
 
 typedef struct fcurl_data URL_FILE;
@@ -83,9 +83,9 @@ CURLM *multi_handle;
 /* curl calls this routine to get more data */
 static size_t
 write_callback(char *buffer,
-	       size_t size,
-	       size_t nitems,
-	       void *userp)
+               size_t size,
+               size_t nitems,
+               void *userp)
 {
     char *newbuff;
     int rembuff;
@@ -97,21 +97,21 @@ write_callback(char *buffer,
 
     if(size > rembuff)
     {
-	//not enuf space in buffer
-	newbuff=realloc(url->buffer,url->buffer_len + (size - rembuff));
-	if(newbuff==NULL)
-	{
-	    fprintf(stderr,"callback buffer grow failed\n");
-	    size=rembuff;
-	}
-	else
-	{
-	    /* realloc suceeded increase buffer size*/
-	    url->buffer_len+=size - rembuff;
-	    url->buffer=newbuff;
+        //not enuf space in buffer
+        newbuff=realloc(url->buffer,url->buffer_len + (size - rembuff));
+        if(newbuff==NULL)
+        {
+            fprintf(stderr,"callback buffer grow failed\n");
+            size=rembuff;
+        }
+        else
+        {
+            /* realloc suceeded increase buffer size*/
+            url->buffer_len+=size - rembuff;
+            url->buffer=newbuff;
 
-	    /*printf("Callback buffer grown to %d bytes\n",url->buffer_len);*/
-	}
+            /*printf("Callback buffer grown to %d bytes\n",url->buffer_len);*/
+        }
     }
 
     memcpy(&url->buffer[url->buffer_pos], buffer, size);
@@ -137,42 +137,42 @@ curl_fill_buffer(URL_FILE *file,int want,int waittime)
      * doesnt exceed required size already
      */
     if((!file->still_running) || (file->buffer_pos > want))
-	return 0;
+        return 0;
 
     /* attempt to fill buffer */
     do
     {
-	FD_ZERO(&fdread);
-	FD_ZERO(&fdwrite);
-	FD_ZERO(&fdexcep);
+        FD_ZERO(&fdread);
+        FD_ZERO(&fdwrite);
+        FD_ZERO(&fdexcep);
 
-	/* set a suitable timeout to fail on */
-	timeout.tv_sec = 60; /* 1 minute */
-	timeout.tv_usec = 0;
+        /* set a suitable timeout to fail on */
+        timeout.tv_sec = 60; /* 1 minute */
+        timeout.tv_usec = 0;
 
-	/* get file descriptors from the transfers */
-	curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+        /* get file descriptors from the transfers */
+        curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 
-	rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+        rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
 
-	switch(rc) {
-	case -1:
-	    /* select error */
-	    break;
+        switch(rc) {
+        case -1:
+            /* select error */
+            break;
 
-	case 0:
-	    break;
+        case 0:
+            break;
 
-	default:
-	    /* timeout or readable/writable sockets */
-	    /* note we *could* be more efficient and not wait for
-	     * CURLM_CALL_MULTI_PERFORM to clear here and check it on re-entry
-	     * but that gets messy */
-	    while(curl_multi_perform(multi_handle, &file->still_running) ==
-		  CURLM_CALL_MULTI_PERFORM);
+        default:
+            /* timeout or readable/writable sockets */
+            /* note we *could* be more efficient and not wait for
+             * CURLM_CALL_MULTI_PERFORM to clear here and check it on re-entry
+             * but that gets messy */
+            while(curl_multi_perform(multi_handle, &file->still_running) ==
+                  CURLM_CALL_MULTI_PERFORM);
 
-	    break;
-	}
+            break;
+        }
     } while(file->still_running && (file->buffer_pos < want));
     return 1;
 }
@@ -184,22 +184,22 @@ curl_use_buffer(URL_FILE *file,int want)
     /* sort out buffer */
     if((file->buffer_pos - want) <=0)
     {
-	/* ditch buffer - write will recreate */
-	if(file->buffer)
-	    free(file->buffer);
+        /* ditch buffer - write will recreate */
+        if(file->buffer)
+            free(file->buffer);
 
-	file->buffer=NULL;
-	file->buffer_pos=0;
-	file->buffer_len=0;
+        file->buffer=NULL;
+        file->buffer_pos=0;
+        file->buffer_len=0;
     }
     else
     {
-	/* move rest down make it available for later */
-	memmove(file->buffer,
-		&file->buffer[want],
-		(file->buffer_pos - want));
+        /* move rest down make it available for later */
+        memmove(file->buffer,
+                &file->buffer[want],
+                (file->buffer_pos - want));
 
-	file->buffer_pos -= want;
+        file->buffer_pos -= want;
     }
     return 0;
 }
@@ -217,47 +217,47 @@ url_fopen(char *url,const char *operation)
 
     file = (URL_FILE *)malloc(sizeof(URL_FILE));
     if(!file)
-	return NULL;
+        return NULL;
 
     memset(file, 0, sizeof(URL_FILE));
 
     if((file->handle.file=fopen(url,operation)))
     {
-	file->type = CFTYPE_FILE; /* marked as URL */
+        file->type = CFTYPE_FILE; /* marked as URL */
     }
     else
     {
-	file->type = CFTYPE_CURL; /* marked as URL */
-	file->handle.curl = curl_easy_init();
+        file->type = CFTYPE_CURL; /* marked as URL */
+        file->handle.curl = curl_easy_init();
 
-	curl_easy_setopt(file->handle.curl, CURLOPT_URL, url);
-	curl_easy_setopt(file->handle.curl, CURLOPT_WRITEDATA, file);
-	curl_easy_setopt(file->handle.curl, CURLOPT_VERBOSE, FALSE);
-	curl_easy_setopt(file->handle.curl, CURLOPT_WRITEFUNCTION, write_callback);
+        curl_easy_setopt(file->handle.curl, CURLOPT_URL, url);
+        curl_easy_setopt(file->handle.curl, CURLOPT_WRITEDATA, file);
+        curl_easy_setopt(file->handle.curl, CURLOPT_VERBOSE, FALSE);
+        curl_easy_setopt(file->handle.curl, CURLOPT_WRITEFUNCTION, write_callback);
 
-	if(!multi_handle)
-	    multi_handle = curl_multi_init();
+        if(!multi_handle)
+            multi_handle = curl_multi_init();
 
-	curl_multi_add_handle(multi_handle, file->handle.curl);
+        curl_multi_add_handle(multi_handle, file->handle.curl);
 
-	/* lets start the fetch */
-	while(curl_multi_perform(multi_handle, &file->still_running) ==
-	      CURLM_CALL_MULTI_PERFORM );
+        /* lets start the fetch */
+        while(curl_multi_perform(multi_handle, &file->still_running) ==
+              CURLM_CALL_MULTI_PERFORM );
 
-	if((file->buffer_pos == 0) && (!file->still_running))
-	{
-	    /* if still_running is 0 now, we should return NULL */
+        if((file->buffer_pos == 0) && (!file->still_running))
+        {
+            /* if still_running is 0 now, we should return NULL */
 
-	    /* make sure the easy handle is not in the multi handle anymore */
-	    curl_multi_remove_handle(multi_handle, file->handle.curl);
+            /* make sure the easy handle is not in the multi handle anymore */
+            curl_multi_remove_handle(multi_handle, file->handle.curl);
 
-	    /* cleanup */
-	    curl_easy_cleanup(file->handle.curl);
+            /* cleanup */
+            curl_easy_cleanup(file->handle.curl);
 
-	    free(file);
+            free(file);
 
-	    file = NULL;
-	}
+            file = NULL;
+        }
     }
     return file;
 }
@@ -270,26 +270,26 @@ url_fclose(URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	ret=fclose(file->handle.file); /* passthrough */
-	break;
+        ret=fclose(file->handle.file); /* passthrough */
+        break;
 
     case CFTYPE_CURL:
-	/* make sure the easy handle is not in the multi handle anymore */
-	curl_multi_remove_handle(multi_handle, file->handle.curl);
+        /* make sure the easy handle is not in the multi handle anymore */
+        curl_multi_remove_handle(multi_handle, file->handle.curl);
 
-	/* cleanup */
-	curl_easy_cleanup(file->handle.curl);
-	break;
+        /* cleanup */
+        curl_easy_cleanup(file->handle.curl);
+        break;
 
     default: /* unknown or supported type - oh dear */
-	ret=EOF;
-	errno=EBADF;
-	break;
+        ret=EOF;
+        errno=EBADF;
+        break;
 
     }
 
     if(file->buffer)
-	free(file->buffer);/* free any allocated buffer space */
+        free(file->buffer);/* free any allocated buffer space */
 
     free(file);
 
@@ -304,17 +304,17 @@ url_feof(URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	ret=feof(file->handle.file);
-	break;
+        ret=feof(file->handle.file);
+        break;
 
     case CFTYPE_CURL:
-	if((file->buffer_pos == 0) && (!file->still_running))
-	    ret = 1;
-	break;
+        if((file->buffer_pos == 0) && (!file->still_running))
+            ret = 1;
+        break;
     default: /* unknown or supported type - oh dear */
-	ret=-1;
-	errno=EBADF;
-	break;
+        ret=-1;
+        errno=EBADF;
+        break;
     }
     return ret;
 }
@@ -327,38 +327,38 @@ url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	want=fread(ptr,size,nmemb,file->handle.file);
-	break;
+        want=fread(ptr,size,nmemb,file->handle.file);
+        break;
 
     case CFTYPE_CURL:
-	want = nmemb * size;
+        want = nmemb * size;
 
-	curl_fill_buffer(file,want,1);
+        curl_fill_buffer(file,want,1);
 
-	/* check if theres data in the buffer - if not curl_fill_buffer()
-	 * either errored or EOF */
-	if(!file->buffer_pos)
-	    return 0;
+        /* check if theres data in the buffer - if not curl_fill_buffer()
+         * either errored or EOF */
+        if(!file->buffer_pos)
+            return 0;
 
-	/* ensure only available data is considered */
-	if(file->buffer_pos < want)
-	    want = file->buffer_pos;
+        /* ensure only available data is considered */
+        if(file->buffer_pos < want)
+            want = file->buffer_pos;
 
-	/* xfer data to caller */
-	memcpy(ptr, file->buffer, want);
+        /* xfer data to caller */
+        memcpy(ptr, file->buffer, want);
 
-	curl_use_buffer(file,want);
+        curl_use_buffer(file,want);
 
-	want = want / size;	/* number of items - nb correct op - checked
-				 * with glibc code*/
+        want = want / size;     /* number of items - nb correct op - checked
+                                 * with glibc code*/
 
-	/*printf("(fread) return %d bytes %d left\n", want,file->buffer_pos);*/
-	break;
+        /*printf("(fread) return %d bytes %d left\n", want,file->buffer_pos);*/
+        break;
 
     default: /* unknown or supported type - oh dear */
-	want=0;
-	errno=EBADF;
-	break;
+        want=0;
+        errno=EBADF;
+        break;
 
     }
     return want;
@@ -373,45 +373,45 @@ url_fgets(char *ptr, int size, URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	ptr = fgets(ptr,size,file->handle.file);
-	break;
+        ptr = fgets(ptr,size,file->handle.file);
+        break;
 
     case CFTYPE_CURL:
-	curl_fill_buffer(file,want,1);
+        curl_fill_buffer(file,want,1);
 
-	/* check if theres data in the buffer - if not fill either errored or
-	 * EOF */
-	if(!file->buffer_pos)
-	    return NULL;
+        /* check if theres data in the buffer - if not fill either errored or
+         * EOF */
+        if(!file->buffer_pos)
+            return NULL;
 
-	/* ensure only available data is considered */
-	if(file->buffer_pos < want)
-	    want = file->buffer_pos;
+        /* ensure only available data is considered */
+        if(file->buffer_pos < want)
+            want = file->buffer_pos;
 
-	/*buffer contains data */
-	/* look for newline or eof */
-	for(loop=0;loop < want;loop++)
-	{
-	    if(file->buffer[loop] == '\n')
-	    {
-		want=loop+1;/* include newline */
-		break;
-	    }
-	}
+        /*buffer contains data */
+        /* look for newline or eof */
+        for(loop=0;loop < want;loop++)
+        {
+            if(file->buffer[loop] == '\n')
+            {
+                want=loop+1;/* include newline */
+                break;
+            }
+        }
 
-	/* xfer data to caller */
-	memcpy(ptr, file->buffer, want);
-	ptr[want]=0;/* allways null terminate */
+        /* xfer data to caller */
+        memcpy(ptr, file->buffer, want);
+        ptr[want]=0;/* allways null terminate */
 
-	curl_use_buffer(file,want);
+        curl_use_buffer(file,want);
 
-	/*printf("(fgets) return %d bytes %d left\n", want,file->buffer_pos);*/
-	break;
+        /*printf("(fgets) return %d bytes %d left\n", want,file->buffer_pos);*/
+        break;
 
     default: /* unknown or supported type - oh dear */
-	ptr=NULL;
-	errno=EBADF;
-	break;
+        ptr=NULL;
+        errno=EBADF;
+        break;
     }
 
     return ptr;/*success */
@@ -423,28 +423,28 @@ url_rewind(URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	rewind(file->handle.file); /* passthrough */
-	break;
+        rewind(file->handle.file); /* passthrough */
+        break;
 
     case CFTYPE_CURL:
-	/* halt transaction */
-	curl_multi_remove_handle(multi_handle, file->handle.curl);
+        /* halt transaction */
+        curl_multi_remove_handle(multi_handle, file->handle.curl);
 
-	/* restart */
-	curl_multi_add_handle(multi_handle, file->handle.curl);
+        /* restart */
+        curl_multi_add_handle(multi_handle, file->handle.curl);
 
-	/* ditch buffer - write will recreate - resets stream pos*/
-	if(file->buffer)
-	    free(file->buffer);
+        /* ditch buffer - write will recreate - resets stream pos*/
+        if(file->buffer)
+            free(file->buffer);
 
-	file->buffer=NULL;
-	file->buffer_pos=0;
-	file->buffer_len=0;
+        file->buffer=NULL;
+        file->buffer_pos=0;
+        file->buffer_len=0;
 
-	break;
+        break;
 
     default: /* unknown or supported type - oh dear */
-	break;
+        break;
 
     }
 
@@ -466,33 +466,33 @@ main(int argc, char *argv[])
 
     if(argc < 2)
     {
-	url="http://192.168.7.3/testfile";/* default to testurl */
+        url="http://192.168.7.3/testfile";/* default to testurl */
     }
     else
     {
-	url=argv[1];/* use passed url */
+        url=argv[1];/* use passed url */
     }
 
     /* copy from url line by line with fgets */
     outf=fopen("fgets.test","w+");
     if(!outf)
     {
-	perror("couldnt open fgets output file\n");
-	return 1;
+        perror("couldnt open fgets output file\n");
+        return 1;
     }
 
     handle = url_fopen(url, "r");
     if(!handle)
     {
-	printf("couldn't url_fopen()\n");
-	fclose(outf);
-	return 2;
+        printf("couldn't url_fopen()\n");
+        fclose(outf);
+        return 2;
     }
 
     while(!url_feof(handle))
     {
-	url_fgets(buffer,sizeof(buffer),handle);
-	fwrite(buffer,1,strlen(buffer),outf);
+        url_fgets(buffer,sizeof(buffer),handle);
+        fwrite(buffer,1,strlen(buffer),outf);
     }
 
     url_fclose(handle);
@@ -504,20 +504,20 @@ main(int argc, char *argv[])
     outf=fopen("fread.test","w+");
     if(!outf)
     {
-	perror("couldnt open fread output file\n");
-	return 1;
+        perror("couldnt open fread output file\n");
+        return 1;
     }
 
     handle = url_fopen("testfile", "r");
     if(!handle) {
-	printf("couldn't url_fopen()\n");
-	fclose(outf);
-	return 2;
+        printf("couldn't url_fopen()\n");
+        fclose(outf);
+        return 2;
     }
 
     do {
-	nread = url_fread(buffer, 1,sizeof(buffer), handle);
-	fwrite(buffer,1,nread,outf);
+        nread = url_fread(buffer, 1,sizeof(buffer), handle);
+        fwrite(buffer,1,nread,outf);
     } while(nread);
 
     url_fclose(handle);
@@ -529,26 +529,26 @@ main(int argc, char *argv[])
     outf=fopen("rewind.test","w+");
     if(!outf)
     {
-	perror("couldnt open fread output file\n");
-	return 1;
+        perror("couldnt open fread output file\n");
+        return 1;
     }
 
     handle = url_fopen("testfile", "r");
     if(!handle) {
-	printf("couldn't url_fopen()\n");
-	fclose(outf);
-	return 2;
+        printf("couldn't url_fopen()\n");
+        fclose(outf);
+        return 2;
     }
 
-	nread = url_fread(buffer, 1,sizeof(buffer), handle);
-	fwrite(buffer,1,nread,outf);
-	url_rewind(handle);
+        nread = url_fread(buffer, 1,sizeof(buffer), handle);
+        fwrite(buffer,1,nread,outf);
+        url_rewind(handle);
 
-	buffer[0]='\n';
-	fwrite(buffer,1,1,outf);
+        buffer[0]='\n';
+        fwrite(buffer,1,1,outf);
 
-	nread = url_fread(buffer, 1,sizeof(buffer), handle);
-	fwrite(buffer,1,nread,outf);
+        nread = url_fread(buffer, 1,sizeof(buffer), handle);
+        fwrite(buffer,1,nread,outf);
 
 
     url_fclose(handle);

docs/examples/ftp3rdparty.c

@@ -0,0 +1,104 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+/*
+ * This is an example showing how to transfer a file between two remote hosts.
+ */
+
+
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+  char sourceFileName[] = "/tmp/file";
+  char targetFileName[] = "/tmp/curlTargetTest.dat";
+  char sourceHost[] = "source";
+  char targetHost[] = "target";
+  char sourceUserPass[] = "user:pass";
+  char targetUserPass[] = "user:pass";
+  char url[100];
+  
+  struct curl_slist *source_pre_cmd = NULL;
+  struct curl_slist *target_pre_cmd = NULL;
+  struct curl_slist *source_post_cmd = NULL;
+  struct curl_slist *target_post_cmd = NULL;
+  char cmd[] = "PWD";   /* just to test */
+
+  curl_global_init(CURL_GLOBAL_DEFAULT);
+  
+  curl = curl_easy_init();
+  if (curl) {
+    sprintf(url, "ftp://%s@%s/%s", targetUserPass, targetHost, targetFileName);
+    printf("%s\n", url);
+    curl_easy_setopt(curl, CURLOPT_URL, url);
+
+    /* Set a proxy host */
+    curl_easy_setopt(curl, CURLOPT_SOURCE_HOST, sourceHost);
+
+    /* Set a proxy user and password */
+    curl_easy_setopt(curl, CURLOPT_SOURCE_USERPWD, sourceUserPass);
+
+    /* Set a proxy full file name */
+    curl_easy_setopt(curl, CURLOPT_SOURCE_PATH, sourceFileName);
+
+    /* Set a proxy passive host */
+    curl_easy_setopt(curl, CURLOPT_PASV_HOST, 0);   /* optional */
+
+    /* build a list of commands to pass to libcurl */
+    source_pre_cmd = curl_slist_append(source_pre_cmd, cmd);
+    /* Set a proxy pre-quote command */
+    curl_easy_setopt(curl, CURLOPT_SOURCE_PREQUOTE, source_pre_cmd);
+
+    /* build a list of commands to pass to libcurl */
+    target_pre_cmd = curl_slist_append(target_pre_cmd, cmd);
+    /* Set a pre-quote command */
+    curl_easy_setopt(curl, CURLOPT_PREQUOTE, target_pre_cmd);
+
+    /* build a list of commands to pass to libcurl */
+    source_post_cmd = curl_slist_append(source_post_cmd, cmd);
+    /* Set a proxy post-quote command */
+    curl_easy_setopt(curl, CURLOPT_SOURCE_POSTQUOTE, source_post_cmd);
+
+    /* build a list of commands to pass to libcurl */
+    target_post_cmd = curl_slist_append(target_post_cmd, cmd);
+    /* Set a post-quote command */
+    curl_easy_setopt(curl, CURLOPT_POSTQUOTE, target_post_cmd);
+    
+    /* Switch on full protocol/debug output */
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
+    res = curl_easy_perform(curl);
+
+    /* clean up the FTP commands list */
+    curl_slist_free_all(source_pre_cmd);
+    curl_slist_free_all(target_pre_cmd);
+    curl_slist_free_all(source_post_cmd);
+    curl_slist_free_all(target_post_cmd);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+
+    if(CURLE_OK != res) {
+      /* we failed */
+      fprintf(stderr, "curl told us %d\n", res);
+    }
+  }
+
+  curl_global_cleanup();
+
+  return 0;
+}

docs/examples/ftpget.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -49,10 +49,14 @@ int main(void)
   };
 
   curl_global_init(CURL_GLOBAL_DEFAULT);
-  
+
   curl = curl_easy_init();
   if(curl) {
-    /* Get curl 7.9.2 from sunet.se's FTP site: */
+    /*
+     * Get curl 7.9.2 from sunet.se's FTP site. curl 7.9.2 is most likely not
+     * present there by the time you read this, so you'd better replace the
+     * URL with one that works!
+     */
     curl_easy_setopt(curl, CURLOPT_URL,
                      "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.9.2.tar.gz");
     /* Define our callback to get called when there's data to be written */

docs/examples/getinfo.c

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+#include <stdio.h>
+#include <curl/curl.h>
+
+int main(void)
+{
+  CURL *curl;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(curl) {
+    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
+    res = curl_easy_perform(curl);
+
+    if(CURLE_OK == res) {
+      char *ct;
+      /* ask for the content-type */
+      res = curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &ct);
+
+      if((CURLE_OK == res) && ct)
+        printf("We received Content-Type: %s\n", ct);
+    }
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return 0;
+}

docs/examples/makefile.dj

@@ -5,7 +5,7 @@
 
 include ../../packages/DOS/common.dj
 
-CFLAGS += -I../../include
+CFLAGS += -I../../include -DFALSE=0 -DTRUE=1
 
 LIBS = ../../lib/libcurl.a
 
@@ -15,14 +15,16 @@ endif
 
 LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a
 
-PROGRAMS  = fopen.exe ftpget.exe ftpgetre.exe ftpuploa.exe getinmem.exe \
-            http-pos.exe httpput.exe multi-ap.exe multi-do.exe          \
-            multi-po.exe multi-si.exe persista.exe post-cal.exe         \
-            postit2.exe sepheade.exe simple.exe simpless.exe
+PROGRAMS  = fopen.exe ftpget.exe ftpgetresp.exe ftpupload.exe \
+            getinmemory.exe http-post.exe httpput.exe multi-app.exe \
+            multi-double.exe multi-post.exe multi-single.exe \
+            persistant.exe post-callback.exe postit2.exe \
+            sepheaders.exe simple.exe simplessl.exe https.exe \
+            ftp3rdparty.exe getinfo.exe
 
 all: $(PROGRAMS)
 
-.c.exe:
+%.exe: %.c
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 	@echo
 

docs/examples/multi-app.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -24,9 +24,9 @@
  * Download a HTTP file and upload an FTP file simultaneously.
  */
 
-#define HANDLECOUNT 2	/* Number of simultaneous transfers */
-#define HTTP_HANDLE 0	/* Index for the HTTP transfer */
-#define FTP_HANDLE 1	/* Index for the FTP transfer */
+#define HANDLECOUNT 2   /* Number of simultaneous transfers */
+#define HTTP_HANDLE 0   /* Index for the HTTP transfer */
+#define FTP_HANDLE 1    /* Index for the FTP transfer */
 
 int main(int argc, char **argv)
 {
@@ -98,8 +98,6 @@ int main(int argc, char **argv)
     }
   }
 
-  curl_multi_cleanup(multi_handle);
-
   /* See how the transfers went */
   while ((msg = curl_multi_info_read(multi_handle, &msgs_left))) {
     if (msg->msg == CURLMSG_DONE) {
@@ -111,15 +109,17 @@ int main(int argc, char **argv)
 
        switch (idx) {
          case HTTP_HANDLE:
-	   printf("HTTP transfer completed with status %d\n", msg->data.result);
-	   break;
-	 case FTP_HANDLE:
-	   printf("FTP transfer completed with status %d\n", msg->data.result);
-	   break;
+           printf("HTTP transfer completed with status %d\n", msg->data.result);
+           break;
+         case FTP_HANDLE:
+           printf("FTP transfer completed with status %d\n", msg->data.result);
+           break;
        }
     }
   }
 
+  curl_multi_cleanup(multi_handle);
+
   /* Free the CURL handles */
   for (i=0; i<HANDLECOUNT; i++)
       curl_easy_cleanup(handles[i]);

docs/examples/post-callback.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -57,9 +57,6 @@ int main(void)
     /* Now specify we want to POST data */
     curl_easy_setopt(curl, CURLOPT_POST, TRUE);
 
-    /* Set the expected POST size */
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, pooh.sizeleft);
-
     /* we want to use our own read function */
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
 
@@ -69,6 +66,47 @@ int main(void)
     /* get verbose debug output please */
     curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 
+    /*
+      If you use POST to a HTTP 1.1 server, you can send data without knowing
+      the size before starting the POST if you use chunked encoding. You
+      enable this by adding a header like "Transfer-Encoding: chunked" with
+      CURLOPT_HTTPHEADER. With HTTP 1.0 or without chunked transfer, you must
+      specify the size in the request.
+    */
+#ifdef USE_CHUNKED
+    {
+      curl_slist *chunk = NULL;
+
+      chunk = curl_slist_append(chunk, "Transfer-Encoding: chunked");
+      res = curl_easy_setopt(curl, CURLOPT_HTTPHEADER);
+      /* use curl_slist_free_all() after the *perform() call to free this
+         list again */
+    }
+#else
+    /* Set the expected POST size. If you want to POST large amounts of data,
+       consider CURLOPT_POSTFIELDSIZE_LARGE */
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, pooh.sizeleft);
+#endif
+
+#ifdef DISABLE_EXPECT
+    /*
+      Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue"
+      header.  You can disable this header with CURLOPT_HTTPHEADER as usual.
+      NOTE: if you want chunked transfer too, you need to combine these two
+      since you can only set one list of headers with CURLOPT_HTTPHEADER. */
+
+    /* A less good option would be to enforce HTTP 1.0, but that might also
+       have other implications. */
+    {
+      curl_slist *chunk = NULL;
+
+      chunk = curl_slist_append(chunk, "Expect:");
+      res = curl_easy_setopt(curl, CURLOPT_HTTPHEADER);
+      /* use curl_slist_free_all() after the *perform() call to free this
+         list again */
+    }
+#endif
+
     /* Perform the request, res will get the return code */
     res = curl_easy_perform(curl);
 

docs/examples/postit2.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
                CURLFORM_COPYNAME, "filename",
                CURLFORM_COPYCONTENTS, "postit2.c",
                CURLFORM_END);
-  
+
 
   /* Fill in the submit field too, even if this is rarely needed */
   curl_formadd(&formpost,

docs/examples/simple.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$

docs/examples/simplessl.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -71,42 +71,48 @@ int main(int argc, char **argv)
 
     while(1)                    /* do some ugly short cut... */
     {
-       if (pEngine)             /* use crypto engine */
-       {
-          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE,pEngine) != CURLE_OK)
-          {                     /* load the crypto engine */
-             fprintf(stderr,"can't set crypto engine\n");
-             break;
-          }
-          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE_DEFAULT,1) != CURLE_OK)
-          {                     /* set the crypto engine as default */
-                                /* only needed for the first time you load
-                                   a engine in a curl object... */
-             fprintf(stderr,"can't set crypto engine as default\n");
-             break;
-          }
-       }
-                                /* cert is stored PEM coded in file... */
-                                /* since PEM is default, we needn't set it for PEM */
-       curl_easy_setopt(curl,CURLOPT_SSLCERTTYPE,"PEM");
-                                /* set the cert for client authentication */
-       curl_easy_setopt(curl,CURLOPT_SSLCERT,pCertFile);
-                                /* sorry, for engine we must set the passphrase
-                                   (if the key has one...) */
-       if (pPassphrase)
-          curl_easy_setopt(curl,CURLOPT_SSLKEYPASSWD,pPassphrase);
-                                /* if we use a key stored in a crypto engine,
-                                   we must set the key type to "ENG" */
-       curl_easy_setopt(curl,CURLOPT_SSLKEYTYPE,pKeyType);
-                                /* set the private key (file or ID in engine) */
-       curl_easy_setopt(curl,CURLOPT_SSLKEY,pKeyName);
-                                /* set the file with the certs vaildating the server */
-       curl_easy_setopt(curl,CURLOPT_CAINFO,pCACertFile);
-                                /* disconnect if we can't validate server's cert */
-       curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,1);
-       
-       res = curl_easy_perform(curl);
-       break;                   /* we are done... */
+      if (pEngine)             /* use crypto engine */
+      {
+        if (curl_easy_setopt(curl, CURLOPT_SSLENGINE,pEngine) != CURLE_OK)
+        {                     /* load the crypto engine */
+          fprintf(stderr,"can't set crypto engine\n");
+          break;
+        }
+        if (curl_easy_setopt(curl, CURLOPT_SSLENGINE_DEFAULT,1) != CURLE_OK)
+        { /* set the crypto engine as default */
+          /* only needed for the first time you load
+             a engine in a curl object... */
+          fprintf(stderr,"can't set crypto engine as default\n");
+          break;
+        }
+      }
+      /* cert is stored PEM coded in file... */
+      /* since PEM is default, we needn't set it for PEM */
+      curl_easy_setopt(curl,CURLOPT_SSLCERTTYPE,"PEM");
+
+      /* set the cert for client authentication */
+      curl_easy_setopt(curl,CURLOPT_SSLCERT,pCertFile);
+
+      /* sorry, for engine we must set the passphrase
+         (if the key has one...) */
+      if (pPassphrase)
+        curl_easy_setopt(curl,CURLOPT_SSLKEYPASSWD,pPassphrase);
+
+      /* if we use a key stored in a crypto engine,
+         we must set the key type to "ENG" */
+      curl_easy_setopt(curl,CURLOPT_SSLKEYTYPE,pKeyType);
+
+      /* set the private key (file or ID in engine) */
+      curl_easy_setopt(curl,CURLOPT_SSLKEY,pKeyName);
+
+      /* set the file with the certs vaildating the server */
+      curl_easy_setopt(curl,CURLOPT_CAINFO,pCACertFile);
+
+      /* disconnect if we can't validate server's cert */
+      curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,1);
+
+      res = curl_easy_perform(curl);
+      break;                   /* we are done... */
     }
     /* always cleanup */
     curl_easy_cleanup(curl);

docs/libcurl/Makefile.am

@@ -15,7 +15,8 @@ man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_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
+ curl_multi_strerror.3 curl_share_strerror.3 curl_global_init_mem.3	\
+ libcurl-tutorial.3 curl_easy_reset.3
 
 HTMLPAGES = curl_easy_cleanup.html curl_easy_getinfo.html		\
  curl_easy_init.html curl_easy_perform.html curl_easy_setopt.html	\
@@ -30,7 +31,8 @@ HTMLPAGES = curl_easy_cleanup.html curl_easy_getinfo.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
+ curl_share_strerror.html curl_global_init_mem.html			\
+ libcurl-tutorial.html curl_easy_reset.html
 
 PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.pdf			\
  curl_easy_init.pdf curl_easy_perform.pdf curl_easy_setopt.pdf		\
@@ -45,7 +47,8 @@ PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.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
+ curl_share_strerror.pdf curl_global_init_mem.pdf libcurl-tutorial.pdf	\
+ curl_easy_reset.pdf
 
 CLEANFILES = $(HTMLPAGES) $(PDFPAGES)
 

docs/libcurl/curl_easy_getinfo.3

@@ -19,6 +19,9 @@ this documentation describes further down).  The data pointed-to will be
 filled in accordingly and can be relied upon only if the function returns
 CURLE_OK.  This function is intended to get used *AFTER* a performed transfer,
 all results from this function are undefined until the transfer is completed.
+
+You should not free the memory returned by this function unless it is
+explictly mentioned below.
 .SH AVAILABLE INFORMATION
 The following information can be extracted:
 .IP CURLINFO_EFFECTIVE_URL
@@ -107,6 +110,9 @@ CURLOPT_HTTPAUTH option for \fIcurl_easy_setopt(3)\fP.  (Added in 7.10.8)
 .IP CURLINFO_PROXYAUTH_AVAIL
 Pass a pointer to a long to receive a bitmask indicating the authentication
 method(s) available for your proxy authentication.  (Added in 7.10.8)
+.IP CURLINFO_OS_ERRNO
+Pass a pointer to a long to receive the errno variable from a connect failure.
+(Added in 7.12.2)
 .SH RETURN VALUE
 If the operation was successful, CURLE_OK is returned. Otherwise an
 appropriate error code will be returned.

docs/libcurl/curl_easy_init.3

@@ -1,5 +1,3 @@
-.\" You can view this file with:
-.\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_init 3 "4 March 2002" "libcurl 7.8.1" "libcurl Manual"
@@ -20,4 +18,4 @@ initializes curl and this call \fBMUST\fP have a corresponding call to
 If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
-.BR curl_easy_cleanup "(3), " curl_global_init "(3)
+.BR curl_easy_cleanup "(3), " curl_global_init "(3), " curl_easy_reset "(3)"

docs/libcurl/curl_easy_reset.3

@@ -0,0 +1,24 @@
+.\" $Id$
+.\"
+.TH curl_easy_reset 3 "31 July 2004" "libcurl 7.12.1" "libcurl Manual"
+.SH NAME
+curl_easy_reset - reset all options of a libcurl session handle
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+
+.BI "void curl_easy_reset(CURL *"handle ");"
+
+.SH DESCRIPTION
+Re-initializes all options previously set on a specified CURL handle to the
+default values. This puts back the handle to the same state as it was in when
+it was just created with \fIcurl_easy_init(3)\fP.
+
+It does not change the following information kept in the handle: live
+connections, the Session ID cache, the DNS cache, the cookies and shares.
+
+This function was added in libcurl 7.12.1.
+.SH RETURN VALUE
+Nothing
+.SH "SEE ALSO"
+.BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_setopt "(3)
+

docs/libcurl/curl_easy_setopt.3

@@ -32,16 +32,17 @@ CURLcode curl_easy_setopt(CURL *handle, CURLoption option, parameter);
 curl_easy_setopt() is used to tell libcurl how to behave. By using the
 appropriate options to \fIcurl_easy_setopt\fP, you can change libcurl's
 behavior.  All options are set with the \fIoption\fP followed by a
-\fIparameter\fP. That parameter can be a long, a function pointer or an object
-pointer, all depending on what the specific option expects. Read this manual
-carefully as bad input values may cause libcurl to behave badly!  You can only
-set one option in each function call. A typical application uses many
-curl_easy_setopt() calls in the setup phase.
+\fIparameter\fP. That parameter can be a \fBlong\fP, a \fBfunction pointer\fP,
+an \fBobject pointer\fP or a \fBcurl_off_t\fP, depending on what the specific
+option expects. Read this manual carefully as bad input values may cause
+libcurl to behave badly!  You can only set one option in each function call. A
+typical application uses many curl_easy_setopt() calls in the setup phase.
 
 Options set with this function call are valid for all forthcoming transfers
 performed using this \fIhandle\fP.  The options are not in any way reset
 between transfers, so if you want subsequent transfers with different options,
-you must change them between the transfers.
+you must change them between the transfers. You can optionally reset all
+options back to internal default with \fIcurl_easy_reset(3)\fP.
 
 \fBNOTE:\fP strings passed to libcurl as 'char *' arguments, will not be
 copied by the library. Instead you should keep them available until libcurl no
@@ -92,6 +93,9 @@ of bytes actually taken care of. If that amount differs from the amount passed
 to your function, it'll signal an error to the library and it will abort the
 transfer and return \fICURLE_WRITE_ERROR\fP.
 
+This function may be called with zero bytes data if the transfered file is
+empty.
+
 Set the \fIstream\fP argument with the \fICURLOPT_WRITEDATA\fP option.
 
 \fBNOTE:\fP you will be passed as much data as possible in all invokes, but
@@ -119,6 +123,15 @@ filled with at most \fIsize\fP multiplied with \fInmemb\fP number of
 bytes. Your function must return the actual number of bytes that you stored in
 that memory area. Returning 0 will signal end-of-file to the library and cause
 it to stop the current transfer.
+
+If you stop the current transfer by returning 0 "pre-maturely" (i.e before the
+server expected it, like when you've told you will upload N bytes and you
+upload less than N bytes), you may experience that the server "hangs" waiting
+for the rest of the data that won't come.
+
+In libcurl 7.12.1 and later, the read callback may return
+\fICURL_READFUNC_ABORT\fP to stop the current operation at once, with a
+\fICURLE_ABORTED_BY_CALLBACK\fP error code from the transfer.
 .IP CURLOPT_READDATA
 Data pointer to pass to the file read function. Note that if you specify the
 \fICURLOPT_READFUNCTION\fP, this is the pointer you'll get as input. If you
@@ -456,23 +469,49 @@ redirections have been followed, the next redirect will cause an error
 .IP CURLOPT_PUT
 A non-zero parameter tells the library to use HTTP PUT to transfer data. The
 data should be set with \fICURLOPT_READDATA\fP and \fICURLOPT_INFILESIZE\fP.
+
+This option is deprecated and starting with version 7.12.1 you should instead
+use \fICURLOPT_UPLOAD\fP.
 .IP CURLOPT_POST
-A non-zero parameter tells the library to do a regular HTTP post. This is a
-normal application/x-www-form-urlencoded kind, which is the most commonly used
-one by HTML forms. See the \fICURLOPT_POSTFIELDS\fP option for how to specify
-the data to post and \fICURLOPT_POSTFIELDSIZE\fP in how to set the data
-size. Using the \fICURLOPT_POSTFIELDS\fP option implies this option.
+A non-zero parameter tells the library to do a regular HTTP post. This will
+also make the library use the a "Content-Type:
+application/x-www-form-urlencoded" header. (This is by far the most commonly
+used POST method).
+
+Use the \fICURLOPT_POSTFIELDS\fP option to specify what data to post and
+\fICURLOPT_POSTFIELDSIZE\fP to set the data size. Optionally, you can provide
+data to POST using the \fICURLOPT_READFUNCTION\fP and \fICURLOPT_READDATA\fP
+options.
+
+You can override the default POST Content-Type: header by setting your own
+with \fICURLOPT_HTTPHEADER\fP.
+
+Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
+You can disable this header with \fICURLOPT_HTTPHEADER\fP as usual.
+
+If you use POST to a HTTP 1.1 server, you can send data without knowing the
+size before starting the POST if you use chunked encoding. You enable this by
+adding a header like "Transfer-Encoding: chunked" with
+\fICURLOPT_HTTPHEADER\fP. With HTTP 1.0 or without chunked transfer, you must
+specify the size in the request.
+
+NOTE: if you have issued a POST request and want to make a HEAD or GET
+instead, you must explictly pick the new request type using
+\fICURLOPT_NOBODY\fP or \fICURLOPT_HTTPGET\fP or similar.
 .IP CURLOPT_POSTFIELDS
 Pass a char * as parameter, which should be the full data to post in an HTTP
-post operation. You need to make sure that the data is formatted the way you
-want the server to receive it. libcurl will not convert or encode it for
-you. Most web servers will assume this data to be url-encoded. Take note.
+POST operation. You must make sure that the data is formatted the way you want
+the server to receive it. libcurl will not convert or encode it for you. Most
+web servers will assume this data to be url-encoded. Take note.
 
 This POST is a normal application/x-www-form-urlencoded kind (and libcurl will
 set that Content-Type by default when this option is used), which is the most
 commonly used one by HTML forms. See also the \fICURLOPT_POST\fP. Using
 \fICURLOPT_POSTFIELDS\fP implies \fICURLOPT_POST\fP.
 
+Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
+You can disable this header with \fICURLOPT_HTTPHEADER\fP as usual.
+
 \fBNote:\fP to make multipart/formdata posts (aka rfc1867-posts), check out
 the \fICURLOPT_HTTPPOST\fP option.
 .IP CURLOPT_POSTFIELDSIZE
@@ -493,6 +532,9 @@ list of 'struct HttpPost' structs properly filled in. The best and most
 elegant way to do this, is to use \fIcurl_formadd(3)\fP as documented. The
 data in this list must remain intact until you close this curl handle again
 with \fIcurl_easy_cleanup(3)\fP.
+
+Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
+You can disable this header with \fICURLOPT_HTTPHEADER\fP as usual.
 .IP CURLOPT_REFERER
 Pass a pointer to a zero terminated string as parameter. It will be used to
 set the Referer: header in the http request sent to the remote server. This
@@ -522,6 +564,8 @@ The first line in a request (usually containing a GET or POST) is not a header
 and cannot be replaced using this option. Only the lines following the
 request-line are headers.
 
+Pass a NULL to this to reset back to no custom headers.
+
 \fBNOTE:\fP The most commonly replaced headers have "shortcuts" in the options
 \fICURLOPT_COOKIE\fP, \fICURLOPT_USERAGENT\fP and \fICURLOPT_REFERER\fP.
 .IP CURLOPT_HTTP200ALIASES
@@ -583,7 +627,7 @@ cookies are cookies without expiry date and they are meant to be alive and
 existing for this "session" only.
 .IP CURLOPT_HTTPGET
 Pass a long. If the long is non-zero, this forces the HTTP request to get back
-to GET. Only really usable if POST, PUT or a custom request have been used
+to GET. usable if a POST, HEAD, PUT or a custom request have been used
 previously using the same curl handle.
 .IP CURLOPT_HTTP_VERSION
 Pass a long, set to one of the values described below. They force libcurl to
@@ -676,6 +720,18 @@ Require SSL for the control connection or fail with \fICURLE_FTP_SSL_FAILED\fP.
 .IP CURLFTPSSL_ALL
 Require SSL for all communication or fail with \fICURLE_FTP_SSL_FAILED\fP.
 .RE
+.IP CURLOPT_FTPSSLAUTH
+Pass a long using one of the values from below, to alter how libcurl issues
+\&"AUTH TLS" or "AUTH SSL" when FTP over SSL is activated (see
+\fICURLOPT_FTP_SSL\fP).
+.RS
+.IP CURLFTPAUTH_DEFAULT
+Allow libcurl to decide
+.IP CURLFTPAUTH_SSL
+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
 .SH PROTOCOL OPTIONS
 .IP CURLOPT_TRANSFERTEXT
 A non-zero parameter tells the library to use ASCII mode for ftp transfers,
@@ -692,13 +748,14 @@ want. It should be in the format "X-Y", where X or Y may be left out. HTTP
 transfers also support several intervals, separated with commas as in
 \fI"X-Y,N-M"\fP. Using this kind of multiple intervals will cause the HTTP
 server to send the response document in pieces (using standard MIME separation
-techniques).
+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.
+want the transfer to start from. Set this option to 0 to make the transfer
+start from the beginning (effectively disabling resume).
 .IP CURLOPT_RESUME_FROM_LARGE
-Pass an 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)
+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)
 .IP CURLOPT_CUSTOMREQUEST
 Pass a pointer to a zero terminated string as parameter. It will be user
 instead of GET or HEAD when doing an HTTP request, or instead of LIST or NLST
@@ -706,6 +763,8 @@ when doing an ftp directory listing. This is useful for doing DELETE or other
 more or less obscure HTTP requests. Don't do this at will, make sure your
 server supports the command first.
 
+Restore to the internal default by setting this to NULL.
+
 \fBNOTE:\fP Many people have wrongly used this option to replace the entire
 request with their own, including multiple headers and POST contents. While
 that might work in many cases, it will cause libcurl to send invalid requests
@@ -723,6 +782,10 @@ can be used after a transfer to extract the received time (if any).
 A non-zero parameter tells the library to not include the body-part in the
 output. This is only relevant for protocols that have separate header and body
 parts. On HTTP(S) servers, this will make libcurl do a HEAD request.
+
+To change back to GET, you should use \fICURLOPT_HTTPGET\fP. To change back to
+POST, you should use \fICURLOPT_POST\fP. Setting \fICURLOPT_NOBODY\fP to zero
+has no effect.
 .IP CURLOPT_INFILESIZE
 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
@@ -733,8 +796,19 @@ libcurl what the expected size of the infile is.  This value should be passed
 as a curl_off_t. (Added in 7.11.0)
 .IP CURLOPT_UPLOAD
 A non-zero parameter tells the library to prepare for an upload. The
-\fICURLOPT_READDATA\fP and \fICURLOPT_INFILESIZE_LARGE\fP are also interesting
-for uploads.
+\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
+libcurl otherwise.
+
+Using PUT with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
+You can disable this header with \fICURLOPT_HTTPHEADER\fP as usual.
+
+If you use PUT to a HTTP 1.1 server, you can upload data without knowing the
+size before starting the transfer if you use chunked encoding. You enable this
+by adding a header like "Transfer-Encoding: chunked" with
+\fICURLOPT_HTTPHEADER\fP. With HTTP 1.0 or without chunked transfer, you must
+specify the size.
 .IP CURLOPT_MAXFILESIZE
 Pass a long as parameter. This allows you to specify the maximum size (in
 bytes) of a file to download. If the file requested is larger than this value,
@@ -960,5 +1034,9 @@ standard for details.
 CURLE_OK (zero) means that the option was set properly, non-zero means an
 error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors(3)\fP
 man page for the full list with descriptions.
+
+If you try to set an option that libcurl doesn't know about, perhaps because
+the library is too old to support it or the option was removed in a recent
+version, this function will return \fICURLE_FAILED_INIT\fP.
 .SH "SEE ALSO"
-.BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
+.BR curl_easy_init "(3), " curl_easy_cleanup "(3), " curl_easy_reset "(3), "

docs/libcurl/curl_easy_strerror.3

@@ -12,6 +12,8 @@ curl_easy_strerror - return string describing error code
 .SH DESCRIPTION
 The curl_easy_strerror() function returns a string describing the CURLcode
 error code passed in the argument \fIerrornum\fP.
+
+This function was added in libcurl 7.12.0
 .SH RETURN VALUE
 A pointer to a zero terminated string.
 .SH "SEE ALSO"

docs/libcurl/curl_formadd.3

@@ -26,6 +26,9 @@ NULL in the first call to this function. All list-data will be allocated by
 the function itself. You must call \fIcurl_formfree\fP after the form post has
 been done to free the resources again.
 
+Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue" header.
+You can disable this header with \fICURLOPT_HTTPHEADER\fP as usual.
+
 First, there are some basics you need to understand about multipart/formdata
 posts. Each part consists of at least a NAME and a CONTENTS part. If the part
 is made for file upload, there are also a stored CONTENT-TYPE and a
@@ -126,8 +129,8 @@ defines.
 .SH EXAMPLE
 .nf
 
- struct HttpPost* post = NULL;
- struct HttpPost* last = NULL;
+ struct curl_httppost* post = NULL;
+ struct curl_httppost* last = NULL;
  char namebuffer[] = "name buffer";
  long namelength = strlen(namebuffer);
  char buffer[] = "test buffer";
@@ -205,5 +208,4 @@ defines.
 
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3), "
-.BR curl_formparse "(3) [deprecated], "
 .BR curl_formfree "(3)"

docs/libcurl/curl_getdate.3

@@ -4,35 +4,36 @@
 .\"
 .TH curl_getdate 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
-curl_getdate - Convert an date in a ASCII string to number of seconds since
-January 1, 1970
+curl_getdate - Convert an date string to number of seconds since January 1,
+1970
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "time_t curl_getdate(char *" datestring ", time_t *"now" );
+.BI "time_t curl_getdate(char *" datestring ", time_t *"now" );"
 .ad
 .SH DESCRIPTION
-This function returns the number of seconds since January 1st 1970, for the
-date and time that the
-.I datestring
-parameter specifies. The 
-.I now
-parameter is there and should hold the current time to allow the datestring to
-specify relative dates/times. Read further in the date string parser section
-below.
+This function returns the number of seconds since January 1st 1970 in the UTC
+time zone, for the date and time that the \fIdatestring\fP parameter
+specifies. The \fInow\fP parameter is not used, pass a NULL there.
+
+\fBNOTE:\fP This function was rewritten for the 7.12.2 release and this
+documentation covers the functionality of the new one. The new one is not
+feature-complete with the old one, but most of the formats supported by the
+new one was supported by the old too.
 .SH PARSING DATES AND TIMES
-A "date" is a string, possibly empty, containing many items separated by
-whitespace.  The whitespace may be omitted when no ambiguity arises.  The
-empty string means the beginning of today (i.e., midnight).  Order of the
-items is immaterial.  A date string may contain many flavors of items:
+A "date" is a string containing several items separated by whitespace. The
+order of the items is immaterial.  A date string may contain many flavors of
+items:
 .TP 0.8i
 .B calendar date items
-This can be specified in a number of different ways. Including 1970-09-17, 70-9-17, 70-09-17, 9/17/72, 24 September 1972, 24 Sept 72, 24 Sep 72, Sep 24, 1972, 24-sep-72, 24sep72.
-The year can also be omitted, for example: 9/17 or "sep 17".
+Can be specified several ways. Month names can only be three-letter
+abbrivations, numbers can be zero-prefixed and the year may use 2 or 4 digits.
+Examples: 06 Nov 1994, 06-Nov-94 and Nov-94 6.
 .TP
 .B time of the day items
-This string specifies the time on a given day. Syntax supported includes:
-18:19:0, 18:19, 6:19pm, 18:19-0500 (for specifying the time zone as well).
+This string specifies the time on a given day. You must specify it with 6
+digits with two colons: HH:MM:SS. To not include the time in a date string,
+will make the function assume 00:00:00. Example: 18:19:21.
 .TP
 .B time zone items
 Specifies international time zone. There are a few acronyms supported, but in
@@ -40,41 +41,52 @@ general you should instead use the specific relative time compared to
 UTC. Supported formats include: -1200, MST, +0100.
 .TP
 .B day of the week items
-Specifies a day of the week. If this is mentioned alone it means that day of
-the week in the future.
-
-Days of the week may be spelled out in full: `Sunday', `Monday', etc or they
-may be abbreviated to their first three letters, optionally followed by a
-period.  The special abbreviations `Tues' for `Tuesday', `Wednes' for
-`Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed.
-
-A number may precede a day of the week item to move forward supplementary
-weeks.  It is best used in expression like `third monday'.  In this context,
-`last DAY' or `next DAY' is also acceptable; they move one week before or
-after the day that DAY by itself would represent.
-.TP
-.B relative items
-A relative item adjusts a date (or the current date if none) forward or
-backward. Example syntax includes: "1 year", "1 year ago", "2 days", "4
-weeks".
-
-The string `tomorrow' is worth one day in the future (equivalent to `day'),
-the string `yesterday' is worth one day in the past (equivalent to `day ago').
+Specifies a day of the week. Days of the week may be spelled out in full:
+`Sunday', `Monday', etc or they may be abbreviated to their first three
+letters. This is usually not info that adds anything.
 .TP
 .B pure numbers
-If the decimal number is of the form YYYYMMDD and no other calendar date item
-appears before it in the date string, then YYYY is read as the year, MM as the
-month number and DD as the day of the month, for the specified calendar date.
+If a decimal number of the form YYYYMMDD appears, then YYYY is read as the
+year, MM as the month number and DD as the day of the month, for the specified
+calendar date.
 .PP
+.SH EXAMPLES
+.nf
+Sun, 06 Nov 1994 08:49:37 GMT
+Sunday, 06-Nov-94 08:49:37 GMT
+Sun Nov  6 08:49:37 1994
+06 Nov 1994 08:49:37 GMT
+06-Nov-94 08:49:37 GMT
+Nov  6 08:49:37 1994
+06 Nov 1994 08:49:37
+06-Nov-94 08:49:37
+1994 Nov 6 08:49:37
+GMT 08:49:37 06-Nov-94 Sunday
+94 6 Nov 08:49:37
+1994 Nov 6
+06-Nov-94
+Sun Nov 6 94
+1994.Nov.6
+Sun/Nov/6/94/GMT
+Sun, 06 Nov 1994 08:49:37 CET
+06 Nov 1994 08:49:37 EST
+Sun, 12 Sep 2004 15:05:58 -0700
+Sat, 11 Sep 2004 21:32:11 +0200
+20040912 15:05:58 -0700
+20040911 +0200
+.fi
+.SH STANDARDS
+This parser was written to handle date formats specified in RFC 822 (including
+the update in RFC 1123) using time zone name or time zone delta and RFC 850
+(obsoleted by RFC 1036) and ANSI C's asctime() format. These formats are the
+only ones RFC2616 says HTTP applications may use.
 .SH RETURN VALUE
-This function returns zero when it fails to parse the date string. Otherwise
-it returns the number of seconds as described.
-.SH AUTHORS
-Originally written by Steven M. Bellovin <smb@research.att.com> while at the
-University of North Carolina at Chapel Hill.  Later tweaked by a couple of
-people on Usenet.  Completely overhauled by Rich $alz <rsalz@bbn.com> and Jim
-Berets <jberets@bbn.com> in August, 1990.
+This function returns -1 when it fails to parse the date string. Otherwise it
+returns the number of seconds as described.
+.SH REWRITE
+The former version of this function was built with yacc and was not only very
+large, it was also never quite understood and it wasn't possible to build with
+non-GNU tools since only Bison could make it thread-safe!
 
-It has been modified extensively since imported to curl.
-.SH "SEE ALSO"
-.BR GNU date(1)
+The rewrite was done for 7.12.2. The new one is much smaller and use simpler
+code.

docs/libcurl/curl_multi_perform.3

@@ -16,6 +16,13 @@ function does not require that there actually is any data available for
 reading or that data can be written, it can be called just in case. It will
 write the number of handles that still transfer data in the second argument's
 integer-pointer.
+
+When you call curl_multi_perform() and the amount of \fIrunning_handles\fP is
+changed from the previous call (or is less than the amount of easy handles
+you've added to the multi handle), you know that there is one or more
+transfers less "running". You can then call \fIcurl_multi_info_read(3)\fP to
+get information about each individual completed transfer, and that returned
+info includes CURLcode and more.
 .SH "RETURN VALUE"
 CURLMcode type, general libcurl multi interface error code.
 
@@ -34,4 +41,5 @@ file descriptors, then it'll wait for action on them using select() and as
 soon as one or more of them are ready, \fIcurl_multi_perform(3)\fP gets
 called.
 .SH "SEE ALSO"
-.BR curl_multi_cleanup "(3)," curl_multi_init "(3)," curl_multi_fdset "(3)"
+.BR curl_multi_cleanup "(3), " curl_multi_init "(3), "
+.BR curl_multi_fdset "(3), " curl_multi_info_read "(3)"