irix configure fix and a msvc project file update

libs we want. $libsuff is the magic variable that contains a suffix (which
might be blank). Tor Arntsen brought details and verified this fix.

CHANGES

@@ -6,6 +6,740 @@
 
                                   Changelog
 
+Daniel (18 March 2004)
+- Tor Arntsen brought some info about SGI IRIX:
+
+  IRIX supports 3 different executable/object formats, -32, -n32 and -64.
+  -n32 is default 32-bit format, -32 is the "old" 32-bit format, and -64 is
+  the 64-bit format.  Libraries for the different formats are in lib, lib32
+  and lib64 respectively.
+
+  We've now adjusted the configure script to adapt to this when scanning for
+  3rd party libs, such as OpenSSL.
+
+Daniel (17 March 2004)
+- Watz pointed out a few missing files in the MSVC project description file.
+
+- G<>nter Knauf brought patches, code and makefiles to build curl on Novell
+  NetWare.
+
+Daniel (15 March 2004)
+- Lots of libcurl man pages were updated to contain references to other man
+  pages the recognized way so that they appear as nice hyperlinks in the HTML
+  versions.
+
+- buildconf now checks the m4 version too, since autoconf requires a GNU m4
+  version to build proper configure scripts.
+
+Daniel (12 March 2004)
+- Added CURLOPT_POSTFIELDSIZE_LARGE, the large file version of
+  CURLOPT_POSTFIELDSIZE to allow POSTs larger than 2GB.
+
+- David Byron fixed an uninitialized variable case/crash.
+
+Daniel (10 March 2004)
+- Jeff Lawson fixed the SSL connection to deal with received signals during the
+  connect.
+
+- Changed the OS string for win32 to become "i386-pc-win32".
+
+Daniel (9 March 2004)
+- Changed the internals to use curl_socket_t for socket variable type. This
+  should enable us to build with less warnings on Windows, where SOCKET is
+  used which is an unsigned int, while most other platforms use a mere int.
+
+- Modified lib/config-win32.h to build fine on MSVC again.
+
+Version 7.11.1-pre1 (8 March 2004)
+
+Daniel (8 March 2004)
+- Minor fix to make curl CURL_VERSION_LARGEFILE is only set if curl_off_t is
+  larger than 4 bytes.
+
+Daniel (4 March 2004)
+- Improved PUT/POST with NTLM/Digest authentication, the so called issue 12.
+
+- Modified the test HTTP server a lot to work with the upcoming changes for
+  PUT/POST with NTLM/Digest authentication (like test case 88). Added Andr<64>s
+  Garc<72>a's win32-changes. Improved the logging.
+
+- Fixed the file:-related progress/getinfo stuff a bit more.
+
+Daniel (4 March 2004)
+- I corrected a problem with the multi interface when following a Location:
+  header or when doing multiple-request authentications. A subsequent request
+  could erroneously re-use a previous connection that was sent with
+  Connection: close. Christopher R. Palmer reported.
+
+- Andr<64>s Garc<72>a patched curl to prevent warnings while compiling with mingw,
+  mainly because it is now possible to have both WIN32 and HAVE_CONFIG_H
+  defined.
+
+- When transferring files from a file: URL, the progress meter and other
+  transfer metrics were not updated properly.
+
+- David Byron provided a "version resource" file to the curl executable for
+  the windows builds.
+
+Daniel (3 March 2004)
+- David Byron's work on making libcurl only require winsock 1.1 on Windows
+  machines.
+
+- More variable cleanups based on compiler warnings generated by Tor Arntsen's
+  autobuilds with MIPSPro.
+
+- Joe Halpin helped us fix some pedantic compiler warnings on FreeBSD.
+
+- Applied Tom Bates' patch to build on nsr-tandem-nsk.
+
+- Dan Fandrich corrected some flaws in the configure GSS detection.
+
+Daniel (2 March 2004)
+- Fixed the libcurl code to use FORMAT_OFF_T for printf() formatting
+  curl_off_t types internally.
+
+Daniel (1 March 2004)
+- Added CURL_VERSION_LARGEFILE as a feature-bit in the curl_version_info()
+  response, that signals if this libcurl supports >2GB files. curl -V now
+  outputs 'Largefile' in the Features: field if this is the case. Most systems
+  are likely to support this.
+
+- We offer a CURL_FORMAT_OFF_T define in the public header, which can be used
+  to printf() curl_off_t variables. We also modified the libcurl sources to
+  use this define instead of the previous %Od approach (although I've left the
+  O-flag functional in the code). This should also prevent compilers to warn
+  on the home-grown option.
+
+- Fixed the resume-check code to test for a working resume at the end of the
+  headers and not at the first body-byte.
+
+- CURLOPT_DNS_USE_GLOBAL_CACHE is now considered obsolete. Stop using it. If
+  you need a global DNS cache for whatever reason, use the share interface and
+  you'll get a global cache that works the way it should work. You can even
+  have any number of global caches, all at your command. This is now also
+  mentioned in the docs.
+
+- Made the *printf code support the z-flag to enable size_t printf() in a
+  manner similar to how glibc allows it. To make printfing of this work on
+  platforms with 64bit size_t and 32bit ints. If there even are any! ;-)
+
+- Christopher R. Palmer discovered that if you CURLOPT_FRESH_CONNECT and
+  CURLAUTH_NTLM (or CURLAUTH_ANY and libcurl then picked NTLM), libcurl would
+  loop without succeeding to authenticate due to the new connection that was
+  made for all round-trips in the authentication. Now, the FRESH_CONNECT is
+  remade to only matter for the first connection made with curl_easy_perform()
+  and all the rest that might follow due to FOLLOWLOCATION or HTTP
+  authentication are now ignoring that option.
+
+- Adjusted the QUIT code slightly since it could core-dump.
+
+- Corrected the test suite's FTP server to provide a correct size to the
+  'verifiedserver' request.
+
+Daniel (27 February 2004)
+- Joe Halpin made the FTP code send QUIT on the control connection before
+  disconnecting the TCP connection. This is what good-behaving ftp clients
+  should do.
+
+Daniel (26 February 2004)
+- David Byron updated several files to make curl build fine on MSVC 6. He
+  also added the 'buildconf.bat' that works like the 'buildconf + configure'
+  combo does on unixes.
+
+- Gisle Vanem made the memdebug stuff support calloc() as well.
+
+- Tor Arntsen pointed out that testcurl.sh needed to remove the generated
+  files in order to have them re-generated in each build.
+
+- Andy Serpa found out that the share interface did not enjoy life when not
+  having the lock and unlock callbacks set, even though documented to be
+  OK. It still is OK, and now the code won't segfault anymore!
+
+Daniel (25 February 2004)
+- Based on a patch by Greg Hewgill I modified how long long is used in the
+  mprintf code, as we can use a 64bit type with MSVC that is a long long
+  equivalent. This corrects some weird large file behaviors on windows.
+
+- Tor Arntsen helped me work out --enable-debug to work better with different
+  versions of the gcc and icc compilers.
+
+- Added CURLOPT_SHARE to the curl_easy_setopt.3 man page.
+
+Daniel (22 February 2004)
+- Applied the final pieces of Gisle Vanem's patch that brings a working name
+  resolve timeout to the windows versions of curl!
+
+Daniel (21 February 2004)
+- David Byron's fix to allow the speed-limit logic work even if you set
+  limit-rate. It does work on the expense of the rate limiter.
+
+Daniel (20 February 2004)
+- configure --enable-debug with gcc now also tries to detect the icc compiler
+  (which somehow gets treated as if it is a gcc) to stop using all the gcc
+  options with it, and we also provide -isystem options for each extra -I
+  option the configure script has figured out (for OpenSSL, kerberos, zlib,
+  Heimdal etc). This of course to prevent warnings on headers we don't have
+  control of.
+
+Daniel (19 February 2004)
+- Doug Porter made libcurl use the HOME environment variable before the
+  getpwuid results when looking for .netrc files.
+
+- If 'configure --enable-debug' is used with gcc, it now checks which gcc
+  version it is and uses as picky compiler options as possible for the
+  particular version.
+
+- Code that can be used in both the lib and in the curl app is now made to use
+  the curlx_ prefix. The first function to be available like this is the
+  curlx_strtoll() function. This is made to allow the app to use existing code,
+  but without polluting the libcurl API. Further explanations posted here:
+
+    http://curl.haxx.se/mail/lib-2004-02/0215.html
+
+Daniel (18 February 2004)
+- Fixed buildconf to not use "which" as AIX and Tru64 have what have been
+  referred to as "horribly broken 'which' programs".
+
+- Made sure dns cache timeout set to -1 really means caching forever.
+
+Daniel (17 February 2004)
+- Made it possibly to build c-ares with the libcurl memdebug system to better
+  track memory.
+
+Daniel (16 February 2004)
+- When using ares, we now initialize the ares 'channel' in curl_easy_init()
+  and re-use that same handle during the entire curl handle's life-time. It
+  improves performance.
+
+- Fixed a problem when displaying verbose for ipv6-enabled libcurls and
+  re-used connections. Problem reported and fix verified by Grigory Entin.
+
+- Jeff Lawson fixed the version-check in the SOCKS5 code.
+
+Daniel (15 February 2004)
+- Fixed a case where a host cache entry was not flagged in-use properly when a
+  cached entry was used.
+
+- Andr<64>s Garc<72>a's patch that checks for winmm in the configure script was
+  applied.
+
+Daniel (13 February 2004)
+- Ben Greear's SO_BINDTODEVICE patch for the binding of the local end to a
+  specific network interface.
+
+- Greg Hewgill found out that the variable holding 'contentlength' wasn't big
+  enough to hold a large file!
+
+- Tor Arntsen fixed a 64bit-related problem in date-related code in the ftp
+  department, and there was another potential problem in the name resolve code
+  too.
+
+Daniel (11 February 2004)
+- Removed a few variables that were only set but never used, as some compilers
+  warn about that and we do not like compiler warnings!
+
+- Removed the need for symlinks in the tests/data directory if curl is built
+  outside of the source directory and the 'make test' is used. This was done
+  by providing a "source dir path" to the scripts/servers.
+
+- Now, if the configure script can't find an nroff tool or an option to nroff
+  to use to convert man pages with, it will completely switch off the built-in
+  manual.
+
+- 'configure --disable-manual' completely disables the built-in manual from
+  the curl command tool.
+
+- Andr<64>s Garc<72>a fixed the configure script and a minor source edit, and now
+  he has managed to get msys/mingw to run configure and then build!
+
+Daniel (9 February 2004)
+- The default HTTP Accept: header was modified to the much simpler
+  "Accept: */*".
+
+- P R Schaffner updated the curl-ssl spec file for RPMs.
+
+- Dominick Meglio brought lots of documentation for the share interface's man
+  pages that were previously missing.
+
+- Tor Arntsen provided a patch that makes libcurl work-around a bug in the
+  AIX5 implementation of getaddrinfo(). This makes the FTP PORT stuff work on
+  ipv6-enabled AIX builds.
+
+- Ken Rastatter provided portability fixes for the curlgtk.c example, and now
+  it runs on windows with GTK as well!
+
+Daniel (6 February 2004)
+- Andr<64>s Garc<72>a made the configure script find gethostbyname() fine when run
+  with mingw on windows.
+
+- Modified the ldap code to use proper function pointers all over (instead of
+  mixed data and function pointers) to work-around the picky MIPSPro compiler
+  warnings.
+
+- A custom Host: header is only considered if the request is not made by
+  following a location. After discussions with Tim Baker.
+
+Daniel (5 February 2004)
+- The libz part of the configure script now only set the two libz-related
+  define HAVE_ZLIB_H and HAVE_LIBZ if both the lib and the header is found.
+  If one is missing, none of the defines is set.
+
+- Andr<64>s Garc<72>a fixed the Mingw makefiles.
+
+- Len Krause reported that curl 7.9.X could do uploading from stdin without
+  doing chunked encoding, which current curl cannot do even if you disable
+  the transfer-encoding chunked header. Now it can again, and test case 98
+  verifies this functionality.
+
+- Tor Arntsen fixed a weird getaddrinfo() usage in the FTP code, preventing
+  the ipv6-code for PORT work on AIX 5.2. We now also provide (better) error
+  messages when bailing out in the that function.
+
+- Tor Arntsen now provides AIX and IRIX (using gcc, xlc and the MIPSPro
+  compilers) automated build logs (http://curl.haxx.se/auto/) and we've fixed
+  numerous minor quirks to make less warnings appear.
+
+Daniel (4 February 2004)
+- Based on a patch by Gilad, we now use the custom timeouts when waiting for a
+  server to connect when using FTP PORT. Previously we always waited 10
+  seconds, no more no less. We now also changed the default (if no timeout is
+  set) to wait 60 seconds for the connect before we fail.
+
+Daniel (3 February 2004)
+- Modified to link with c-ares instead of ares.
+
+Daniel (2 February 2004)
+- Added a configure test to check for which option the (g)nroff tool wants
+  to extract plain text from the man pages. Tor Arntsen told us the AIX
+  version of GNU gnroff doesn't support -man!
+
+- Added an undef of accept in memdebug.h to make curl build with --enable-debug
+  on AIX 5.2 which seems to have accept defined. Reported by Tor Arntsen.
+
+- curl_version() now includes c-ares version info, and curl_version_info() now
+  returns a struct with version SECOND that also includes that info.
+
+- We are now officially using c-ares for asynch name resolves. c-ares is the
+  new library, based on the existing ares but with an extended and slightly
+  modified API.
+
+- Dirk improved the ares timeout code, and now we also include the ares error
+  string when we fail to resolve a name.
+
+- Another tweak to make test case 91 run fine. Now we have another bit on a
+  connection that is set true if the connection is marked for 'retry'. That
+  makes the connection get closed and re-opened and the HTTP-done code must
+  not complain on the fact that no data was received.
+
+- Based on Dirk Manske's patch, I modified the name resolving with ares to
+  feature a timeout for really slow lookups. It now defaults to 300 seconds,
+  but is now adjusted to the CONNECTTIMEOUT/TIMOUE timeouts if one of them
+  is set.
+
+- Fixed the inclusion of ca-bundle.h to really use the one in the build dir
+  before the one in the source dir. Domenico Andreoli found out and reported.
+
+- Added test case 97, a simple POST with a custom Content-Type header
+  replacing the original application/x-www-form-urlencoded one.
+
+Daniel (30 January 2004)
+- Added code that attempts to fix the test 91 failure. As has been figured out
+  by Patrick Smith, the error happens because we re-use a connection that the
+  server is just about to close and we even manage to send away the request
+  without seeing an error. On the first read attempt we get a ECONNRESET.
+  Starting now, we attempt to detect this and if so, we retry the request on a
+  fresh connection.
+
+- I added test case 510 which is a custom program that does a POST using a
+  read callback, with chunked transfer-encoding.
+
+- Adjusted one of the MPE/iX changes as it made test case 504 fail all over.
+
+- Added --socks as a recognized option. It works just like --proxy but sets a
+  SOCKS5 proxy to use. SOCKS5 support has been available in libcurl for a
+  while, just not provided by the curl tool. This does not currently work for
+  IPv6-enabled libcurls.
+
+Daniel (29 January 2004)
+- Stadler Stephan pointed out that src/hugehelp.c included config.h without
+  checking the define if its present...
+
+- Ken Hirsch provided patches to make curl build fine on the MPE/iX operating
+  system.
+
+- Dan Fandrich compiled curl with lots of aggressively pedantic compiler
+  options and thus found a few minor errors and did some general cleanups to
+  avoid them.
+
+- Dirk Manske fixed a flaw in ares that prevented it to use non-blocking
+  sockets properly.
+
+Daniel (28 January 2004)
+- Richard Bramante fixed chunked transfer-encoded "uploads" to send a final
+  CRLF combo properly.
+
+Daniel (27 January 2004)
+- Made the response-headers during a CONNECT request to a proxy get passed on
+  as regular headers, so they appear with -i/-I options and similar.
+
+- Based on a patch by Gisle Vanem, I've made the progress meter display
+  properly switch to a GB-display when more than 9999MB have been transfered.
+
+Daniel (23 January 2004)
+- Gisle Vanem pointed out a curlrc parser problem/crash when an option with a
+  required didn't have one and was on the last line of a file.
+
+- More Windows fixes for large files. We now build and link with
+  ../lib/strtoofft.c in the app code since Curl_strtoll() is not a provided
+  libcurl function... Perhaps we should consider a 'common' dir or similar
+  where we put source code used in both the lib and the client. Or perhaps
+  we'll just make this function available in the library...
+
+- Vincent Bronner found out the socks5 code crashed when no username was
+  set.
+
+- Vincent Bronner spotted a problem with proxy username/password when re-using
+  a persistent connection.
+
+- Fixed the progress meter display for files larger than 2^31 bytes. Gisle
+  Vanem reported.
+
+Daniel (22 January 2004)
+- Gisle Vanem made strtoll() get used when curl is built with the mingw
+  compiler.
+
+- Gisle Vanem fixed the compressed help text code to display properly.
+
+- Removed the '#define HttpPost' from the public header file, as curl_httppost
+  is the proper name and it has been for quite some time now. Fixes another
+  name space pollution.
+
+- Added 'curl_off_t' typedef in the public header file, to be used to provide
+  large file sizes to the *_LARGE options. Adjusted the code all over to use
+  this variable type instead of 'off_t'. This is an attempt to make the large
+  file support work on more platforms. The configure script now checks the
+  size of the curl_off_t instead of the plain off_t.
+
+Version 7.11.0 (22 January 2004)
+
+Daniel (21 January 2004)
+- Removed the defines in the public header file with TIMECOND_ prefixes. They
+  have been obsolete since April 22nd 2002, and if this causes anyone any
+  problems now it is very easy to just add CURL_ to the names. This corrects
+  this name space pollution.
+
+Daniel (19 January 2004)
+- David Byron cleaned up how --trace with no option was treated, and also
+  arguments in a config file without a required parameter!
+
+Daniel (16 January 2004)
+- Gisle Vanem fixed a few issues where compilers warned about variables
+  possibly being used unassigned.
+
+- Minor Interix build problem fixed.
+
+Daniel (15 January 2004)
+- Peter Sylvester pointed out some necessary escaping needed in the
+  acinclude.m4 file when automake 1.8 or later is used.
+
+Daniel (14 January 2004)
+- Vincent Bronner fixed the Curl_resolv() return code. This extends the fix
+  Steve Green provided on december 3...
+
+Daniel (13 January 2004)
+- Luke Call made the win32 version of the password prompting function support
+  backspace.
+
+- Dan Fandrich fixed the hugehelp source file to contain both a compressed and
+  an uncompressed version in the distribution, so that more people easier can
+  build curl with the compressed version.
+
+- Diego Casorran brought another AmigaOS build patch for native Amiga builds.
+
+- Matt Veenstra updated the Mac OS X framework files.
+
+- Brian R Duffy brought a section to the INSTALL file on how to build a
+  SSL-enabled curl using the free Borland C++ compiler. He also updated the
+  Borland lib/Makefile.b32.
+
+- I fixed the test case 509 which I broke yesterday. Now the libtest are
+  compiled with an include path that points to the library's source dir, so
+  that the libtests can include files from the source tree. This was made to
+  make it possible to use the USE_SSLEAY define in the library test files.
+
+Daniel (12 January 2004)
+- Peter Sylvester brought code that now allows a callback to modified the URL
+  even when the multi interface is used, and then libcurl will simulate a
+  "follow location" to that new URL. Test 509 was added to test this feature.
+
+- Extended the time we retry servers in the test script, and I also made it
+  retry the https and ftps servers before they are considered bad. I believe
+  the previous approach could turn problematic on really slow hosts.
+
+Version 7.11.0-pre1 (12 January 2004)
+
+Daniel (11 January 2004)
+- Dominick Meglio pointed out FTPS should use default port 990 according to
+  IANA.
+
+Daniel (8 January 2004)
+- Fixed the SPNEGO configure check to not use -R or other non-portable options
+  in the LDFLAGS. Reported by Pierre in bug report #872930.
+
+Daniel (5 January 2004)
+- Dan Fandrich provided a fix on our zlib usage.
+
+- David J Meyer's patch that introduce large file support to libcurl was
+  applied. New curl_easy_setopt options that accept 'off_t' arguments are:
+
+  INFILESIZE_LARGE
+  RESUME_FROM_LARGE
+  MAXFILESIZE_LARGE
+
+Daniel (4 January 2004)
+- Based on Dominick Meglio's comments, I made our private version of
+  gettimeofday() declared static. This would otherwise collide with the same
+  function in other libs (like ares for example).
+
+- Added Dominick Meglio's description on how to build libcurl with ares
+  on win32.
+
+Daniel (19 December)
+- CURLOPT_IPRESOLVE was not possible to set.
+
+- Gisle Vanem updated the djgpp build files.
+
+Daniel (18 December)
+- John McGowan reported a redirect-problem that happened if a site used a URL
+  like "url.com?var=content" (without a proper slash) and from that address
+  redirected the user-agent to an absolute directory.
+
+- David Byron made libcurl build fine with both the .NET and VC6 versions of
+  MSVC
+
+Daniel (16 December)
+- Updated test 506 since it started to fail after the cache prune change
+  yesterday. I also changed it slightly to feature a counter in each debug
+  output for easier tracing.
+
+Daniel (15 December)
+- Old DNS cache entries are now only pruned after curl is done with a request,
+  and not in the actual name resolve call.
+
+- corrected the --enable-ares patch
+
+- Giuseppe Attardi found and fixed a problem within libcurl that re-used
+  already freed memory.
+
+Daniel (10 December)
+- Gisle Vanem reported that the dict support was broken. I broke it during my
+  ftps-changes overhaul. I've now added a 'curlassert' function that can be
+  used to verify expressions, to prevent future errors of the same
+  kind. They're only present in debug-builds.
+
+- Diego Casorran made curl and libcurl possible to build natively (no more
+  need for the ixemul library) on AmigaOS.
+
+- Dominick Meglio made configure --enable-ares support a given path to the
+  installed ares lib, instead of always using it in the curl source tree.
+  This also fixed the curl-config --libs output.
+
+- Eric S. Raymond patched a very minor man page format error in
+  libcurl-errors.3
+
+Daniel (8 December)
+- Fixed the flaw that made -lz appear twice on the link command line.
+
+- After correspondence with Gisle Vanem, I changed the 'connection aborted'
+  error text when the FTP response reader failed to more specificly identify
+  what the problem is.
+
+- Based on a patch from Dominick Meglio, curl-config --feature now outputs
+  'AsynchDNS' as a feature if libcurl was built with ares. The feature name
+  is the same that 'curl -V' outputs, for simplicity.
+
+Daniel (3 December)
+- Marty Kuhrt made the build up-to-date on VMS, and moved most of the VMS-
+  specific stuff in the client code to a separate header file.
+
+- Steve Green fixed a return code bug in Curl_resolv(), that made the socks5
+  code fail.
+
+- swalkaus at yahoo.com patched libcurl to ignore Content-Length: headers
+  when Transfer-Encoding: chunked is used, as mandated by RFC2616.
+
+Daniel (2 December)
+- --ftp-pasv was added, which serves the only purpose of overriding a
+  previously set --ftpport option. Starting now, --ftp-port is a recognized
+  alias for --ftpport for consistency.
+
+- Giuseppe Attardi pointed out that we should use MSG_NOSIGNAL when we use
+  send() and recv(). I added checks for the define in the configure script and
+  adjusted the code accordingly. If the symbol is present, we won't attempt
+  to ignore the SIGPIPE signal.
+
+Daniel (1 December)
+- Mathias Axelsson set up a bsdftpd-ssl server for me and I could make curl
+  run fine against its FTPS implementation. Now these FTPS-related things
+  work:
+   o explicit and implicit FTPS
+   o active (PORT) and passive (PASV)
+   o upload and download
+   o verified against bsdftpd-ssl and RaidenFTPD
+
+Daniel (27 November)
+- James Clancy made the Borland Makefiles up to date.
+
+- Markus Moeller improved the SPNEGO detection in the configure script.
+
+Daniel (25 November)
+- Dave May filed bug report #848371, identifying that if you'd do POST over a
+  proxy to a https server, libcurl didn't POST at all, it just made a GET! It
+  turned out to be because libcurl wrongly didn't consider the authentication
+  "negotiation phase" to be complete yet.
+
+  I added test case 95 to verify my fix for this.
+
+Daniel (24 November)
+- Thanks to Mathias Axelsson, I've been able to work on FTPS for libcurl and it
+  seems to work somewhat fine now.
+
+  The FTPS stuff is based on RFC2228 and the murray-auth-ftp-ssl draft
+  (version 12). There seems to exist quite a few servers that have implemented
+  the server side of this.
+
+  We can now use ftps:// URLs to explicitly switch on SSL/TSL for the control
+  connection and the data connection (dealing with two SSL connections forced
+  me to change a lot of stuff in libcurl).
+
+  Alternatively, and what seems to be the recommended way, we can set the new
+  option CURLOPT_FTP_SSL to one of these values:
+
+     CURLFTPSSL_NOPE,   - do not attempt to use SSL
+     CURLFTPSSL_TRY     - try using SSL, proceed anyway otherwise
+     CURLFTPSSL_CONTROL - SSL for the control connection or fail
+     CURLFTPSSL_ALL     - SSL for all communication or fail
+
+  Any failure to set the desired level will make libcurl fail with the error
+  code CURLE_FTP_SSL_FAILED. This new option makes a "normal" ftp:// transfer
+  attempt to be made securely.
+
+  I've been able to login and get files (passively) from Mathias' server using
+  both ftps:// and CURLOPT_FTP_SSL. (I've made 'curl' understand the --ftp-ssl
+  option that sets CURLFTPSSL_TRY.)
+
+- Gaz Iqbal fixed a range string memory leak.
+
+- Gisle Vanem fixed the Windows builds.
+
+- Added the new FTPSSL defines in curl/curl.h
+
+Daniel (20 November)
+- Josh Kapell filed bug report #845247 as he found an endless loop when
+  getting a 407 back from a proxy when no user+password was given. Added test
+  case 94 to verify the fix.
+
+Daniel (19 November)
+- Kevin Roth fixed a progress-bar problem on Windows.
+
+- While working with Nicolas Croiset's bug report #843739, I noticed two minor
+  problems related to ftp partial downloads: if a partial transfer is
+  detected, we must close the connection as we cannot know in what state it is
+  anymore. This looks like a ProFTPD bug:
+  http://curl.haxx.se/mail/lib-2003-11/0079.html
+
+Daniel (17 November)
+- Maciej W. Rozycki made the configure script use a cache variable for the
+  writable argv test. This way, the default can be overridden better (for
+  cross-compiles etc)
+
+Daniel (15 November)
+- Mathias Axelsson found out libcurl sometimes freed the server certificate
+  twice, leading to crashes!
+
+Daniel (14 November)
+- Siddhartha Prakash Jain found a case with a bad resolve that we didn't
+  properly bail out from, when using ares.
+
+Daniel (13 November)
+- Default Content-Type for parts in multipart formposts has changed to
+  "application/octet-stream".  This seems more appropriate, and I believe
+  mozilla and the likes do this. In the same area: .html files now get
+  text/html as Content-Type. (Pointed out in bug report #839806)
+
+- Gisle Vanem corrected the --progress-bar output by doing a flush of the
+  output, which apparently makes it look better on at least windows, but
+  possibly other platforms too.
+
+- Peter Sylvester identified a problem in the connect code, which made the
+  multi interface on a ipv6-enabled solaris box do bad. Test case 504 to be
+  specific. I've spent some time to clean-up the Curl_connecthost() function
+  now to use less duplicated code for the two different sections: ipv6 and
+  ipv4.
+
+Daniel (11 November)
+- Added CURLOPT_NETRC_FILE. Use this to tell libcurl which file to use instead
+  of trying to find a .netrc in the current user's home directory. The
+  existing .netrc file finder is somewhat naive and is far from perfect on
+  several platforms that aren't unix-style. If this option isn't set when
+  CURLOPT_NETRC is set, the previous approach will still be used.
+
+  The current .netrc check code now also support longer than 256 bytes path
+  names.
+
+Daniel (10 November)
+- Kang-Jin Lee pointed out that the generated ca-bundle.h file shouldn't be
+  written in the source dir if a different build dir is used.
+
+- After S<>bastien Willemijns' bug report, we now check the separators properly
+  in the 229-reply servers respond on a EPSV command and bail out better if
+  the reply string is not RFC2428-compliant.
+
+Daniel (7 November)
+- Based on Gisle Vanem's patch, I made curl try harder to get the home
+  directory of the current user, in order to find the default .curlrc file.
+  We're also considering moving out the HOME-dir code from libcurl, and
+  instead have the app pass in the path to the .netrc file (which is the only
+  logic left in libcurl that uses the HOME dir). Then curl can use the home
+  dir for that purpose too.
+
+- Ralph Mitchell's updated testcurl.sh to the script to take an existing
+  directory name and build/run/test curl in there instead of trying to update
+  from CVS. Using this approach, the script can now be used to test daily
+  tarballs etc.
+
+- Gisle Vanem added a "resource file" to the Windows DLL builds, to contain
+  information such as version number, library name, copyright info etc.
+
+Daniel (6 November)
+- curl checks if the existing libcurl supports things like --ntlm, --negotiate
+  and --krb4 and returns error if not.
+
+- I added three new global defines in the curl/curl.h header:
+  LIBCURL_VERSION_MAJOR, LIBCURL_VERSION_MINOR and LIBCURL_VERSION_PATCH. They
+  are the three numbers in the library's version number, separated for easier
+  usage. 'maketgz' was updated accordingly to generate these numbers properly
+  when building release-archives.
+
+- Uninitialized variable fix, reported by both Marty Kuhrt and Benjamin
+  Gerard.
+
+- Matt Veenstra provided build files to build libcurl as a "framework" under
+  Mac OS X. See the lib/libcurl.framework.make for details.
+
+- Removed the defines of TRUE and FALSE from the curl/curl.h header file.
+  They're not in our name space so we should not fiddle with them.
+
+Daniel (5 November)
+- Replaced the man page to HTML converter program with a new one: roffit.
+  Makes nicer web pages.
+
+Daniel (4 November)
+- Troels Walsted Hansen fixed the MSVC makefiles to let them build curl fine
+  on Windows.
+
+- Kevin Roth corrected the cygwin package generator and spell-fixed the
+  comment in the ca-bundle.h file.
 
 Version 7.10.8 (1 November 2003)
 
@@ -39,7 +773,7 @@ Daniel (29 October)
 Daniel (28 October)
 - Dan C tracked down yet another weird behavior in the glibc gethostbyname_r()
   function for some specific versions (reported on 2.2.5 and 2.1.1), and
-  provided a fix. On Linux machines with these glibc versioins, non-ipv6
+  provided a fix. On Linux machines with these glibc versions, non-ipv6
   builds of libcurl would often fail to resolve perfectly resolvable host
   names.
 
@@ -187,7 +921,7 @@ Daniel (4 October)
 - Siddhartha Prakash Jain provided a patch with a fix for libcurl with ares,
   when working on IP-only names as we then could return "wait" status when the
   name in fact already was resolved. I edited the patch slightly to not expose
-  async details to non-ares aware source code.
+  asynch details to non-ares aware source code.
 
 Daniel (3 October)
 - Neil Spring posted the debian bug report #213180, and pointed out that using
@@ -421,7 +1155,7 @@ Daniel (5 August)
 
 - Salvatore Sorrentino filed bug report #783116 and Early Ehlinger posted a
   bug report to the libcurl list, both identifying a problem with FTP
-  persitent connections and how the dir hiearchy was not properly reset
+  persistent connections and how the dir hierarchy was not properly reset
   between files.
 
 - David Byron's thoughts on a fixed Makefile in tests/ were applied.
@@ -503,8 +1237,8 @@ Daniel (30 July)
   more portably...
 
   He also indicated that distributing the src/hugehelp.c in a compressed state
-  like I acccidentally did may not be the smartest move... I've now fixed the
-  distribute procudere to automaticly generate an uncompressed version when I
+  like I accidentally did may not be the smartest move... I've now fixed the
+  distribute procedure to automatically generate an uncompressed version when I
   make release archives.
 
 Daniel (29 July)
@@ -566,7 +1300,7 @@ Daniel (18 July)
 
 - Since NTLM authenticates connections instead of single requests, I had to
   re-arrange how we store the NTLM data and I had to improve the test suite to
-  finally work properly with persistancy to make the NTLM tests run fine
+  finally work properly with persistency to make the NTLM tests run fine
   again. This also forced me to have to update lots of HTTP test cases.
 
 Daniel (16 July)
@@ -580,7 +1314,7 @@ Daniel (5 July)
 - Doug Kaufman provided additional fixes for the DOS port.
 
 Daniel (4 July)
-- Rick Richardson pointed out that using setvbuf() to achive non-buffering
+- Rick Richardson pointed out that using setvbuf() to achieve non-buffering
   on output is no-good for SCO Xenix and other unixes. We switched over to
   using plain fflush() instead.
 
@@ -634,7 +1368,7 @@ Daniel (17 June)
   type(s) you want to use. If more than one is set, libcurl will use one of
   the selected one and the one it considers is more secure. Test case 67 and
   68 (for NTLM) were fixed and we've reduced a round-trip for specific --ntlm
-  featches, and test case 69 and 70 were added for testing authentication
+  fetches, and test case 69 and 70 were added for testing authentication
   "picking". --anyauth is the new command line tool option, and I also added
   --basic for completeness (that's the default type).
 
@@ -667,7 +1401,7 @@ Version 7.10.6-pre2 (16 June 2003)
 Daniel (16 June)
 - curl_version_info() now returns bitmasked information weather NTLM and
   GSSNEGOTIATE are supported, since it is doomed to vary on different
-  installatiions.
+  installations.
 
 - I remade the HTTP Digest code to use the MD5-code provided by OpenSSL if
   that is present, and only use our own MD5-code if it isn't.
@@ -960,7 +1694,7 @@ Daniel (6 Apr)
 
 Daniel (4 Apr)
 - Martijn Broenland found another cases where a server application didn't
-  like the boundary string used by curl when foing a multi-part/formpost. We
+  like the boundary string used by curl when doing a multi-part/formpost. We
   modified the boundary string to look like the one IE uses, as this is
   probably gonna make curl work with more applications.
 
@@ -998,7 +1732,7 @@ Daniel (31 Mar)
   "--location-trusted".
 
 - Frankie Fong reported a problem with libcurl if you re-used an easy handle
-  with a proxy, and you first made a https:// connction to a host and then
+  with a proxy, and you first made a https:// connection to a host and then
   switched to a http:// one to the same host. libcurl would then wrongly re-use
   the same connection for it and fail to get the second URL properly
 
@@ -1027,19 +1761,19 @@ Daniel (25 Mar)
 Daniel (24 Mar)
 - G<>tz Babin-Ebell pointed out that the ca-bundle.crt file contained a
   certificate from Trustcenter that was a demo certificate only that was never
-  indended to be part of a CA bundle.
+  intended to be part of a CA bundle.
 
 Daniel (21 Mar)
 - Life is a mystery. Within a time period of 17 hours, Tim Pope and Michael
   Churchill filed one bug report each, both identifying problems with a second
-  transfer when doing persistant transfers re-using a connection. Tim's one is
+  transfer when doing persistent transfers re-using a connection. Tim's one is
   #706624, labeled "Multiple uploads per handle fail" and Michael's #707003
   "Does not send Authorization: header when reusing connection". I could track
   both down to the same piece of logic and it turned out libcurl was not using
   new settings properly when re-using an existing connection. This concerned
   both uploading and downloading and involved exactly those pieces these two
   reports identified. This code has been this faulty since the day I
-  introduced persistant connection support in libcurl, more than 2 years ago.
+  introduced persistent connection support in libcurl, more than 2 years ago.
 
 Daniel (20 Mar 2003)
 - Five year anniversary. Today five years ago, the first ever curl release saw
@@ -1158,7 +1892,7 @@ Daniel (27 Feb)
 Daniel (26 Feb)
 - Kyle Sallee reported a case where he would do a transfer that didn't update
   the progress meter properly. It turned out to be a case where libcurl would
-  loop a little too eagerly in the tranfer loop, which isn't really good for
+  loop a little too eagerly in the transfer loop, which isn't really good for
   the APIs, especially not the multi API.
 
 Version 7.10.4-pre2 (24 Feb 2003)

COPYING

@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1996 - 2003, Daniel Stenberg, <daniel@haxx.se>.
+Copyright (c) 1996 - 2004, Daniel Stenberg, <daniel@haxx.se>.
 
 All rights reserved.
 

CVS-INFO

@@ -25,7 +25,8 @@ Compile and build instructions follow below.
 
   perl/         is a subdirectory with various perl scripts
 
-To build after having extracted everything from CVS, do this:
+To build in environments that support configure, after having extracted
+everything from CVS, do this:
 
 ./buildconf
 ./configure
@@ -35,10 +36,15 @@ make
 
   ./configure --disable-shared --enable-debug --enable-maintainer-mode
 
+In environments that don't support configure (i.e. Microsoft), do this:
+
+buildconf.bat
+
 
 REQUIREMENTS
 
- You need the following software installed:
+ For buildconf (not buildconf.bat) to work, you need the following software
+installed:
 
  o autoconf 2.57  (or later)
  o automake 1.7   (or later)

Makefile.am

@@ -1,12 +1,30 @@
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
 #
 # $Id$
-#
+###########################################################################
 
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist	\
-  curl-config.in build_vms.com curl-style.el sample.emacs testcurl.sh \
-  RELEASE-NOTES
+  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
 
 bin_SCRIPTS = curl-config
 

Makefile.dist

@@ -1,25 +1,25 @@
-#############################################################################
-#                                  _   _ ____  _     
-#  Project                     ___| | | |  _ \| |    
-#                             / __| | | | |_) | |    
-#                            | (__| |_| |  _ <| |___ 
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
-# In order to be useful for every potential user, curl and libcurl are
-# dual-licensed under the MPL and the MIT/X-derivate licenses.
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the MPL or the MIT/X-derivate
-# licenses. You may pick one of these licenses.
+# furnished to do so, under the terms of the COPYING file.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
 # $Id$
-#############################################################################
+###########################################################################
 
 all:
 	./configure
@@ -43,27 +43,27 @@ mingw32-ssl:
 
 vc:
 	cd lib
-	nmake -f Makefile.vc6 cfg=release
+	nmake /f Makefile.vc6 cfg=release
 	cd ..\src
-	nmake -f Makefile.vc6
+	nmake /f Makefile.vc6
 
 vc-ssl:
 	cd lib
-	nmake -f Makefile.vc6 cfg=release-ssl
+	nmake /f Makefile.vc6 cfg=release-ssl
 	cd ..\src
-	nmake -f Makefile.vc6 cfg=release-ssl
+	nmake /f Makefile.vc6 cfg=release-ssl
 
 vc-ssl-dll:
 	cd lib
-	nmake -f Makefile.vc6 cfg=release-ssl-dll
+	nmake /f Makefile.vc6 cfg=release-ssl-dll
 	cd ..\src
-	nmake -f Makefile.vc6
+	nmake /f Makefile.vc6
 
 vc-libcurl-ssl-dll:
 	cd lib
-	nmake -f Makefile.vc6 cfg=release-libcurl-ssl-dll
+	nmake /f Makefile.vc6 cfg=release-libcurl-ssl-dll
 	cd ..\src
-	nmake -f Makefile.vc6
+	nmake /f Makefile.vc6
 
 djgpp:
 	make -C lib -f Makefile.dj
@@ -77,6 +77,14 @@ cygwin-ssl:
 	./configure --with-ssl
 	make
 
+amiga:
+	cd ./lib && make -f makefile.amiga
+	cd ./src && make -f makefile.amiga
+
+netware:
+        cd lib && make -f Makefile.netware
+        cd src && make -f Makefile.netware
+
 unix: all
 
 unix-ssl: ssl

README

@@ -31,21 +31,26 @@ WEB SITE
   Visit the curl web site or mirrors for the latest news:
 
         Sweden    -- http://curl.haxx.se/
-        Russia    -- http://curl.tsuren.net/
-        US        -- http://curl.sf.net/
         Australia -- http://curl.planetmirror.com/
+        Estonia   -- http://curl.dope-brothers.com/
+        Germany   -- http://curl.mirror.at.stealer.net/
+        Russia    -- http://curl.tsuren.net/
+        Thailand  -- http://curl.siamu.ac.th/
+        US (CA)   -- http://curl.mirror.redwire.net/
 
 DOWNLOAD
 
   The official download mirror sites are:
 
-        Sweden    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
-        Sweden    -- http://cool.haxx.se/curl/
-        Germany   -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
         Australia -- http://curl.planetmirror.com/download/
-        US        -- http://curl.sourceforge.net/download/
+        Estonia   -- http://curl.dope-brothers.com/download/
+        Germany   -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
         Hongkong  -- http://www.execve.net/curl/
         Russia    -- http://curl.tsuren.net/download/
+        Sweden    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
+        Sweden    -- http://cool.haxx.se/curl/
+        Thailand  -- http://curl.siamu.ac.th/download/
+        US (CA)   -- http://curl.mirror.redwire.net/download/
 
 CVS
 

RELEASE-NOTES

@@ -1,94 +1,89 @@
-Curl and libcurl 7.10.8. A bugfix release.
+Curl and libcurl 7.11.1. A bugfix release.
 
-The 77th public curl release. Release number 104 counted from the very
-beginning.
+ Public curl release number:               79
+ Releases counted from the very beginning: 106
+ Available command line options:           94
+ Available curl_easy_setopt() options:     112
 
 This release includes the following changes:
 
- o --head now works on file:// URLs too
- o file: URLs with only one initial slash now works too
- o RELEASE-NOTES document added to the release archive to summarize the big
-   and visible changes and bugfixes
- o CURLOPT_MAXFILESIZE was added, and --max-filesize
- o CURLOPT_PASSWDFUNCTION and CURLOPT_PASSWDDATA are no longer supported
- o IPv6 is now supported on Windows builds too
- o CURLOPT_IPRESOLVE lets you select pure IPv6 or IPv4 resolved addresses
-   (curl offers the command line options -4/--ipv4 and -6/--ipv6)
- o GSS-Negotiate works fine with the MIT kerberos library
- o SPNEGO support added, if libcurl is built with the FBopenssl libraries,
-   curl_version_info() can return a feature bit for it and curl -V displays
-   SPNEGO as a feature if libcurl is built with it enabled
- o easy handles added to a multi handle now share DNS cache automaticly
- o CURLINFO_HTTPAUTH_AVAIL and CURLINFO_PROXYAUTH_AVAIL were added
- o CURLOPT_FTP_RESPONSE_TIMEOUT was added
- o NTLM, Digest and GSS-Negotiate authentications also work for HTTPS over
-   proxies
- o curl supports multiple -T flags to allow serveral uploaded files using
-   a single command line
- o CURLINFO_RESPONSE_CODE can return the last FTP response code
+ o CURLOPT_POSTFIELDSIZE_LARGE added to offer POSTs larger than 2GB
+ o CURL_VERSION_LARGEFILE is a feature bit returned by libcurls that feature
+   large file support
+ o libcurl only requires winsock 1.1 on windows now
+ o when doing FTP, curl now sends QUIT before disconnecting
+ o name resolves can now timeout on windows too
+ o $HOME is now recognized better when looking for .netrc files
+ o now re-uses the ares handle when re-using curl handles
+ o SO_BINDTODEVICE is used for network interface binding
+ o configure --disable-manual disables the built-in huge manual from the
+   command line tool
+ o the default Accept: header used in HTTP requests changed
+ o asynch dns lookups now require the c-ares library
+ o curl --socks can be used to set a SOCKS5 proxy to use
+ o response-headers received after a (proxy) CONNECT request are now passed
+   to the header callback just like other headers
 
 This release includes the following bugfixes:
 
- o added work-around for a name resolve problem on some glibc versions
- o a rare ERRORBUFFER single-byte overflow was fixed
- o HTTP-resuming an already downloaded file works better
- o builds better on Solaris 8+ with gcc
- o --disable-eprt works now
- o improved CA cert verification
- o --anyauth could bug when the first response had no body contents
- o double password prompting when doing NTLM fixed
- o improved performance when used multi-threaded on windows
- o share-locking during DNS lookups was modified
- o resume was not possible to switch off properly once enabled
- o fixed the ipv4 connect code when a DNS entry has multiple IPs
- o now checks subjectAltNames when matching certs
- o HTTP POST using read callback works again
- o builds fine on BeOS now
- o CURLOPT_COOKIE set to NULL no longer sends the previously set cookie
- o if an FTP transfer used a bad path, the next transfer could fail too
- o ares-built libcurl resolves IP-only names properly
- o changed the curl_lock_function proto to prevent warnings on some compilers
- o builds fine on QNX 6.2.x now
- o PUT with --digest works now 
- o --anyauth that picks NTLM and then follows a redirect (and does NTLM again)
-   works now
- o asynch resolves now work on NT4 too
- o a DNS cache trash (possible segfault) was fixed
- o runtests.pl clears all proxy environment variables before the test is run
- o Microsoft's "Negotiate" authentication is now supported by the existing
-   GSSNEGOTIATE option
- o A set zero-length proxy name confused libcurl
- o Digest authentication works again without OpenSSL on 64bit architectures
- o configure --enable-thread works now
- o buffer problems in the test suite's web server were fixed
- o improved proxy password handling
- o LDAP is again working nicely with the current OpenLDAP
- o asynch name lookup for non-resolving hosts now return a proper error message
- o CURLOPT_SSL_VERIFYHOST set to 1 no longer aborts if no CN field is
-   obtainable, it will merely warn about it
- o name resolve segfault with uClibc fixed
- o multi interface and multi-part/formpost could end in segfault
- o curl_multi_info_read() sets the msgs_in_queue to 0 when returning NULL
- o multi interface, ares and non-resolving host caused a segfault
- o minor single SSL memory leak fixed
- o Setting CURLOPT_WRITEFUNCTION or CURLOPT_READFUNCTION to NULL resets them
-   to default
+ o builds and runs on Novell NetWare
+ o Windows builds now report OS as "i386-pc-win32"
+ o received signals during SSL connect is handled better
+ o improved PUT/POST with NTLM/Digest authentication
+ o following redirects and doing NTLM/Digest (where the first connection gets
+   closed) with the multi interface work better now
+ o file: progress meter and getinfo variables work now
+ o CURLOPT_FRESH_CONNECT and CURLAUTH_NTLM now work when set together
+ o share interface usage without (un)lock functions segfaulted
+ o --limit-rate no longer cripples the --speed-limit feature
+ o fixed verbose output problem with ipv6-enabled re-used connections
+ o fixed the socks5 code to check version in the socks response properly
+ o dns cache bug - fixed the 'inuse' counter
+ o large file fix for Content-Length
+ o better docs for the share interface
+ o several configure fixes for mingw/msys
+ o setting a Host: header is no longer affecting the Host: header used when
+   libcurl follows a Location:
+ o fixed numerous compiler warnings on several operating systems and compilers
+ o PUTing from stdin couldn't disable chunked transfer-encoding
+ o corrected the mingw makefiles
+ o improved the configure libz detection
+ o fixed EPRT/PORT use when doing FTP on ipv6-enabled AIX hosts
+ o *nroff commands that only support -mandoc and not -man are now supported
+   (for the built-in manual text in the command line tool)
+ o fixed the unconditional #include of config.h in hugehelp.c
+ o builds fine on MPE/iX
+ o upload using chunked transfer-encoding now sends the last chunk properly
+   teriminated with an extra CRLF
+ o Fixed the progress meter display for files >2GB
+ o persistant connections over a proxy messed up the proxy name/password
+ o the socks5 code segfaulted if no username/password was set
+ o the *_LARGE options now take curl_off_t types as parameters and this will
+   make it possible to handle large files on windows too
+ o builds with large file support even on systems without strtoll()
 
 Other curl-related news since the previous public release:
 
- o TclCurl 0.10.7 was released.
+ o Many platforms are being used to autobuild and autotest curl on a daily
+   basis. Please join in and test curl on your systems:
+   http://curl.haxx.se/auto/
+ o the curl mailing lists moved, (re-)subscribe to the new ones from here:
+   http://curl.haxx.se/mail/
+ o c-ares 1.1.0 was relased: http://daniel.haxx.se/projects/c-ares/
+ o TclCurl 0.11.0 was released:
+   http://personal1.iddeo.es/andresgarci/tclcurl/english/
+ o PycURL 7.11.0 was released: http://pycurl.sourceforge.net/
+ o the libcurl D binding was released:
+   http://www.atari-soldiers.com/libcurl.html
+ o new Estonian web site mirror: http://curl.dope-brothers.com/
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Loren Kirkby, Jeff Pohlmeyer, Antoine Calando, Gerd v. Egidy, Vincent
- Sanders, John McGowan, Henrik Storner, J<>rg Mueller-Tolk, Peter Pentchev,
- Early Ehlinger, Kevin Fisk, Jurij Smakov, Bjorn Reese, Tim Bartley, David
- Kimdon, Dominick Meglio, Markus Moeller, Giuseppe Attardi, James MacMillan,
- Neil Spring, Siddhartha Prakash Jain, Jon Turner, Vincent Bronner, Shard,
- Jeremy Friesner, Florian Schoppmann, Neil Dunbar, Frank Ticheler, Lachlan
- O'Dea, Dirk Manske, Domenico Andreoli, Gisle Vanem, Kimmo Kinnunen, Andrew
- Fuller, Georg Horn, Andr<64>s Garc<72>a, Dylan Ellicott, Kevin Roth, David Hull,
- James Bursa, Dan C
- 
+ Gisle Vanem, Vincent Bronner, Richard Bramante, Dirk Manske, Dan Fandrich,
+ Ken Hirsch, Stadler Stephan, Domenico Andreoli, Patrick Smith, Tor Arntsen,
+ Andr<EFBFBD>s Garc<72>a, Tim Baker, Len Krause, Gilad, Ken Rastatter, P R Schaffner,
+ Greg Hewgill, Ben Greear, Jeff Lawson, Grigory Entin, Doug Porter, David
+ Byron, Andy Serpa, Joe Halpin, Christopher R. Palmer, G<>nter Knauf
+
         Thanks! (and sorry if I forgot to mention someone)

TODO-RELEASE

@@ -0,0 +1,53 @@
+Issues not sorted in any particular order.
+  #[num] refers to bug report numbers.
+  UNASSIGNED means that no person has publicly stated to work on the issue.
+  DELETE means the issue is subject for dismissal
+
+To get fixed in 7.11.1 (planned release in March 2004)
+======================
+
+To get fixed in 7.11.2 (planned release May/June 2004)
+======================
+
+6. REST fix for servers not behaving well on >2GB requests. This should fail
+   if the server doesn't set the pointer to the requested index. The tricky
+   part is to figure out if the server did the right thing or not.
+   UNASSIGNED
+
+10. Anton Fedorov's "dumpcert" patch UNASSIGNED
+    http://curl.haxx.se/mail/lib-2004-03/0088.html
+
+14. Evaluate/apply Gertjan van Wingerde's SSL patches, UNASSIGNED
+    http://curl.haxx.se/mail/lib-2004-03/0087.html
+
+23. Peter Sylvester's "Most Significant Common Name" change. Feedback welcome.
+    At least the UTF8 conversion and comparison should be done. Patch?
+    UNASSIGNED
+
+24. Make the progress meter use one digit more for the hour time fields.
+    Accomplish this by removing one of the times displayed.
+
+27. Put the version defines in their own header file, so that lib/libcurl.rc
+    can include only that to reduce problems with MSVC.
+
+28. Optimize the way libcurl uses CWD on each new request over a persistent
+    connection (on FTP) even if it doesn't have to.
+
+29. Define USE_NTRESPONSES in the NTLM code to work properly with >14 letter
+    passwords against IIS servers. Requires test cases to be updated
+    accordingly. #915609
+
+30. Digest re-negotiation is not supported, we wrongly assume a new 401
+    response to signify an authenticaion error. We need to detect the
+    difference between a 401 due to a bad Digest authorization header and a
+    401 because the server wants to re-negotiate.
+
+    Mitz Wark provided details and traces here:
+    http://curl.haxx.se/mail/lib-2004-03/0299.html
+
+To get fixed in 7.12.0
+======================
+
+25. curl_easy_strerror() curl_multi_strerror() curl_share_strerror()
+
+26. i18n of error messages

acinclude.m4

@@ -7,7 +7,7 @@ dnl There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
 dnl O_NONBLOCK define is found but does not work. This condition is attempted
 dnl to get caught in this script by using an excessive number of #ifdefs...
 dnl
-AC_DEFUN(CURL_CHECK_NONBLOCKING_SOCKET,
+AC_DEFUN([CURL_CHECK_NONBLOCKING_SOCKET],
 [
   AC_MSG_CHECKING([non-blocking sockets style])
 
@@ -215,7 +215,7 @@ dnl check for "localhost", if it doesn't exist, we can't do the
 dnl gethostbyname_r tests!
 dnl 
 
-AC_DEFUN(CURL_CHECK_WORKING_RESOLVER,[
+AC_DEFUN([CURL_CHECK_WORKING_RESOLVER],[
 AC_MSG_CHECKING([if "localhost" resolves])
 AC_TRY_RUN([
 #include <string.h>
@@ -238,7 +238,7 @@ exit (h == NULL ? 1 : 0); }],[
 dnl ************************************************************
 dnl check for working getaddrinfo()
 dnl
-AC_DEFUN(CURL_CHECK_WORKING_GETADDRINFO,[
+AC_DEFUN([CURL_CHECK_WORKING_GETADDRINFO],[
   AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
   AC_TRY_RUN( [
 #include <netdb.h>
@@ -277,7 +277,7 @@ fi
 ])
 
 
-AC_DEFUN(CURL_CHECK_LOCALTIME_R,
+AC_DEFUN([CURL_CHECK_LOCALTIME_R],
 [
   dnl check for a few thread-safe functions
   AC_CHECK_FUNCS(localtime_r,[
@@ -295,7 +295,7 @@ AC_DEFUN(CURL_CHECK_LOCALTIME_R,
 	AC_MSG_RESULT(no))])])
 ])
 
-AC_DEFUN(CURL_CHECK_INET_NTOA_R,
+AC_DEFUN([CURL_CHECK_INET_NTOA_R],
 [
   dnl determine if function definition for inet_ntoa_r exists.
   AC_CHECK_FUNCS(inet_ntoa_r,[
@@ -315,7 +315,7 @@ AC_DEFUN(CURL_CHECK_INET_NTOA_R,
 	AC_MSG_RESULT(no))])])
 ])
 
-AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
+AC_DEFUN([CURL_CHECK_GETHOSTBYADDR_R],
 [
   dnl check for number of arguments to gethostbyaddr_r. it might take
   dnl either 5, 7, or 8 arguments.
@@ -392,7 +392,7 @@ rc = gethostbyaddr_r(address, length, type, &h,
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
 ])
 
-AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
+AC_DEFUN([CURL_CHECK_GETHOSTBYNAME_R],
 [
   dnl check for number of arguments to gethostbyname_r. it might take
   dnl either 3, 5, or 6 arguments.
@@ -475,3 +475,118 @@ if test "$ac_cv_func_gethostbyname_r" = "yes"; then
   fi
 fi
 ])
+
+dnl We create a function for detecting which compiler we use and then set as
+dnl pendantic compiler options as possible for that particular compiler. The
+dnl options are only used for debug-builds.
+
+AC_DEFUN([CURL_CC_DEBUG_OPTS],
+[
+    if test "$GCC" = "yes"; then
+
+       dnl figure out gcc version!
+       AC_MSG_CHECKING([gcc version])
+       gccver=`$CC -dumpversion`
+       num1=`echo $gccver | cut -d . -f1`
+       num2=`echo $gccver | cut -d . -f2`
+       gccnum=`(expr $num1 "*" 100 + $num2) 2>/dev/null`
+       AC_MSG_RESULT($gccver)
+
+       AC_MSG_CHECKING([if this is icc in disguise])
+       AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
+         dnl action if the text is found, this it has not been replaced by the
+         dnl cpp
+         ICC="no"
+         AC_MSG_RESULT([no]),
+         dnl the text was not found, it was replaced by the cpp
+         ICC="yes"
+         AC_MSG_RESULT([yes])
+       )
+
+       if test "$ICC" = "yes"; then
+         dnl this is icc, not gcc.
+
+         dnl ICC warnings we ignore:
+         dnl * 269 warns on our "%Od" printf formatters for curl_off_t output:
+         dnl   "invalid format string conversion"
+         dnl * 279 warns on static conditions in while expressions
+         dnl * 981 warns on "operands are evaluated in unspecified order"
+         dnl * 1419 warns on "external declaration in primary source file"
+         dnl   which we know and do on purpose.
+
+         WARN="-wd279,269,1419,981"
+
+         if test "$gccnum" -gt "600"; then
+            dnl icc 6.0 and older doesn't have the -Wall flag
+            WARN="-Wall $WARN"
+         fi
+       else dnl $ICC = yes
+         dnl this is a set of options we believe *ALL* gcc versions support:
+         WARN="-W -Wall -Wwrite-strings -pedantic -Wno-long-long -Wpointer-arith -Wnested-externs -Winline -Wmissing-declarations -Wmissing-prototypes -Wsign-compare"
+
+         dnl -Wcast-align is a bit too annoying on all gcc versions ;-)
+
+         if test "$gccnum" -gt "295"; then
+           dnl only if the compiler is newer than 2.95 since we got lots of
+           dnl "`_POSIX_C_SOURCE' is not defined" in system headers with
+           dnl gcc 2.95.4 on FreeBSD 4.9!
+           WARN="$WARN -Wundef"
+         fi
+
+         if test "$gccnum" -ge "296"; then
+           dnl gcc 2.96 or later
+           WARN="$WARN -Wfloat-equal"
+         fi
+
+         if test "$gccnum" -gt "296"; then
+           dnl this option does not exist in 2.96
+           WARN="$WARN -Wno-format-nonliteral"
+         fi
+
+         dnl -Wunreachable-code seems totally unreliable on my gcc 3.3.2 on
+         dnl on i686-Linux as it gives us heaps with false positives
+         if test "$gccnum" -ge "303"; then
+           dnl gcc 3.3 and later
+           WARN="$WARN -Wendif-labels -Wstrict-prototypes"
+         fi
+
+         for flag in $CPPFLAGS; do
+           case "$flag" in
+            -I*)
+              dnl Include path, provide a -isystem option for the same dir
+              dnl to prevent warnings in those dirs. The -isystem was not very
+              dnl reliable on earlier gcc versions.
+              add=`echo $flag | sed 's/^-I/-isystem /g'`
+              WARN="$WARN $add"
+              ;;
+           esac
+         done
+
+       fi dnl $ICC = no
+
+       CFLAGS="$CFLAGS $WARN"
+
+      AC_MSG_NOTICE([Added this set of compiler options: $WARN])
+
+    else dnl $GCC = yes
+
+      AC_MSG_NOTICE([Added no extra compiler options])
+
+    fi dnl $GCC = yes
+
+    dnl strip off optimizer flags
+    NEWFLAGS=""
+    for flag in $CFLAGS; do
+      case "$flag" in
+      -O*)
+        dnl echo "cut off $flag"
+        ;;
+      *)
+        NEWFLAGS="$NEWFLAGS $flag"
+        ;;
+      esac
+    done
+    CFLAGS=$NEWFLAGS
+
+]) dnl end of AC_DEFUN()
+

ares/.cvsignore

@@ -5,3 +5,4 @@ adig
 ahost
 config.log
 config.status
+aclocal.m4

ares/CHANGES

@@ -1,11 +1,65 @@
-This package is built on ares 1.1.1 (written by Greg Hudson). I've decided to
-put together and release my own ares archives since the ares maintainer
-doesn't want these improvements.
+* March 9, 2004
+- Gisle Vanem improved build on Windows.
 
-The package is called 'c-ares' for now since I (Daniel Stenberg) want this for
-use within the curl project (hence the letter C) and it makes a nice pun.
+* February 25, 2004
+- Dan Fandrich found a flaw in the Feb 22 fix.
 
-* October 24, 2003. Daniel Stenberg:
+- Added better configure --enable-debug logic (taken from the curl configure
+  script). Added acinclude.m4 to the tarball.
+
+* February 23, 2004
+- Removed ares_free_errmem(), the function, the file and the man page. It was
+  not used and it did nothing.
+
+- Fixed a lot of code that wasn't "64bit clean" and thus caused a lot of
+  compiler warnings on picky compilers.
+
+* February 22, 2004
+- Dominick Meglio made ares init support multiple name servers in the
+  NameServer key on Windows.
+
+* February 16, 2004
+- Modified ares_private.h to include libcurl's memory debug header if
+  CURLDEBUG is set. This makes all the ares-functions supervised properly by
+  the curl test suite. This also forced me to add inclusion of the
+  ares_private.h header in a few more files that are using some kind of
+  memory-related resources.
+
+- Made the makefile only build ahost and adig if 'make demos' is used.
+
+* February 10, 2004
+- Dirk Manske made ares_version.h installed with 'make install'
+
+* February 4, 2004
+- ares_free_errmem() is subject for removal, it is simply present for future
+  purposes, and since we removed the extra parameter in strerror() it won't
+  be used by c-ares!
+- configure --enable-debug now enables picky compiler options if gcc is used
+- fixed several compiler warnings --enable-debug showed and Joerg Mueller-Tolk
+  reported
+
+Version 1.0.0 (February 3, 2004)
+
+* February 3, 2004
+- now we produce the libcares.a library instead of the previous libares.a
+  since we are no longer compatible
+
+* February 2, 2004
+
+- ares_strerror() has one argument less. This is the first official
+  modification of the existing provided ares API.
+
+* January 29, 2004
+
+- Dirk Manske fixed how the socket is set non-blocking.
+
+* January 4, 2004
+
+- Dominick Meglio made the private gettimeofday() become ares_gettimeofday()
+  instead in order to not pollute the name space and risk colliding with
+  other libraries' versions of this function.
+
+* October 24, 2003. Daniel Stenberg
 
   Added ares_version().
 

ares/FILES

@@ -3,15 +3,17 @@
 *.3
 NEWS
 README
+README.cares
 CHANGES
 FILES
 maketgz
 aclocal.m4
+acinclude.m4
 Makefile.in
 install-sh
 mkinstalldirs
 configure
-configure.in
+configure.ac
 config.guess
 config.sub
 vc/adig/adig.dep

ares/Makefile.in

@@ -12,6 +12,7 @@ libdir=@libdir@
 includedir=@includedir@
 mandir=@mandir@
 
+LIB=libcares.a
 CC=@CC@
 CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@ ${WARN_CFLAGS} ${ERROR_CFLAGS}
@@ -20,23 +21,28 @@ 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_errmem.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
 
-all: libares.a adig ahost
-
-libares.a: ${OBJS}
+$(LIB): ${OBJS}
 	ar cru $@ ${OBJS}
 	${RANLIB} $@
 
-adig: adig.o libares.a
-	${CC} ${LDFLAGS} -o $@ adig.o libares.a ${LIBS}
+all: $(LIB) demos
 
-ahost: ahost.o libares.a
-	${CC} ${LDFLAGS} -o $@ ahost.o libares.a ${LIBS}
+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
 
@@ -49,14 +55,14 @@ install:
 	${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 	${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}
 	${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 644 libares.a ${DESTDIR}${libdir}
-	${RANLIB} ${DESTDIR}${libdir}/libares.a
-	chmod u-w ${DESTDIR}${libdir}/libares.a
+	${INSTALL} -m 644 $(LIB) ${DESTDIR}${libdir}
+	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
+	chmod u-w ${DESTDIR}${libdir}/$(LIB)
 	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
 	${INSTALL} -m 444 ${srcdir}/ares_destroy.3 ${DESTDIR}${mandir}/man3
 	${INSTALL} -m 444 ${srcdir}/ares_expand_name.3 ${DESTDIR}${mandir}/man3
 	${INSTALL} -m 444 ${srcdir}/ares_fds.3 ${DESTDIR}${mandir}/man3
-	${INSTALL} -m 444 ${srcdir}/ares_free_errmem.3 ${DESTDIR}${mandir}/man3
 	${INSTALL} -m 444 ${srcdir}/ares_free_hostent.3 \
 		${DESTDIR}${mandir}/man3
 	${INSTALL} -m 444 ${srcdir}/ares_free_string.3 \
@@ -81,7 +87,7 @@ install:
 	${INSTALL} -m 444 ${srcdir}/ares_timeout.3 ${DESTDIR}${mandir}/man3
 
 clean:
-	rm -f ${OBJS} libares.a adig.o adig ahost.o ahost
+	rm -f ${OBJS} $(LIB) adig.o adig ahost.o ahost
 
 distclean: clean
 	rm -f config.cache config.log config.status Makefile

ares/README

@@ -1,3 +1,8 @@
+This is c-ares, a forked version of the original ares. The original ares
+README follows below, the c-ares specific details are in README.cares
+
+====================================================================
+
 This is ares, an asynchronous resolver library.  It is intended for
 applications which need to perform DNS queries without blocking, or
 need to perform multiple DNS queries in parallel.  The primary

ares/README.cares

@@ -0,0 +1,23 @@
+
+This package is based on ares 1.1.1 (written by Greg Hudson). I've decided to
+put together and release my own ares archives since the ares maintainer
+doesn't want these improvements.
+
+The package is thus dubbed 'c-ares' since I (Daniel Stenberg) want this for
+use within the curl project (hence the letter C) and it makes a nice
+pun. Also, c-ares will not remain API compatible with the original ares, so
+picking a new name makes it more obvious to the public.
+
+The full source code is available in the 'c-ares' release archives, and in the
+'ares' subdir of the curl CVS source repostitory.
+
+If you find bugs, correct flaws, have questions or have comments in general in
+regard to c-ares (or by all means the original ares too), get in touch with us
+on the curl-library mailing list.
+
+c-ares is of course distributed under the same MIT-style license as the
+original ares.
+
+You'll find all c-ares details and news here:
+
+        http://daniel.haxx.se/projects/c-ares

ares/acinclude.m4

@@ -0,0 +1,101 @@
+
+dnl We create a function for detecting which compiler we use and then set as
+dnl pendantic compiler options as possible for that particular compiler. The
+dnl options are only used for debug-builds.
+
+dnl This is a copy of the original found in curl's configure script. Don't
+dnl modify this one, edit the one in curl and copy it back here when that one
+dnl is changed.
+
+AC_DEFUN([CURL_CC_DEBUG_OPTS],
+[
+    if test "$GCC" = "yes"; then
+
+       dnl figure out gcc version!
+       AC_MSG_CHECKING([gcc version])
+       gccver=`$CC -dumpversion`
+       num1=`echo $gccver | cut -d . -f1`
+       num2=`echo $gccver | cut -d . -f2`
+       gccnum=`(expr $num1 "*" 100 + $num2) 2>/dev/null`
+       AC_MSG_RESULT($gccver)
+
+       AC_MSG_CHECKING([if this is icc in disguise])
+       AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
+         dnl action if the text is found, this it has not been replaced by the
+         dnl cpp
+         ICC="no"
+         AC_MSG_RESULT([no]),
+         dnl the text was not found, it was replaced by the cpp
+         ICC="yes"
+         AC_MSG_RESULT([yes])
+       )
+
+       if test "$ICC" = "yes"; then
+         dnl this is icc, not gcc.
+
+         dnl ICC warnings we ignore:
+         dnl * 279 warns on static conditions in while expressions
+         dnl * 269 warns on our "%Od" printf formatters for curl_off_t output:
+         dnl   "invalid format string conversion"
+
+         WARN="-wd279,269"
+
+         if test "$gccnum" -gt "600"; then
+            dnl icc 6.0 and older doesn't have the -Wall flag
+            WARN="-Wall $WARN"
+         fi
+       else dnl $ICC = yes
+         dnl 
+         WARN="-W -Wall -Wwrite-strings -pedantic -Wno-long-long -Wundef -Wpointer-arith -Wnested-externs -Winline -Wmissing-declarations -Wmissing-prototypes -Wsign-compare"
+
+         dnl -Wcast-align is a bit too annoying ;-)
+
+         if test "$gccnum" -ge "296"; then
+           dnl gcc 2.96 or later
+           WARN="$WARN -Wfloat-equal"
+
+           if test "$gccnum" -gt "296"; then
+             dnl this option does not exist in 2.96
+             WARN="$WARN -Wno-format-nonliteral"
+           fi
+
+           dnl -Wunreachable-code seems totally unreliable on my gcc 3.3.2 on
+           dnl on i686-Linux as it gives us heaps with false positives
+           if test "$gccnum" -ge "303"; then
+             dnl gcc 3.3 and later
+             WARN="$WARN -Wendif-labels -Wstrict-prototypes"
+           fi
+         fi
+
+         for flag in $CPPFLAGS; do
+           case "$flag" in
+            -I*)
+              dnl include path
+              add=`echo $flag | sed 's/^-I/-isystem /g'`
+              WARN="$WARN $add"
+              ;;
+           esac
+         done
+
+       fi dnl $ICC = no
+
+       CFLAGS="$CFLAGS $WARN"
+
+    fi dnl $GCC = yes
+
+    dnl strip off optimizer flags
+    NEWFLAGS=""
+    for flag in $CFLAGS; do
+      case "$flag" in
+      -O*)
+        dnl echo "cut off $flag"
+        ;;
+      *)
+        NEWFLAGS="$NEWFLAGS $flag"
+        ;;
+      esac
+    done
+    CFLAGS=$NEWFLAGS
+
+]) dnl end of AC_DEFUN()
+

ares/aclocal.m4

@@ -1,358 +0,0 @@
-dnl $Id$
-
-dnl Copyright 1996 by the Massachusetts Institute of Technology.
-dnl
-dnl Permission to use, copy, modify, and distribute this
-dnl software and its documentation for any purpose and without
-dnl fee is hereby granted, provided that the above copyright
-dnl notice appear in all copies and that both that copyright
-dnl notice and this permission notice appear in supporting
-dnl documentation, and that the name of M.I.T. not be used in
-dnl advertising or publicity pertaining to distribution of the
-dnl software without specific, written prior permission.
-dnl M.I.T. makes no representations about the suitability of
-dnl this software for any purpose.  It is provided "as is"
-dnl without express or implied warranty.
-
-dnl This file provides local macros for packages which use specific
-dnl external libraries.  The public macros are:
-dnl
-dnl	ATHENA_UTIL_COM_ERR
-dnl		Generates error if com_err not found.
-dnl	ATHENA_UTIL_SS
-dnl		Generates error if ss not found.
-dnl	ATHENA_REGEXP
-dnl		Sets REGEX_LIBS if rx library used; ensures POSIX
-dnl		regexp support.
-dnl	ATHENA_MOTIF
-dnl		Sets MOTIF_LIBS and defines HAVE_MOTIF if Motif used.
-dnl	ATHENA_MOTIF_REQUIRED
-dnl		Generates error if Motif not found.
-dnl	ATHENA_AFS
-dnl		Sets AFS_LIBS and defines HAVE_AFS if AFS used.  Pass
-dnl		in an argument giving the desired AFS libraries;
-dnl		AFS_LIBS will be set to that value if AFS is found.
-dnl		AFS_DIR will be set to the prefix given.
-dnl	ATHENA_AFS_REQUIRED
-dnl		Generates error if AFS libraries not found.  AFS_DIR
-dnl		will be set to the prefix given.
-dnl	ATHENA_KRB4
-dnl		Sets KRB4_LIBS and defines HAVE_KRB4 if krb4 used.
-dnl	ATHENA_KRB4_REQUIRED
-dnl		Generates error if krb4 not found.  Sets KRB4_LIBS
-dnl		otherwise.  (Special behavior because krb4 libraries
-dnl		may be different if using krb4 compatibility libraries
-dnl		from krb5.)
-dnl	ATHENA_KRB5
-dnl		Sets KRB5_LIBS and defines HAVE_KRB5 if krb5 used.
-dnl	ATHENA_KRB5_REQUIRED
-dnl		Generates error if krb5 not found.
-dnl	ATHENA_HESIOD
-dnl		Sets HESIOD_LIBS and defines HAVE_HESIOD if Hesiod
-dnl		used.
-dnl	ATHENA_HESIOD_REQUIRED
-dnl		Generates error if Hesiod not found.
-dnl	ATHENA_ARES
-dnl		Sets ARES_LIBS and defines HAVE_ARES if libares
-dnl		used.
-dnl	ATHENA_ARES_REQUIRED
-dnl		Generates error if libares not found.
-dnl	ATHENA_ZEPHYR
-dnl		Sets ZEPHYR_LIBS and defines HAVE_ZEPHYR if zephyr
-dnl		used.
-dnl	ATHENA_ZEPHYR_REQUIRED
-dnl		Generates error if zephyr not found.
-dnl
-dnl All of the macros may extend CPPFLAGS and LDFLAGS to let the
-dnl compiler find the requested libraries.  Put ATHENA_UTIL_COM_ERR
-dnl and ATHENA_UTIL_SS before ATHENA_AFS or ATHENA_AFS_REQUIRED; there
-dnl is a com_err library in the AFS libraries which requires -lutil.
-
-dnl ----- com_err -----
-
-AC_DEFUN(ATHENA_UTIL_COM_ERR,
-[AC_ARG_WITH(com_err,
-	[  --with-com_err=PREFIX   Specify location of com_err],
-	[com_err="$withval"], [com_err=yes])
-if test "$com_err" != no; then
-	if test "$com_err" != yes; then
-		CPPFLAGS="$CPPFLAGS -I$com_err/include"
-		LDFLAGS="$LDFLAGS -L$com_err/lib"
-	fi
-	AC_CHECK_LIB(com_err, com_err, :,
-		     [AC_MSG_ERROR(com_err library not found)])
-else
-	AC_MSG_ERROR(This package requires com_err.)
-fi])
-
-dnl ----- ss -----
-
-AC_DEFUN(ATHENA_UTIL_SS,
-[AC_ARG_WITH(ss,
-	[  --with-ss=PREFIX        Specify location of ss (requires com_err)],
-	[ss="$withval"], [ss=yes])
-if test "$ss" != no; then
-	if test "$ss" != yes; then
-		CPPFLAGS="$CPPFLAGS -I$ss/include"
-		LDFLAGS="$LDFLAGS -L$ss/lib"
-	fi
-	AC_CHECK_LIB(ss, ss_perror, :,
-		     [AC_MSG_ERROR(ss library not found)], -lcom_err)
-else
-	AC_MSG_ERROR(This package requires ss.)
-fi])
-
-dnl ----- Regular expressions -----
-
-AC_DEFUN(ATHENA_REGEXP,
-[AC_ARG_WITH(regex,
-	[  --with-regex=PREFIX     Use installed regex library],
-	[regex="$withval"], [regex=no])
-if test "$regex" != no; then
-	if test "$regex" != yes; then
-		CPPFLAGS="$CPPFLAGS -I$regex/include"
-		LDFLAGS="$LDFLAGS -L$regex/lib"
-	fi
-	AC_CHECK_LIB(regex, regcomp, REGEX_LIBS=-lregex,
-		     [AC_MSG_ERROR(regex library not found)])
-else
-	AC_CHECK_FUNC(regcomp, :,
-		      [AC_MSG_ERROR(can't find POSIX regexp support)])
-fi
-AC_SUBST(REGEX_LIBS)])
-
-dnl ----- Motif -----
-
-AC_DEFUN(ATHENA_MOTIF_CHECK,
-[if test "$motif" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$motif/include"
-	LDFLAGS="$LDFLAGS -L$motif/lib"
-fi
-AC_CHECK_LIB(Xm, XmStringFree, :, [AC_MSG_ERROR(Motif library not found)])])
-
-AC_DEFUN(ATHENA_MOTIF,
-[AC_ARG_WITH(motif,
-	[  --with-motif=PREFIX     Use Motif],
-	[motif="$withval"], [motif=no])
-if test "$motif" != no; then
-	ATHENA_MOTIF_CHECK
-	MOTIF_LIBS=-lXm
-	AC_DEFINE(HAVE_MOTIF)
-fi
-AC_SUBST(MOTIF_LIBS)])
-
-AC_DEFUN(ATHENA_MOTIF_REQUIRED,
-[AC_ARG_WITH(motif,
-	[  --with-motif=PREFIX     Specify location of Motif],
-	[motif="$withval"], [motif=yes])
-if test "$motif" != no; then
-	ATHENA_MOTIF_CHECK
-else
-	AC_MSG_ERROR(This package requires Motif.)
-fi])
-
-dnl ----- AFS -----
-
-AC_DEFUN(ATHENA_AFS_CHECK,
-[AC_CHECK_FUNC(insque, :, AC_CHECK_LIB(compat, insque))
-AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
-AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket))
-if test "$afs" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$afs/include"
-	LDFLAGS="$LDFLAGS -L$afs/lib -L$afs/lib/afs"
-fi
-AC_CHECK_LIB(sys, pioctl, :, [AC_MSG_ERROR(AFS libraries not found)],
-	     -lrx -llwp -lsys)
-AFS_DIR=$afs
-AC_SUBST(AFS_DIR)])
-
-dnl Specify desired AFS libraries as a parameter.
-AC_DEFUN(ATHENA_AFS,
-[AC_ARG_WITH(afs,
-	[  --with-afs=PREFIX       Use AFS libraries],
-	[afs="$withval"], [afs=no])
-if test "$afs" != no; then
-	ATHENA_AFS_CHECK
-	AFS_LIBS=$1
-	AC_DEFINE(HAVE_AFS)
-fi
-AC_SUBST(AFS_LIBS)])
-
-AC_DEFUN(ATHENA_AFS_REQUIRED,
-[AC_ARG_WITH(afs,
-	[  --with-afs=PREFIX       Specify location of AFS libraries],
-	[afs="$withval"], [afs=/usr/afsws])
-if test "$afs" != no; then
-	ATHENA_AFS_CHECK
-else
-	AC_MSG_ERROR(This package requires AFS libraries.)
-fi])
-
-dnl ----- Kerberos 4 -----
-
-AC_DEFUN(ATHENA_KRB4_CHECK,
-[AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
-AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket))
-AC_CHECK_LIB(gen, compile)
-if test "$krb4" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$krb4/include"
-	if test -d "$krb4/include/kerberosIV"; then
-		CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV"
-	fi
-	LDFLAGS="$LDFLAGS -L$krb4/lib"
-fi
-AC_CHECK_LIB(krb4, krb_rd_req,
-	     [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
-	     [AC_CHECK_LIB(krb, krb_rd_req,
-			   [KRB4_LIBS="-lkrb -ldes"],
-			   [AC_MSG_ERROR(Kerberos 4 libraries not found)],
-			   -ldes)],
-	     -ldes425 -lkrb5 -lk5crypto -lcom_err)])
-
-AC_DEFUN(ATHENA_KRB4,
-[AC_ARG_WITH(krb4,
-	[  --with-krb4=PREFIX      Use Kerberos 4],
-	[krb4="$withval"], [krb4=no])
-if test "$krb4" != no; then
-	ATHENA_KRB4_CHECK
-	AC_DEFINE(HAVE_KRB4)
-fi
-AC_SUBST(KRB4_LIBS)])
-
-AC_DEFUN(ATHENA_KRB4_REQUIRED,
-[AC_ARG_WITH(krb4,
-	[  --with-krb4=PREFIX      Specify location of Kerberos 4],
-	[krb4="$withval"], [krb4=yes])
-if test "$krb4" != no; then
-	ATHENA_KRB4_CHECK
-	AC_SUBST(KRB4_LIBS)
-else
-	AC_MSG_ERROR(This package requires Kerberos 4.)
-fi])
-
-dnl ----- Kerberos 5 -----
-
-AC_DEFUN(ATHENA_KRB5_CHECK,
-[AC_SEARCH_LIBS(gethostbyname, nsl)
-AC_SEARCH_LIBS(socket, socket)
-AC_CHECK_LIB(gen, compile)
-if test "$krb5" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$krb5/include"
-	LDFLAGS="$LDFLAGS -L$krb5/lib"
-fi
-AC_CHECK_LIB(krb5, krb5_init_context, :,
-	     [AC_MSG_ERROR(Kerberos 5 libraries not found)],
-	     -lk5crypto -lcom_err)])
-
-AC_DEFUN(ATHENA_KRB5,
-[AC_ARG_WITH(krb5,
-	[  --with-krb5=PREFIX      Use Kerberos 5],
-	[krb5="$withval"], [krb5=no])
-if test "$krb5" != no; then
-	ATHENA_KRB5_CHECK
-	KRB5_LIBS="-lkrb5 -lk5crypto -lcom_err"
-	AC_DEFINE(HAVE_KRB5)
-fi
-AC_SUBST(KRB5_LIBS)])
-
-AC_DEFUN(ATHENA_KRB5_REQUIRED,
-[AC_ARG_WITH(krb5,
-	[  --with-krb5=PREFIX      Specify location of Kerberos 5],
-	[krb5="$withval"], [krb5=yes])
-if test "$krb5" != no; then
-	ATHENA_KRB5_CHECK
-else
-	AC_MSG_ERROR(This package requires Kerberos 5.)
-fi])
-
-dnl ----- Hesiod -----
-
-AC_DEFUN(ATHENA_HESIOD_CHECK,
-[AC_CHECK_FUNC(res_send, :, AC_CHECK_LIB(resolv, res_send))
-if test "$hesiod" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$hesiod/include"
-	LDFLAGS="$LDFLAGS -L$hesiod/lib"
-fi
-AC_CHECK_LIB(hesiod, hes_resolve, :,
-	     [AC_MSG_ERROR(Hesiod library not found)])])
-
-AC_DEFUN(ATHENA_HESIOD,
-[AC_ARG_WITH(hesiod,
-	[  --with-hesiod=PREFIX    Use Hesiod],
-	[hesiod="$withval"], [hesiod=no])
-if test "$hesiod" != no; then
-	ATHENA_HESIOD_CHECK
-	HESIOD_LIBS="-lhesiod"
-	AC_DEFINE(HAVE_HESIOD)
-fi
-AC_SUBST(HESIOD_LIBS)])
-
-AC_DEFUN(ATHENA_HESIOD_REQUIRED,
-[AC_ARG_WITH(hesiod,
-	[  --with-hesiod=PREFIX    Specify location of Hesiod],
-	[hesiod="$withval"], [hesiod=yes])
-if test "$hesiod" != no; then
-	ATHENA_HESIOD_CHECK
-else
-	AC_MSG_ERROR(This package requires Hesiod.)
-fi])
-
-dnl ----- libares -----
-
-AC_DEFUN(ATHENA_ARES_CHECK,
-[AC_CHECK_FUNC(res_send, :, AC_CHECK_LIB(resolv, res_send))
-if test "$ares" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$ares/include"
-	LDFLAGS="$LDFLAGS -L$ares/lib"
-fi
-AC_CHECK_LIB(ares, ares_init, :, [AC_MSG_ERROR(libares not found)])])
-
-AC_DEFUN(ATHENA_ARES,
-[AC_ARG_WITH(ares,
-	[  --with-ares=PREFIX      Use libares],
-	[ares="$withval"], [ares=no])
-if test "$ares" != no; then
-	ATHENA_ARES_CHECK
-	ARES_LIBS="-lares"
-	AC_DEFINE(HAVE_ARES)
-fi
-AC_SUBST(ARES_LIBS)])
-
-AC_DEFUN(ATHENA_ARES_REQUIRED,
-[AC_ARG_WITH(ares,
-	[  --with-ares=PREFIX      Specify location of libares],
-	[ares="$withval"], [ares=yes])
-if test "$ares" != no; then
-	ATHENA_ARES_CHECK
-else
-	AC_MSG_ERROR(This package requires libares.)
-fi])
-dnl ----- zephyr -----
-
-AC_DEFUN(ATHENA_ZEPHYR_CHECK,
-[if test "$zephyr" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$zephyr/include"
-	LDFLAGS="$LDFLAGS -L$zephyr/lib"
-fi
-AC_CHECK_LIB(zephyr, ZFreeNotice, :, [AC_MSG_ERROR(zephyr not found)])])
-
-AC_DEFUN(ATHENA_ZEPHYR,
-[AC_ARG_WITH(zephyr,
-	[  --with-zephyr=PREFIX      Use zephyr],
-	[zephyr="$withval"], [zephyr=no])
-if test "$zephyr" != no; then
-	ATHENA_ZEPHYR_CHECK
-	ZEPHYR_LIBS="-lzephyr"
-	AC_DEFINE(HAVE_ZEPHYR)
-fi
-AC_SUBST(ZEPHYR_LIBS)])
-
-AC_DEFUN(ATHENA_ZEPHYR_REQUIRED,
-[AC_ARG_WITH(zephyr,
-	[  --with-zephyr=PREFIX      Specify location of zephyr],
-	[zephyr="$withval"], [zephyr=yes])
-if test "$zephyr" != no; then
-	ATHENA_ZEPHYR_CHECK
-else
-	AC_MSG_ERROR(This package requires zephyr.)
-fi])

ares/adig.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -142,7 +140,6 @@ int main(int argc, char **argv)
   struct hostent *hostent;
   fd_set read_fds, write_fds;
   struct timeval *tvp, tv;
-  char *errmem;
 
 #ifdef WIN32
   WORD wVersionRequested = MAKEWORD(1,1);
@@ -241,8 +238,7 @@ int main(int argc, char **argv)
   if (status != ARES_SUCCESS)
     {
       fprintf(stderr, "ares_init_options: %s\n",
-	      ares_strerror(status, &errmem));
-      ares_free_errmem(errmem);
+	      ares_strerror(status));
       return 1;
     }
 
@@ -283,9 +279,9 @@ int main(int argc, char **argv)
 
 static void callback(void *arg, int status, unsigned char *abuf, int alen)
 {
-  char *name = (char *) arg, *errmem;
-  int id, qr, opcode, aa, tc, rd, ra, rcode, i;
-  unsigned int qdcount, ancount, nscount, arcount;
+  char *name = (char *) arg;
+  int id, qr, opcode, aa, tc, rd, ra, rcode;
+  unsigned int qdcount, ancount, nscount, arcount, i;
   const unsigned char *aptr;
 
   /* Display the query name if given. */
@@ -297,8 +293,7 @@ static void callback(void *arg, int status, unsigned char *abuf, int alen)
    */
   if (status != ARES_SUCCESS)
     {
-      printf("%s\n", ares_strerror(status, &errmem));
-      ares_free_errmem(errmem);
+      printf("%s\n", ares_strerror(status));
       if (!abuf)
 	return;
     }
@@ -375,7 +370,8 @@ static const unsigned char *display_question(const unsigned char *aptr,
 					     int alen)
 {
   char *name;
-  int type, dnsclass, status, len;
+  int type, dnsclass, status;
+  long len;
 
   /* Parse the question name. */
   status = ares_expand_name(aptr, abuf, alen, &name, &len);
@@ -413,7 +409,8 @@ static const unsigned char *display_rr(const unsigned char *aptr,
 {
   const unsigned char *p;
   char *name;
-  int type, dnsclass, ttl, dlen, status, len;
+  int type, dnsclass, ttl, dlen, status;
+  long len;
   struct in_addr addr;
 
   /* Parse the RR name. */

ares/ahost.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -46,7 +44,6 @@ int main(int argc, char **argv)
   int status, nfds;
   fd_set read_fds, write_fds;
   struct timeval *tvp, tv;
-  char *errmem;
   struct in_addr addr;
 
 #ifdef WIN32
@@ -55,14 +52,13 @@ int main(int argc, char **argv)
   WSAStartup(wVersionRequested, &wsaData);
 #endif  
 
-  if (argc == 0)
+  if (argc <= 1)
     usage();
 
   status = ares_init(&channel);
   if (status != ARES_SUCCESS)
     {
-      fprintf(stderr, "ares_init: %s\n", ares_strerror(status, &errmem));
-      ares_free_errmem(errmem);
+      fprintf(stderr, "ares_init: %s\n", ares_strerror(status));
       return 1;
     }
 
@@ -99,12 +95,11 @@ int main(int argc, char **argv)
 static void callback(void *arg, int status, struct hostent *host)
 {
   struct in_addr addr;
-  char *mem, **p;
+  char **p;
 
   if (status != ARES_SUCCESS)
     {
-      fprintf(stderr, "%s: %s\n", (char *) arg, ares_strerror(status, &mem));
-      ares_free_errmem(mem);
+      fprintf(stderr, "%s: %s\n", (char *) arg, ares_strerror(status));
       return;
     }
 

ares/ares.h

@@ -20,6 +20,13 @@
 
 #include <sys/types.h>
 
+#ifdef _AIX
+/* 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>
@@ -117,14 +124,14 @@ 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 ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
-		     int alen, char **s, int *enclen);
+		     int alen, char **s, long *enclen);
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
 		       struct hostent **host);
 int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
 			 int addrlen, int family, struct hostent **host);
-void ares_free_string(char *str);
+void ares_free_string(void *str);
 void ares_free_hostent(struct hostent *host);
-const char *ares_strerror(int code, char **memptr);
+const char *ares_strerror(int code);
 void ares_free_errmem(char *mem);
 
 #endif /* ARES__H */

ares/ares__close_sockets.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <stdlib.h>
 #ifdef WIN32
 #else

ares/ares__get_hostent.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares__read_line.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,7 +30,8 @@ static const char rcsid[] = "$Id$";
 int ares__read_line(FILE *fp, char **buf, int *bufsize)
 {
   char *newbuf;
-  int offset = 0, len;
+  size_t offset = 0;
+  size_t len;
 
   if (*buf == NULL)
     {
@@ -44,7 +43,7 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize)
 
   while (1)
     {
-      if (!fgets(*buf + offset, *bufsize - offset, fp))
+      if (!fgets(*buf + offset, *bufsize - (int)offset, fp))
 	return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
       len = offset + strlen(*buf + offset);
       if ((*buf)[len - 1] == '\n')

ares/ares_destroy.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"
@@ -30,7 +28,8 @@ void ares_destroy(ares_channel channel)
   for (i = 0; i < channel->ndomains; i++)
     free(channel->domains[i]);
   free(channel->domains);
-  free(channel->sortlist);
+  if(channel->sortlist)
+    free(channel->sortlist);
   free(channel->lookups);
   while (channel->queries)
     {

ares/ares_expand_name.3

@@ -22,8 +22,7 @@ ares_expand_name \- Expand a DNS-encoded domain name
 .B #include <ares.h>
 .PP
 .B int ares_expand_name(const unsigned char *\fIencoded\fP,
-.B
-	const unsigned char *\fIabuf\fP, int \fIalen\fP, char **\fIs\fP,
+.B      const unsigned char *\fIabuf\fP, int \fIalen\fP, char **\fIs\fP,
 .B 	int *\fIenclen\fP)
 .fi
 .SH DESCRIPTION

ares/ares_expand_name.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -26,6 +24,7 @@ static const char rcsid[] = "$Id$";
 
 #include <stdlib.h>
 #include "ares.h"
+#include "ares_private.h" /* for the memdebug */
 
 static int name_length(const unsigned char *encoded, const unsigned char *abuf,
 		       int alen);
@@ -55,7 +54,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, int *enclen)
+		     int alen, char **s, long *enclen)
 {
   int len, indir = 0;
   char *q;

ares/ares_fds.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares_free_errmem.c

@@ -1,26 +0,0 @@
-/* Copyright 1998 by the Massachusetts Institute of Technology.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-static const char rcsid[] = "$Id$";
-
-#include "ares.h"
-
-/* Do nothing, for now.  A future implementation may want to deal with
- * internationalization, in which case ares_strerror() might allocate
- * memory which we would then have to free.
- */
-void ares_free_errmem(char *mem)
-{
-}

ares/ares_free_hostent.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <stdlib.h>
 
 #ifdef WIN32
@@ -24,6 +22,7 @@ static const char rcsid[] = "$Id$";
 #endif
 
 #include "ares.h"
+#include "ares_private.h" /* for memdebug */
 
 void ares_free_hostent(struct hostent *host)
 {

ares/ares_free_string.3

@@ -14,14 +14,14 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_FREE_STRING 3 "4 January 2000"
+.TH ARES_FREE_STRING 3 "4 February 2004"
 .SH NAME
 ares_free_string \- Free strings allocated by ares functions
 .SH SYNOPSIS
 .nf
 .B #include <ares.h>
 .PP
-.B void ares_free_string(char *\fIstr\fP)
+.B void ares_free_string(void *\fIstr\fP)
 .fi
 .SH DESCRIPTION
 The

ares/ares_free_string.c

@@ -13,12 +13,10 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <stdlib.h>
 #include "ares.h"
 
-void ares_free_string(char *str)
+void ares_free_string(void *str)
 {
   free(str);
 }

ares/ares_gethostbyaddr.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -89,10 +87,10 @@ static void next_lookup(struct addr_query *aquery)
 	{
 	case 'b':
 	  addr = ntohl(aquery->addr.s_addr);
-	  a1 = addr >> 24;
-	  a2 = (addr >> 16) & 0xff;
-	  a3 = (addr >> 8) & 0xff;
-	  a4 = addr & 0xff;
+	  a1 = (int)(addr >> 24) & 0xff;
+	  a2 = (int)(addr >> 16) & 0xff;
+	  a3 = (int)(addr >> 8) & 0xff;
+	  a4 = (int)addr & 0xff;
 	  sprintf(name, "%d.%d.%d.%d.in-addr.arpa", a4, a3, a2, a1);
 	  aquery->remaining_lookups = p + 1;
 	  ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback,

ares/ares_gethostbyname.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares_init.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -46,12 +44,12 @@ 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_nameserver(struct server_state **servers, int *nservers,
-			     const char *str);
+			     char *str);
 static int config_sortlist(struct apattern **sortlist, int *nsort,
 			   const char *str);
 static int set_search(ares_channel channel, const char *str);
 static int set_options(ares_channel channel, const char *str);
-static char *try_config(char *s, char *opt);
+static char *try_config(char *s, const char *opt);
 static const char *try_option(const char *p, const char *q, const char *opt);
 static int ip_addr(const char *s, int len, struct in_addr *addr);
 static void natural_mask(struct apattern *pat);
@@ -138,7 +136,8 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
    * field, so there's not much to be done about that.
    */
   gettimeofday(&tv, NULL);
-  channel->next_id = (tv.tv_sec ^ tv.tv_usec ^ getpid()) & 0xffff;
+  channel->next_id = (unsigned short)
+    (tv.tv_sec ^ tv.tv_usec ^ getpid()) & 0xffff;
 
   channel->queries = NULL;
 
@@ -232,7 +231,7 @@ static int init_by_environment(ares_channel channel)
 #ifdef WIN32
 static int get_res_size_nt(HKEY hKey, char *subkey, int *size)
 {
-	return RegQueryValueEx(hKey, subkey, 0, NULL, NULL, size);
+  return RegQueryValueEx(hKey, subkey, 0, NULL, NULL, size);
 }
 
 /* Warning: returns a dynamically allocated buffer, the user MUST
@@ -240,55 +239,56 @@ static int get_res_size_nt(HKEY hKey, char *subkey, int *size)
  */
 static int get_res_nt(HKEY hKey, char *subkey, char **obuf)
 {
-	/* Test for the size we need */
-	int 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);
+  /* Test for the size we need */
+  int 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 (RegQueryValueEx(hKey, subkey, 0, NULL, *obuf, &size) != ERROR_SUCCESS)
-	{
-		free(*obuf);
-		return 0;
-	}
-	if (size == 1)
-	{
-		free(*obuf);
-		return 0;
-	}
-	return 1;
+  if (RegQueryValueEx(hKey, subkey, 0, NULL, *obuf, &size) != ERROR_SUCCESS)
+  {
+    free(*obuf);
+    return 0;
+  }
+  if (size == 1)
+  {
+    free(*obuf);
+    return 0;
+  }
+  return 1;
 }
 
 static int get_res_interfaces_nt(HKEY hKey, char *subkey, char **obuf)
 {
-	char enumbuf[39]; /* GUIDs are 38 chars + 1 for NULL */
-	int enum_size = 39;
-	int idx = 0;
-	HKEY hVal;
-	while (RegEnumKeyEx(hKey, idx++, enumbuf, &enum_size, 0, NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS)
-	{
-		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
-		{
-			RegCloseKey(hVal);
-			return 1;
-		}
-	}
-	return 0;
+  char enumbuf[39]; /* GUIDs are 38 chars + 1 for NULL */
+  int enum_size = 39;
+  int idx = 0;
+  HKEY hVal;
+  while (RegEnumKeyEx(hKey, idx++, enumbuf, &enum_size, 0,
+                      NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS)
+  {
+    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
+    {
+      RegCloseKey(hVal);
+      return 1;
+    }
+  }
+  return 0;
 }
 #endif
 
 static int init_by_resolv_conf(ares_channel channel)
 {
-  FILE *fp;
-  char *line = NULL, *p;
-  int linesize, status, nservers = 0, nsort = 0;
+  char *line = NULL;
+  int status, nservers = 0, nsort = 0;
   struct server_state *servers = NULL;
   struct apattern *sortlist = NULL;
 
@@ -317,8 +317,6 @@ DhcpNameServer
   DWORD data_type;
   DWORD bytes;
   DWORD result;
-  DWORD index;
-  char name[MAX_PATH];
   DWORD keysize = MAX_PATH;
 
   status = ARES_EFILE;
@@ -326,70 +324,75 @@ DhcpNameServer
   if (IsNT) 
   {
     if (RegOpenKeyEx(
-            HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
-            KEY_READ, &mykey
-        ) == ERROR_SUCCESS)
-    {
-		RegOpenKeyEx(mykey, "Interfaces", 0, KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS, &subkey);
-		if (get_res_nt(mykey, NAMESERVER, &line))
-		{
-			status = config_nameserver(&servers, &nservers, line);
-			free(line);
-		}
-		else if (get_res_nt(mykey, DHCPNAMESERVER, &line))
-		{
-			status = config_nameserver(&servers, &nservers, line);
-			free(line);
-		}
-		/* Try the interfaces */
-		else if (get_res_interfaces_nt(subkey, NAMESERVER, &line))
-		{
-			status = config_nameserver(&servers, &nservers, line);
-			free(line);
-		}
-		else if (get_res_interfaces_nt(subkey, DHCPNAMESERVER, &line))
-		{
-			status = config_nameserver(&servers, &nservers, line);
-			free(line);
-		}
-		RegCloseKey(subkey);
-	    RegCloseKey(mykey);
-	}
-  } else {
-      if (RegOpenKeyEx(
-            HKEY_LOCAL_MACHINE, WIN_NS_9X, 0,
-            KEY_READ, &mykey
+          HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
+          KEY_READ, &mykey
           ) == ERROR_SUCCESS)
+    {
+      RegOpenKeyEx(mykey, "Interfaces", 0,
+                   KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS, &subkey);
+      if (get_res_nt(mykey, NAMESERVER, &line))
       {
-        if ((result = RegQueryValueEx(
-                        mykey, NAMESERVER, NULL, &data_type,
-                        NULL, &bytes
-                      ) 
-            ) == ERROR_SUCCESS ||
-            result == ERROR_MORE_DATA)
-        {
-            if (bytes) {
-                line = (char *)malloc(bytes+1);
-                if (RegQueryValueEx(
-                    mykey, NAMESERVER, NULL, &data_type,
-                    (unsigned char *)line, &bytes
-                    ) == ERROR_SUCCESS) {
-                    status = config_nameserver(&servers, &nservers, line);
-                }
-                free(line);
-            }
-        }
-      } 
+        status = config_nameserver(&servers, &nservers, line);
+        free(line);
+      }
+      else if (get_res_nt(mykey, DHCPNAMESERVER, &line))
+      {
+        status = config_nameserver(&servers, &nservers, line);
+        free(line);
+      }
+      /* Try the interfaces */
+      else if (get_res_interfaces_nt(subkey, NAMESERVER, &line))
+      {
+        status = config_nameserver(&servers, &nservers, line);
+        free(line);
+      }
+      else if (get_res_interfaces_nt(subkey, DHCPNAMESERVER, &line))
+      {
+        status = config_nameserver(&servers, &nservers, line);
+        free(line);
+      }
+      RegCloseKey(subkey);
       RegCloseKey(mykey);
+    }
+  }
+  else
+  {
+    if (RegOpenKeyEx(
+          HKEY_LOCAL_MACHINE, WIN_NS_9X, 0,
+          KEY_READ, &mykey
+          ) == ERROR_SUCCESS)
+    {
+      if ((result = RegQueryValueEx(
+             mykey, NAMESERVER, NULL, &data_type,
+             NULL, &bytes
+             ) 
+            ) == ERROR_SUCCESS ||
+          result == ERROR_MORE_DATA)
+      {
+        if (bytes)
+        {
+          line = (char *)malloc(bytes+1);
+          if (RegQueryValueEx(mykey, NAMESERVER, NULL, &data_type,
+                              (unsigned char *)line, &bytes) ==
+              ERROR_SUCCESS)
+          {
+            status = config_nameserver(&servers, &nservers, line);
+          }
+          free(line);
+        }
+      }
+    } 
+    RegCloseKey(mykey);
   }
   
-  if (status != ARES_EFILE) {
-      /*
+  if (status != ARES_EFILE)
+  {
+    /*
       if (!channel->lookups) {
-          status = config_lookup(channel, "file bind");
+      status = config_lookup(channel, "file bind");
       }
-      */
-      status = ARES_EOF;
+    */
+    status = ARES_EOF;
   }
 
 #elif defined(riscos)
@@ -418,36 +421,41 @@ DhcpNameServer
 
     if (status == ARES_SUCCESS)
       status = ARES_EOF;
-
+    
     free(resolvers);
   }
 
 #else
-
-  fp = fopen(PATH_RESOLV_CONF, "r");
-  if (!fp)
-    return (errno == ENOENT) ? ARES_SUCCESS : ARES_EFILE;
-  while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
+  {
+    char *p;
+    FILE *fp;
+    int linesize;
+   
+    fp = fopen(PATH_RESOLV_CONF, "r");
+    if (!fp)
+      return (errno == ENOENT) ? ARES_SUCCESS : ARES_EFILE;
+    while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
     {
       if ((p = try_config(line, "domain")) && channel->ndomains == -1)
-	status = config_domain(channel, p);
+        status = config_domain(channel, p);
       else if ((p = try_config(line, "lookup")) && !channel->lookups)
-	status = config_lookup(channel, p);
+        status = config_lookup(channel, p);
       else if ((p = try_config(line, "search")) && channel->ndomains == -1)
-	status = set_search(channel, p);
+        status = set_search(channel, p);
       else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
-	status = config_nameserver(&servers, &nservers, p);
+        status = config_nameserver(&servers, &nservers, p);
       else if ((p = try_config(line, "sortlist")) && channel->nsort == -1)
-	status = config_sortlist(&sortlist, &nsort, p);
+        status = config_sortlist(&sortlist, &nsort, p);
       else if ((p = try_config(line, "options")))
-	status = set_options(channel, p);
+        status = set_options(channel, p);
       else
-	status = ARES_SUCCESS;
+        status = ARES_SUCCESS;
       if (status != ARES_SUCCESS)
-	break;
+        break;
     }
-  free(line);
-  fclose(fp);
+    free(line);
+    fclose(fp);
+  }
 
 #endif
 
@@ -581,11 +589,52 @@ static int config_lookup(ares_channel channel, const char *str)
 }
 
 static int config_nameserver(struct server_state **servers, int *nservers,
-			     const char *str)
+			     char *str)
 {
   struct in_addr addr;
   struct server_state *newserv;
+  /* On Windows, there may be more than one nameserver specified in the same
+   * registry key, so we parse it as a space or comma seperated list.
+   */
+#ifdef WIN32
+  char *p = str;
+  char *begin = str;
+  int more = 1;
+  while (more)
+  {
+    more = 0;
+    while (*p && !isspace(*p) && *p != ',')
+      p++;
 
+    if (*p)
+    {
+      *p = 0;
+      more = 1;
+    }
+
+    /* Skip multiple spaces or trailing spaces */
+    if (!*begin)
+    {
+      begin = ++p;
+      continue;
+    }
+
+    /* This is the part that actually sets the nameserver */
+    addr.s_addr = inet_addr(begin);
+    if (addr.s_addr == INADDR_NONE)
+      continue;
+    newserv = realloc(*servers, (*nservers + 1) * sizeof(struct server_state));
+    if (!newserv)
+      return ARES_ENOMEM;
+    newserv[*nservers].addr = addr;
+    *servers = newserv;
+    (*nservers)++;
+
+    if (!more)
+      break;
+    begin = ++p;
+  }
+#else
   /* Add a nameserver entry, if this is a valid address. */
   addr.s_addr = inet_addr(str);
   if (addr.s_addr == INADDR_NONE)
@@ -596,6 +645,7 @@ static int config_nameserver(struct server_state **servers, int *nservers,
   newserv[*nservers].addr = addr;
   *servers = newserv;
   (*nservers)++;
+#endif
   return ARES_SUCCESS;
 }
 
@@ -611,7 +661,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
       q = str;
       while (*q && *q != '/' && *q != ';' && !isspace((unsigned char)*q))
 	q++;
-      if (ip_addr(str, q - str, &pat.addr) == 0)
+      if (ip_addr(str, (int)(q - str), &pat.addr) == 0)
 	{
 	  /* We have a pattern address; now determine the mask. */
 	  if (*q == '/')
@@ -619,7 +669,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
 	      str = q + 1;
 	      while (*q && *q != ';' && !isspace((unsigned char)*q))
 		q++;
-	      if (ip_addr(str, q - str, &pat.mask) != 0)
+	      if (ip_addr(str, (int)(q - str), &pat.mask) != 0)
 		natural_mask(&pat);
 	    }
 	  else
@@ -718,9 +768,9 @@ static int set_options(ares_channel channel, const char *str)
   return ARES_SUCCESS;
 }
 
-static char *try_config(char *s, char *opt)
+static char *try_config(char *s, const char *opt)
 {
-  int len;
+  size_t len;
 
   len = strlen(opt);
   if (strncmp(s, opt, len) != 0 || !isspace((unsigned char)s[len]))
@@ -733,10 +783,8 @@ static char *try_config(char *s, char *opt)
 
 static const char *try_option(const char *p, const char *q, const char *opt)
 {
-  int len;
-
-  len = strlen(opt);
-  return (q - p > len && strncmp(p, opt, len) == 0) ? p + len : NULL;
+  size_t len = strlen(opt);
+  return ((size_t)(q - p) > len && !strncmp(p, opt, len)) ? &p[len] : NULL;
 }
 
 static int ip_addr(const char *s, int len, struct in_addr *addr)

ares/ares_mkquery.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares_parse_a_reply.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -37,8 +35,9 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
 		       struct hostent **host)
 {
   unsigned int qdcount, ancount;
-  int status, i, len, rr_type, rr_class, rr_len, naddrs;
+  int status, i, rr_type, rr_class, rr_len, naddrs;
   int naliases;
+  long len;
   const unsigned char *aptr;
   char *hostname, *rr_name, *rr_data, **aliases;
   struct in_addr *addrs;
@@ -87,7 +86,7 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
   naliases = 0;
 
   /* Examine each answer resource record (RR) in turn. */
-  for (i = 0; i < ancount; i++)
+  for (i = 0; i < (int)ancount; i++)
     {
       /* Decode the RR up to the data field. */
       status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);

ares/ares_parse_ptr_reply.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -36,7 +34,8 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
 			 int addrlen, int family, struct hostent **host)
 {
   unsigned int qdcount, ancount;
-  int status, i, len, rr_type, rr_class, rr_len;
+  int status, i, rr_type, rr_class, rr_len;
+  long len;
   const unsigned char *aptr;
   char *ptrname, *hostname, *rr_name, *rr_data;
   struct hostent *hostent;
@@ -68,7 +67,7 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
 
   /* Examine each answer resource record (RR) in turn. */
   hostname = NULL;
-  for (i = 0; i < ancount; i++)
+  for (i = 0; i < (int)ancount; i++)
     {
       /* Decode the RR up to the data field. */
       status = ares_expand_name(aptr, abuf, alen, &rr_name, &len);

ares/ares_private.h

@@ -56,8 +56,8 @@
 
 struct send_request {
   /* Remaining data to send */
-  const char *data;
-  int len;
+  const unsigned char *data;
+  size_t len;
 
   /* Next request in queue */
   struct send_request *next;
@@ -88,11 +88,11 @@ struct query {
   time_t timeout;
 
   /* Query buf with length at beginning, for TCP transmission */
-  char *tcpbuf;
+  unsigned char *tcpbuf;
   int tcplen;
 
   /* Arguments passed to ares_send() (qbuf points into tcpbuf) */
-  const char *qbuf;
+  const unsigned char *qbuf;
   int qlen;
   ares_callback callback;
   void *arg;
@@ -143,3 +143,11 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now);
 void ares__close_sockets(struct server_state *server);
 int ares__get_hostent(FILE *fp, struct hostent **host);
 int ares__read_line(FILE *fp, char **buf, int *bufsize);
+
+#ifdef CURLDEBUG
+/* This is low-level hard-hacking memory leak tracking and similar. Using the
+   libcurl lowlevel code from within library is ugly and only works when
+   c-ares is built and linked with a similarly debug-build libcurl, but we do
+   this anyway for convenience. */
+#include "../lib/memdebug.h"
+#endif

ares/ares_process.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32
@@ -121,7 +119,7 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
 	  while (count)
 	    {
 	      sendreq = server->qhead;
-	      if (count >= sendreq->len)
+	      if ((size_t)count >= sendreq->len)
 		{
 		  count -= sendreq->len;
 		  server->qhead = sendreq->next;
@@ -152,7 +150,7 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
 	    }
 
 	  /* Advance the send queue by as many bytes as we sent. */
-	  if (count == sendreq->len)
+	  if ((size_t)count == sendreq->len)
 	    {
 	      server->qhead = sendreq->next;
 	      if (server->qhead == NULL)
@@ -451,7 +449,7 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
 static int open_tcp_socket(ares_channel channel, struct server_state *server)
 {
   int s, flags;
-  struct sockaddr_in sin;
+  struct sockaddr_in sockin;
 
   /* Acquire a socket. */
   s = socket(AF_INET, SOCK_STREAM, 0);
@@ -464,12 +462,14 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
   flags = 1;
   ioctlsocket(s, FIONBIO, &flags);
 #else
-  if (fcntl(s, F_GETFL, &flags) == -1)
+  flags = fcntl(s, F_GETFL, 0);
+
+  if (flags == -1)
     {
       close(s);
       return -1;
     }
-  flags &= O_NONBLOCK;
+  flags |= O_NONBLOCK;
   if (fcntl(s, F_SETFL, flags) == -1)
     {
       close(s);
@@ -478,11 +478,11 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
 #endif
   
   /* Connect to the server. */
-  memset(&sin, 0, sizeof(sin));
-  sin.sin_family = AF_INET;
-  sin.sin_addr = server->addr;
-  sin.sin_port = channel->tcp_port;
-  if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) == -1
+  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)
     {
       closesocket(s);
@@ -496,7 +496,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
 static int open_udp_socket(ares_channel channel, struct server_state *server)
 {
   int s;
-  struct sockaddr_in sin;
+  struct sockaddr_in sockin;
 
   /* Acquire a socket. */
   s = socket(AF_INET, SOCK_DGRAM, 0);
@@ -504,11 +504,11 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
     return -1;
 
   /* Connect to the server. */
-  memset(&sin, 0, sizeof(sin));
-  sin.sin_family = AF_INET;
-  sin.sin_addr = server->addr;
-  sin.sin_port = channel->udp_port;
-  if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) == -1)
+  memset(&sockin, 0, sizeof(sockin));
+  sockin.sin_family = AF_INET;
+  sockin.sin_addr = server->addr;
+  sockin.sin_port = channel->udp_port;
+  if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1)
     {
       closesocket(s);
       return -1;
@@ -525,7 +525,7 @@ static int same_questions(const unsigned char *qbuf, int qlen,
     const unsigned char *p;
     int qdcount;
     char *name;
-    int namelen;
+    long namelen;
     int type;
     int dnsclass;
   } q, a;

ares/ares_query.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares_search.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -185,7 +183,8 @@ static void end_squery(struct search_query *squery, int status,
 /* Concatenate two domains. */
 static int cat_domain(const char *name, const char *domain, char **s)
 {
-  int nlen = strlen(name), dlen = strlen(domain);
+  size_t nlen = strlen(name);
+  size_t dlen = strlen(domain);
 
   *s = malloc(nlen + 1 + dlen + 1);
   if (!*s)
@@ -203,7 +202,7 @@ static int cat_domain(const char *name, const char *domain, char **s)
  */
 static int single_domain(ares_channel channel, const char *name, char **s)
 {
-  int len = strlen(name);
+  size_t len = strlen(name);
   const char *hostaliases;
   FILE *fp;
   char *line = NULL;

ares/ares_send.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares_strerror.3

@@ -21,23 +21,16 @@ ares_strerror \- Get the description of an ares library error code
 .nf
 .B #include <ares.h>
 .PP
-.B const char *ares_strerror(int \fIcode\fP, char **\fImemptr\fP)
+.B const char *ares_strerror(int \fIcode\fP)
 .fi
 .SH DESCRIPTION
 The
 .B ares_strerror
 function gets the description of the ares library error code
 .IR code ,
-returning the result as a NUL-terminated C string.  A pointer to
-allocated data necessary to compose the error description may be
-stored in the variable pointed to by
-.IR memptr .
-It is the caller's responsibility to invoke
-.BR ares_free_errmem (3)
-with the value of that variable when the error description is no
-longer needed.
-.SH SEE ALSO
-.BR ares_free_errmem (3)
+returning the result as a NUL-terminated C string.
+.SH NOTES
+This function is not compatible with ares.
 .SH AUTHOR
 Greg Hudson, MIT Information Systems
 .br

ares/ares_strerror.c

@@ -13,16 +13,12 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <assert.h>
 #include "ares.h"
 
-const char *ares_strerror(int code, char **memptr)
+const char *ares_strerror(int code)
 {
-  /* A future implementation may want to handle internationalization.
-   * For now, just return a string literal from a table.
-   */
+  /* Return a string literal from a table. */
   const char *errtext[] = {
     "Successful completion",
     "DNS server returned answer with no data",
@@ -42,6 +38,6 @@ const char *ares_strerror(int code, char **memptr)
     "Out of memory"
   };
 
-  assert(code >= 0 && code < (sizeof(errtext) / sizeof(*errtext)));
+  assert(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext)));
   return errtext[code];
 }

ares/ares_timeout.c

@@ -13,8 +13,6 @@
  * without express or implied warranty.
  */
 
-static const char rcsid[] = "$Id$";
-
 #include <sys/types.h>
 
 #ifdef WIN32

ares/ares_version.3

@@ -1,6 +1,6 @@
 .\" $Id$
 .\"
-.\" Copyright 1998 by the Massachusetts Institute of Technology.
+.\" Copyright 2004 by Daniel Stenberg
 .\"
 .\" Permission to use, copy, modify, and distribute this
 .\" software and its documentation for any purpose and without
@@ -14,29 +14,28 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH ARES_FREE_ERRMEM 3 "23 July 1998"
+.TH ARES_VERSION 3 "29 January 2004"
 .SH NAME
-ares_free_errmem \- Free memory allocated by ares_strerror
+ares_version \- Get the version number of the library
 .SH SYNOPSIS
 .nf
 .B #include <ares.h>
 .PP
-.B void ares_free_errmem(char *\fIerrmem\fP)
+.B const char *ares_version(int *\fIversion\fP)
 .fi
 .SH DESCRIPTION
 The
-.B ares_free_errmem
-function frees any memory which might have been allocated by the
-.BR ares_strerror (3)
-function.  The parameter
-.I errmem
-should be set to the variable pointed to by the
-.I memptr
-argument previously passed to
-.IR ares_strerror .
-.SH SEE ALSO
-.BR ares_strerror (3)
+.B ares_version
+function gets the library version as a string and optionally as an integer
+stored in the
+.IR version ,
+argument. If you pass a NULL, no integer is attempted to be returned.
+
+The integer is built up as 24bit number, with 8 separate bits used for major
+number, minor number and patch number. This makes a version string such as
+1.2.3 will be returned as the hexadecimal number 0x010203 (decimal 66051).
+.SH NOTES
+This function is not compatible with ares.
 .SH AUTHOR
-Greg Hudson, MIT Information Systems
-.br
-Copyright 1998 by the Massachusetts Institute of Technology.
+Daniel Stenberg
+

ares/ares_version.c

@@ -2,7 +2,7 @@
 
 #include "ares_version.h"
 
-char *ares_version(int *version)
+const char *ares_version(int *version)
 {
   if(version)
     *version = ARES_VERSION;

ares/ares_version.h

@@ -11,7 +11,7 @@
                        (ARES_VERSION_PATCH))
 #define ARES_VERSION_STR "1.0.0"
 
-char *ares_version(int *version);
+const char *ares_version(int *version);
 
 #endif
 

ares/configure.ac

@@ -0,0 +1,56 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(ares_init.c)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+AC_CANONICAL_HOST
+case $host_os in
+solaris*)
+	AC_DEFINE(ETC_INET)
+	;;
+esac
+
+AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_SEARCH_LIBS(socket, socket)
+
+dnl ************************************************************
+dnl Option to switch on debug options. This makes an assumption that
+dnl this is built as an 'ares' subdir in the curl source tree. Subject for
+dnl improval in the future!
+dnl
+AC_MSG_CHECKING([whether to enable debug options])
+AC_ARG_ENABLE(debug,
+AC_HELP_STRING([--enable-debug],[Enable pedantic debug options])
+AC_HELP_STRING([--disable-debug],[Disable debug options]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+
+    dnl Checks for standard header files, to make memdebug.h inclusions bettter
+    AC_HEADER_STDC
+
+    CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I../include"
+    CFLAGS="$CFLAGS -g" 
+
+    dnl set compiler "debug" options to become more picky, and remove
+    dnl optimize options from CFLAGS
+    CURL_CC_DEBUG_OPTS
+
+       ;;
+  esac ],
+       AC_MSG_RESULT(no)
+)
+
+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_OUTPUT(Makefile)

ares/configure.in

@@ -1,18 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ares_init.c)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-AC_CANONICAL_HOST
-case $host_os in
-solaris*)
-	AC_DEFINE(ETC_INET)
-	;;
-esac
-
-AC_SEARCH_LIBS(gethostbyname, nsl)
-AC_SEARCH_LIBS(socket, socket)
-
-AC_OUTPUT(Makefile)

ares/maketgz

@@ -2,6 +2,8 @@
 
 $version = $ARGV[0];
 
+$name="c-ares";
+
 if($version eq "") {
     print "Enter version number!\n";
     exit;
@@ -81,13 +83,16 @@ sub mkalldir {
 }
 
 for(@entries) {
-    my $dir = dirpart("arescurl-$version/$_");
+    my $dir = dirpart("$name-$version/$_");
  #   print "Create $dir\n";
     mkalldir($dir);
  #   print "Copy $_ to $dir\n";
     `cp -p $_ $dir`;
 }
 
-`tar -cf arescurl-$version.tar arescurl-$version`;
-`gzip -9 arescurl-$version.tar`;
-`rm -rf arescurl-$version`;
+# 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`;

ares/nameser.h

@@ -1,7 +1,11 @@
+#ifndef ARES_NAMESER_H
+#define ARES_NAMESER_H
+
 /* Windows-only header file provided by liren@vivisimo.com to make his Windows
    port build */
 
 #include <windows.h>
+#include <process.h> /* for the _getpid() proto */
 #include <sys/types.h>
 
 #define MAXHOSTNAMELEN 256
@@ -17,8 +21,10 @@ struct iovec
 
 #define getpid() _getpid()
 
-int strcasecmp(const char *a, const char *b);
-int gettimeofday(struct timeval *tv, struct timezone *tz);
+struct timezone { int dummy; };
+
+int ares_gettimeofday(struct timeval *tv, struct timezone *tz);
+#define gettimeofday(tv,tz) ares_gettimeofday(tv,tz)
 
 #define NS_CMPRSFLGS  0xc0  
 
@@ -35,7 +41,7 @@ typedef enum __ns_class {
     /* Query class values which do not appear in resource records */
     ns_c_none = 254,        /* for prereq. sections in update requests */
     ns_c_any = 255,         /* Wildcard match. */
-        ns_c_max = 65536
+    ns_c_max = 65536
 } ns_class;
 
 #define C_IN           ns_c_in
@@ -113,7 +119,7 @@ typedef enum __ns_opcode {
                                 /* Opcode 3 is undefined/reserved. */
     ns_o_notify = 4,        /* Zone change notification. */
     ns_o_update = 5,        /* Zone update message. */
-        ns_o_max = 6
+    ns_o_max = 6
 } ns_opcode;
 
 #define QUERY          ns_o_query
@@ -147,17 +153,18 @@ typedef enum __ns_rcode {
     /* The following are TSIG extended errors */
     ns_r_badsig = 16,
     ns_r_badkey = 17,
-        ns_r_badtime = 18
+    ns_r_badtime = 18
 } ns_rcode;
 
-#define SERVFAIL       ns_r_servfail
-#define NOTIMP         ns_r_notimpl
-#define REFUSED        ns_r_refused
-#define NOERROR                ns_r_noerror
-#define FORMERR                ns_r_formerr
-#define NXDOMAIN       ns_r_nxdomain
+#define SERVFAIL        ns_r_servfail
+#define NOTIMP          ns_r_notimpl
+#define REFUSED         ns_r_refused
+#undef NOERROR /* it seems this is already defined in winerror.h */
+#define NOERROR         ns_r_noerror
+#define FORMERR         ns_r_formerr
+#define NXDOMAIN        ns_r_nxdomain
 
-#define C_CHAOS                ns_c_chaos
+#define C_CHAOS         ns_c_chaos
 #define C_HS            ns_c_hs
 #define C_NONE          ns_c_none
 #define C_ANY           ns_c_any
@@ -203,3 +210,17 @@ typedef enum __ns_rcode {
 #define T_MAILB         ns_t_mailb
 #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/windows_port.c

@@ -5,8 +5,9 @@
 
 #include "nameser.h"
 
+#ifndef __MINGW32__
 int
-strncasecmp(const char *a, const char *b, size_t n)
+ares_strncasecmp(const char *a, const char *b, size_t n)
 {
     size_t i;
 
@@ -19,13 +20,14 @@ strncasecmp(const char *a, const char *b, size_t n)
 }
 
 int
-strcasecmp(const char *a, const char *b)
+ares_strcasecmp(const char *a, const char *b)
 {
     return strncasecmp(a, b, strlen(a)+1);
 }
+#endif
 
 int 
-gettimeofday(struct timeval *tv, struct timezone *tz) 
+ares_gettimeofday(struct timeval *tv, struct timezone *tz) 
 {
     FILETIME        ft;
     LARGE_INTEGER   li;

build_vms.com

@@ -1,69 +0,0 @@
-$!
-$
-$	on control_y then goto Common_Exit!
-$	orig = f$environment("DEFAULT")
-$	loc  = f$environment("PROCEDURE")
-$	def = f$parse("X.X;1",loc) - "X.X;1"
-$
-$	set def 'def'
-$	cc_qual = "/define=HAVE_CONFIG_H=1/include=(""../include/"",""../"",""../../openssl-0_9_7/include/"")"
-$	if p1 .eqs. "LISTING" then cc_qual = cc_qual + "/LIST/MACHINE"
-$	if p1 .eqs. "DEBUG" then cc_qual = cc_qual + "/LIST/MACHINE/DEBUG"
-$	msg_qual = ""
-$	call build "[.lib]" "*.c"
-$	call build "[.src]" "*.c"
-$	call build "[.src]" "*.msg"
-$	link /exe=curl.exe [.src]curl/lib/include=main,[.lib]curl/lib, -
-		[-.openssl-0_9_7.axp.exe.ssl]libssl/lib, -
-		[-.openssl-0_9_7.axp.exe.crypto]libcrypto/lib
-$
-$
-$	goto Common_Exit
-$build:	subroutine
-$	set noon
-$	set default 'p1'
-$	search = p2
-$	reset = f$search("reset")
-$	if f$search("CURL.OLB") .eqs. ""
-$	then
-$		LIB/CREATE/OBJECT CURL.OLB
-$	endif
-$	reset = f$search("reset",1)
-$Loop:
-$	file = f$search(search,1)
-$	if file .eqs. "" then goto EndLoop
-$		obj = f$search(f$parse(".OBJ;",file),2)
-$		if (obj .nes. "")
-$		then
-$			if (f$cvtime(f$file(file,"rdt")) .gts. f$cvtime(f$file(obj,"rdt")))
-$			then
-$				call compile 'file'
-$				lib/object curl.OLB 'f$parse(".obj;",file)'
-$			else
-$!				write sys$output "File: ''file' is up to date"
-$			endif
-$		else
-$!			write sys$output "Object for file: ''file' does not exist"
-$			call compile 'file'
-$			lib/object curl.OLB 'f$parse(".obj;",file)'
-$		endif
-$	goto Loop
-$EndLoop:
-$	purge
-$	set def 'def'
-$	endsubroutine	! Build
-$
-$compile:	subroutine
-$	set noon
-$	file = p1
-$	qual = p2+p3+p4+p5+p6+p7+p8
-$	typ = f$parse(file,,,"TYPE") - "."
-$	cmd_c = "CC "+cc_qual
-$	cmd_msg = "MESSAGE "+msg_qual
-$	x = cmd_'typ'
-$	'x' 'file'
-$	ENDSUBROUTINE	! Compile
-$
-$Common_Exit:
-$	set default 'orig'
-$	exit

buildconf

@@ -5,6 +5,21 @@ die(){
 	exit
 }
 
+# this works as 'which' but we use a different name to make it more obvious we
+# aren't using 'which'! ;-)
+findtool(){
+  file="$1"
+
+  IFS=":"
+  for path in $PATH
+  do
+    if test -r "$path/$file"; then
+      echo "$path/$file"
+      return
+    fi
+  done
+}
+
 #--------------------------------------------------------------------------
 # autoconf 2.57 or newer
 #
@@ -63,7 +78,7 @@ if test "$1" = "1" -a "$2" -lt "7" || test "$1" -lt "1"; then
   echo "buildconf: automake version $am_version found."
   echo "            You need automake version $need_automake or newer installed."
   echo "            If you have a sufficient automake installed, but it"
-  echo "            is not named 'autommake', then try setting the"
+  echo "            is not named 'automake', then try setting the"
   echo "            AUTOMAKE environment variable."
   exit 1
 fi
@@ -79,11 +94,13 @@ LIBTOOL_WANTED_MINOR=4
 LIBTOOL_WANTED_PATCH=2
 LIBTOOL_WANTED_VERSION=1.4.2
 
-libtool=`which glibtool 2>/dev/null`
+# this approach that tries 'glibtool' first is some kind of work-around for
+# some BSD-systems I believe that use to provide the GNU libtool named
+# glibtool, with 'libtool' being something completely different.
+libtool=`findtool glibtool 2>/dev/null`
 if test ! -x "$libtool"; then
-  libtool=`which libtool`
+  libtool=`findtool libtool`
 fi
-#lt_pversion=`${LIBTOOL:-$libtool} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
 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."
@@ -121,26 +138,46 @@ fi
 
 echo "buildconf: libtool version $lt_version (ok)"
 
+#--------------------------------------------------------------------------
+# m4 check
+#
+m4=`${M4:-m4} --version 2>/dev/null|head -1`;
+m4_version=`echo $m4 | sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
+
+if { echo $m4 | grep "GNU" >/dev/null 2>&1; } then
+  echo "buildconf: GNU m4 version $m4_version (ok)"
+else
+  echo "buildconf: m4 version $m4 found. You need a GNU m4 installed!"
+  exit 1
+fi
+
+
 # ------------------------------------------------------------
 
 # run the correct scripts now
 
 echo "buildconf: running libtoolize"
-${LIBTOOLIZE:-libtoolize} --copy --automake || die "The command '${LIBTOOLIZE:-libtoolize}  --copy --automake' failed"
+${LIBTOOLIZE:-libtoolize} --copy --automake --force || die "The command '${LIBTOOLIZE:-libtoolize}  --copy --automake --force' failed"
 echo "buildconf: running aclocal"
 ${ACLOCAL:-aclocal}       || die "The command '${AUTOHEADER:-aclocal}' failed"
+echo "buildconf: running aclocal hack to convert all mv to mv -f"
+perl -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4
 echo "buildconf: running autoheader"
 ${AUTOHEADER:-autoheader} || die "The command '${AUTOHEADER:-autoheader}' failed"
 echo "buildconf: running autoconf"
 ${AUTOCONF:-autoconf}     || die "The command '${AUTOCONF:-autoconf}' failed"
 
 if test -d ares; then
-  echo "buildconf: running autoconf in the ares directory"
   cd ares
+  echo "buildconf: running aclocal in the ares directory"
+  ${ACLOCAL:-aclocal}     || die "The command '${ACLOCAL:-aclocal}' failed"
+  echo "buildconf: running autoconf in the ares directory"
   ${AUTOCONF:-autoconf}     || die "The command '${AUTOCONF:-autoconf}' failed"
   cd ..
 fi
 
 echo "buildconf: running automake"
 ${AUTOMAKE:-automake} -a  || die "The command '${AUTOMAKE:-automake} -a' failed"
+
+echo "buildconf: OK"
 exit 0

buildconf.bat

@@ -0,0 +1,17 @@
+@echo off
+REM set up a CVS tree to build when there's no autotools
+REM $Revision$
+REM $Date$
+
+REM create ca-bundle.h
+echo /* This file is generated automatically */ >lib\ca-bundle.h
+echo #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") >>lib\ca-bundle.h
+
+REM create getdate.c
+copy lib\getdate.c.cvs lib\getdate.c
+
+REM create hugehelp.c
+copy src\hugehelp.c.cvs src\hugehelp.c
+
+REM create Makefile
+copy Makefile.dist Makefile

configure.ac

@@ -7,7 +7,7 @@ dnl We don't know the version number "staticly" so we use a dash here
 AC_INIT(curl, [-], [curl-bug@haxx.se])
 
 dnl configure script copyright
-AC_COPYRIGHT([Copyright (c) 1998 - 2003 Daniel Stenberg, <daniel@haxx.se>
+AC_COPYRIGHT([Copyright (c) 1998 - 2004 Daniel Stenberg, <daniel@haxx.se>
 This configure script may be copied, distributed and modified under the 
 terms of the curl license; see COPYING for more details])
 
@@ -208,37 +208,92 @@ AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
        AC_MSG_RESULT(yes)
 )
 
+dnl **********************************************************************
+dnl Check for built-in manual
+dnl **********************************************************************
+
+AC_MSG_CHECKING([whether to provide built-in manual])
+AC_ARG_ENABLE(manual,
+AC_HELP_STRING([--enable-manual],[Enable built-in manual])
+AC_HELP_STRING([--disable-manual],[Disable built-in manual]),
+[ case "$enableval" in
+  no)
+       AC_MSG_RESULT(no)
+       ;;
+  *)   AC_MSG_RESULT(yes)
+       USE_MANUAL="1"
+       ;;
+  esac ],
+       AC_MSG_RESULT(yes)
+       USE_MANUAL="1"
+)
+dnl The actual use of the USE_MANUAL variable is done much later in this
+dnl script to allow other actions to disable it as well.
+
+
 dnl **********************************************************************
 dnl Checks for libraries.
 dnl **********************************************************************
 
-dnl gethostbyname in the nsl lib?
-AC_CHECK_FUNC(gethostbyname, , [ AC_CHECK_LIB(nsl, gethostbyname) ])
+dnl gethostbyname without lib or in the nsl lib?
+AC_CHECK_FUNC(gethostbyname,
+              [HAVE_GETHOSTBYNAME="1"
+              ],
+              [ AC_CHECK_LIB(nsl, gethostbyname,
+                             [HAVE_GETHOSTBYNAME="1"
+                             LIBS="$LIBS -lnsl"
+                             ])
+              ])
 
-if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
   dnl gethostbyname in the socket lib?
-  AC_CHECK_FUNC(gethostbyname, , [ AC_CHECK_LIB(socket, gethostbyname) ])
+  AC_CHECK_LIB(socket, gethostbyname,
+               [HAVE_GETHOSTBYNAME="1"
+               LIBS="$LIBS -lsocket"
+               ])
 fi
 
-dnl At least one system has been identified to require BOTH nsl and
-dnl socket libs to link properly.
-if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_lib_socket_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
-  AC_MSG_CHECKING([trying both nsl and socket libs])
+dnl At least one system has been identified to require BOTH nsl and socket
+dnl libs at the same time to link properly.
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  AC_MSG_CHECKING([trying gethostbyname with both nsl and socket libs])
   my_ac_save_LIBS=$LIBS
   LIBS="-lnsl -lsocket $LIBS"
   AC_TRY_LINK( ,
              [gethostbyname();],
-             my_ac_link_result=success,
-             my_ac_link_result=failure )
+             [ dnl found it!
+             HAVE_GETHOSTBYNAME="1",
+             AC_MSG_RESULT([yes])],
+             [ dnl failed!
+             AC_MSG_RESULT([no])
+             dnl restore LIBS
+             LIBS=$my_ac_save_LIBS]
+             )
+fi
 
-  if test "$my_ac_link_result" = "failure"; then
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
-    dnl restore LIBS
-    LIBS=$my_ac_save_LIBS
-  else
-    AC_MSG_RESULT([yes])
-  fi
+if test "$HAVE_GETHOSTBYNAME" != "1"
+then
+  dnl This is for Msys/Mingw
+  AC_MSG_CHECKING([for gethostbyname in ws2_32])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lws2_32 $LIBS"
+  AC_TRY_LINK([#include <winsock2.h>],
+               [gethostbyname("www.dummysite.com");],
+               [ dnl worked!
+               AC_MSG_RESULT([yes])
+               HAVE_GETHOSTBYNAME="1"],
+               [ dnl failed, restore LIBS
+               LIBS=$my_ac_save_LIBS
+               AC_MSG_RESULT(no)]
+             )
+fi
+
+if test "$HAVE_GETHOSTBYNAME" = "1"; then
+  AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [If you have gethostbyname])
+else
+  AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
 fi
 
 dnl resolve lib?
@@ -271,6 +326,25 @@ AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]),
        AC_MSG_RESULT(no)
 )
 
+dnl **********************************************************************
+dnl Check for the presence of the winmm library.
+dnl **********************************************************************
+
+AC_MSG_CHECKING([for timeGetTime in winmm])
+my_ac_save_LIBS=$LIBS
+LIBS="-lwinmm $LIBS"
+AC_TRY_LINK([#include <windef.h>
+             #include <mmsystem.h>
+             ],
+             [timeGetTime();],
+             [ dnl worked!
+             AC_MSG_RESULT([yes])
+             ],
+             [ dnl failed, restore LIBS
+             LIBS=$my_ac_save_LIBS
+             AC_MSG_RESULT(no)]
+           )
+
 dnl **********************************************************************
 dnl Checks for IPv6
 dnl **********************************************************************
@@ -365,18 +439,30 @@ dnl Check if the operating system allows programs to write to their own argv[]
 dnl **********************************************************************
 
 AC_MSG_CHECKING([if argv can be written to])
+AC_CACHE_VAL(curl_cv_writable_argv, [
 AC_RUN_IFELSE([[
 int main(int argc, char ** argv) {
 	argv[0][0] = ' ';
 	return (argv[0][0] == ' ')?0:1;
 }
 	]],
+	curl_cv_writable_argv=yes,
+	curl_cv_writable_argv=no,
+	curl_cv_writable_argv=cross)
+])
+case $curl_cv_writable_argv in
+yes)
 	AC_DEFINE(HAVE_WRITABLE_ARGV, 1, [Define this symbol if your OS supports changing the contents of argv])
-	AC_MSG_RESULT(yes),
-	AC_MSG_RESULT(no),
+	AC_MSG_RESULT(yes)
+	;;
+no)
+	AC_MSG_RESULT(no)
+	;;
+*)
         AC_MSG_RESULT(no)
         AC_MSG_WARN([the previous check could not be made default was used])
-)
+	;;
+esac
 
 dnl **********************************************************************
 dnl Check for the presence of Kerberos4 libraries and headers
@@ -404,8 +490,8 @@ AC_HELP_STRING([--with-krb4=DIR],[where to look for Kerberos4]),[
   OPT_KRB4="$withval"
   if test X"$OPT_KRB4" != Xyes
   then
-    LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib"
-    KRB4LIB="$OPT_KRB4/lib"
+    LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib$libsuff"
+    KRB4LIB="$OPT_KRB4/lib$libsuff"
     CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include"
     KRB4INC="$OPT_KRB4/include"
   fi
@@ -454,7 +540,7 @@ then
       AC_CHECK_FUNCS(krb_get_our_ip_for_realm)
 
       dnl add define KRB4
-      AC_DEFINE(KRB4, 1,
+      AC_DEFINE(HAVE_KRB4, 1,
       [if you have the Kerberos4 libraries (including -ldes)])
 
       dnl substitute it too!
@@ -482,15 +568,20 @@ AC_ARG_WITH(spnego,
 )
 AC_MSG_CHECKING([if SPNEGO support is requested])
 if test x"$want_spnego" = xyes; then
- 
-  if test -z "$SPNEGO_LIB_DIR"; then
-     LDFLAGS="$LDFLAGS -L$SPNEGO_ROOT $(wl)-R$SPNEGO_ROOT -lfbopenssl"
+
+  if test X"$SPNEGO_ROOT" = Xyes; then
+     AC_MSG_ERROR([FBOpenSSL libs and/or directories were not found where specified!])
+     AC_MSG_RESULT(no)
   else
-     LDFLAGS="$LDFLAGS $SPNEGO_LIB_DIR"
-  fi
+     if test -z "$SPNEGO_LIB_DIR"; then
+        LDFLAGS="$LDFLAGS -L$SPNEGO_ROOT -lfbopenssl"
+     else
+        LDFLAGS="$LDFLAGS $SPNEGO_LIB_DIR"
+     fi
  
-  AC_DEFINE(HAVE_SPNEGO, 1, [Define this if you have the SPNEGO library fbopenssl])
-  AC_MSG_RESULT(yes)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(HAVE_SPNEGO, 1, [Define this if you have the SPNEGO library fbopenssl])
+  fi
 else
   AC_MSG_RESULT(no)
 fi
@@ -526,7 +617,7 @@ if test x"$want_gss" = xyes; then
      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
         GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
      else
-        GSSAPI_INCS=="-I$GSSAPI_ROOT/include"
+        GSSAPI_INCS="-I$GSSAPI_ROOT/include"
      fi
   fi
   CPPFLAGS="$CPPFLAGS $GSSAPI_INCS"
@@ -536,7 +627,7 @@ if test x"$want_gss" = xyes; then
         gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
 	LDFLAGS="$LDFLAGS $gss_ldflags"
      else
-        LDFLAGS="$LDFLAGS $GSSAPI_ROOT/lib -lgssapi"
+        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi"
      fi
   else
      LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
@@ -619,7 +710,7 @@ else
   *)
     dnl check the given spot right away!
     EXTRA_SSL=$OPT_SSL
-    LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
+    LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
     CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
     ;;
   esac
@@ -629,7 +720,7 @@ else
      ],[
      OLDLDFLAGS="$LDFLAGS"
      OLDCPPFLAGS="$CPPFLAGS"
-     LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib"
+     LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff"
      CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
      AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
        HAVECRYPTO="yes" ], [
@@ -643,6 +734,20 @@ else
     dnl This is only reasonable to do if crypto actually is there: check for
     dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
 
+    dnl This is for Msys/Mingw
+    AC_MSG_CHECKING([for gdi32])
+    my_ac_save_LIBS=$LIBS
+    LIBS="-lgdi32 $LIBS"
+    AC_TRY_LINK([#include <windef.h>
+                 #include <wingdi.h>],
+               [GdiFlush();],
+               [ dnl worked!
+               AC_MSG_RESULT([yes])],
+               [ dnl failed, restore LIBS
+               LIBS=$my_ac_save_LIBS
+               AC_MSG_RESULT(no)]
+              )
+
     AC_CHECK_LIB(crypto, CRYPTO_add_lock)
     AC_CHECK_LIB(ssl, SSL_connect)
 
@@ -741,29 +846,60 @@ case "$OPT_ZLIB" in
     dnl check for the lib first without setting any new path, since many
     dnl people have it in the default path
 
-    AC_CHECK_LIB(z, inflateEnd, ,
+    AC_CHECK_LIB(z, inflateEnd,
+                   dnl libz found, set the variable
+                   [HAVE_LIBZ="1"],
+                   dnl if no lib found, try to add the given library
                    [if test -d "$OPT_ZLIB"; then
                       CPPFLAGS="$CPPFLAGS -I$OPT_ZLIB/include"
-                      LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib"
+                      LDFLAGS="$LDFLAGS -L$OPT_ZLIB/lib$libsuff"
                    fi])
 
-    AC_CHECK_HEADER(zlib.h,[
-      AC_CHECK_LIB(z, gzread,
-                   [HAVE_LIBZ="1"
-                   AC_SUBST(HAVE_LIBZ)
-                   LIBS="$LIBS -lz"
-                   AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
-                   AC_DEFINE(HAVE_LIBZ, 1, [If zlib is available])],
-                   [ CPPFLAGS=$_cppflags
-                   LDFLAGS=$_ldflags])],
-      [ CPPFLAGS=$_cppflags
-      LDFLAGS=$_ldflags]
-    )
+    AC_CHECK_HEADER(zlib.h,
+      [
+      dnl zlib.h was found
+      HAVE_ZLIB_H="1"
+      dnl if the lib wasn't found already, try again with the new paths
+      if test "$HAVE_LIBZ" != "1"; then
+        AC_CHECK_LIB(z, gzread,
+                     [
+                     dnl the lib was found!
+                     HAVE_LIBZ="1"
+                     ],
+                     [ CPPFLAGS=$_cppflags
+                     LDFLAGS=$_ldflags])
+      fi
+      ],
+      [
+        dnl zlib.h was not found, restore the flags
+        CPPFLAGS=$_cppflags
+        LDFLAGS=$_ldflags]
+      )
+
+    if test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" != "1"
+    then
+      AC_MSG_WARN([configure found only the libz lib, not the header file!])
+    elif test "$HAVE_LIBZ" != "1" && test "$HAVE_ZLIB_H" = "1"
+    then
+      AC_MSG_WARN([configure found only the libz header file, not the lib!])
+    elif test "$HAVE_LIBZ" = "1" && test "$HAVE_ZLIB_H" = "1"
+    then
+      dnl both header and lib were found!
+      AC_SUBST(HAVE_LIBZ)
+      AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
+      AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available])
+
+      LIBS="$LIBS -lz"
+
+      dnl replace 'HAVE_LIBZ' in the automake makefile.ams
+      AMFIXLIB="1"
+      AC_MSG_NOTICE([found both libz and libz.h header])
+    fi
     ;;
 esac
 
 dnl set variable for use in automakefile(s)
-AM_CONDITIONAL(HAVE_LIBZ, test x"$HAVE_LIBZ" = x1)
+AM_CONDITIONAL(HAVE_LIBZ, test x"$AMFIXLIB" = x1)
 
 dnl Default is to try the thread-safe versions of a few functions
 OPT_THREAD=on
@@ -802,12 +938,13 @@ then
   AC_DEFINE(DISABLED_THREADSAFE, 1, \
 Set to explicitly specify we don't want to use thread-safe functions)
 else
+  if test "$ipv6" != "yes"; then
+    dnl dig around for gethostbyname_r()
+    CURL_CHECK_GETHOSTBYNAME_R()
 
-  dnl dig around for gethostbyname_r()
-  CURL_CHECK_GETHOSTBYNAME_R()
-
-  dnl dig around for gethostbyaddr_r()
-  CURL_CHECK_GETHOSTBYADDR_R()
+    dnl dig around for gethostbyaddr_r()
+    CURL_CHECK_GETHOSTBYADDR_R()
+  fi
 
   dnl poke around for inet_ntoa_r()
   CURL_CHECK_INET_NTOA_R()
@@ -833,9 +970,12 @@ AC_CHECK_HEADERS(
         sys/time.h \
         sys/select.h \
         sys/socket.h \
+        sys/ioctl.h \
+        assert.h \
         unistd.h \
         malloc.h \
         stdlib.h \
+        limits.h \
         arpa/inet.h \
         net/if.h \
         netinet/in.h \
@@ -883,7 +1023,10 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
-AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(curl_off_t, ,[
+#include <stdio.h>
+#include "$srcdir/include/curl/curl.h"
+])
 
 AC_CHECK_TYPE(long long,
    [AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports 'long long'])])
@@ -901,7 +1044,8 @@ dnl Checks for library functions.
 dnl AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
 dnl AC_FUNC_VPRINTF
-AC_CHECK_FUNCS( socket \
+AC_CHECK_FUNCS( strtoll \
+                socket \
                 select \
                 strdup \
                 strstr \
@@ -968,8 +1112,64 @@ AC_PATH_PROGS( NROFF, gnroff nroff, ,
   $PATH:/usr/bin/:/usr/local/bin )
 AC_SUBST(NROFF)
 
+if test -n "$NROFF"; then
+  dnl only check for nroff options if an nroff command was found
+
+  AC_MSG_CHECKING([how to use *nroff to get plain text from man pages])
+  MANOPT="-man"
+  mancheck=`echo foo | $NROFF $MANOPT 2>/dev/null`
+  if test -z "$mancheck"; then
+    MANOPT="-mandoc"
+   mancheck=`echo foo | $NROFF $MANOPT 2>/dev/null`
+    if test -z "$mancheck"; then
+      MANOPT=""
+      AC_MSG_RESULT([failed])
+      AC_MSG_WARN([found no *nroff option to get plaintext from man pages])
+    else
+      AC_MSG_RESULT([$MANOPT])
+    fi
+  else
+    AC_MSG_RESULT([$MANOPT])
+  fi
+  AC_SUBST(MANOPT)
+fi
+
+if test -z "$MANOPT"
+then
+  dnl if no nroff tool was found, or no option that could convert man pages
+  dnl was found, then disable the built-in manual stuff
+  AC_MSG_WARN([disabling built-in manual])
+  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
+
+if test "$USE_MANUAL" = "1"; then
+  AC_DEFINE(USE_MANUAL, 1, [If you want to build curl with the built-in manual])
+fi
+
+dnl set variable for use in automakefile(s)
+AM_CONDITIONAL(USE_MANUAL, test x"$USE_MANUAL" = x1)
+
+
 dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib, 
 dnl   $PATH:/usr/bin/:/usr/local/bin )
 dnl AC_SUBST(RANLIB)
@@ -988,33 +1188,21 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
   *)   AC_MSG_RESULT(yes)
 
     CPPFLAGS="$CPPFLAGS -DCURLDEBUG"
-    CFLAGS="$CFLAGS -g" 
-    if test "$GCC" = "yes"; then
-       CFLAGS="$CFLAGS -W -Wall -Wwrite-strings -pedantic -Wno-long-long -Wundef -Wpointer-arith -Wnested-externs"
-    fi
-    dnl strip off optimizer flags
-    NEWFLAGS=""
-    for flag in $CFLAGS; do
-      case "$flag" in
-      -O*)
-        dnl echo "cut off $flag"
-        ;;
-      *)
-        NEWFLAGS="$NEWFLAGS $flag"
-        ;;
-      esac
-    done
-    CFLAGS=$NEWFLAGS
+    CFLAGS="$CFLAGS -g"
+
+    dnl set compiler "debug" options to become more picky, and remove
+    dnl optimize options from CFLAGS
+    CURL_CC_DEBUG_OPTS
        ;;
-  esac ],
+  esac
+ ],
        AC_MSG_RESULT(no)
 )
 
-ares="no"
 AC_MSG_CHECKING([whether to enable ares])
 AC_ARG_ENABLE(ares,
-AC_HELP_STRING([--enable-ares],[Enable using ares for name lookups])
-AC_HELP_STRING([--disable-ares],[Disable using ares for name lookups]),
+AC_HELP_STRING([--enable-ares=PATH],[Enable ares for name lookups])
+AC_HELP_STRING([--disable-ares],[Disable ares for name lookups]),
 [ case "$enableval" in
   no)
        AC_MSG_RESULT(no)
@@ -1026,15 +1214,37 @@ AC_HELP_STRING([--disable-ares],[Disable using ares for name lookups]),
        fi
 
        AC_DEFINE(USE_ARES, 1, [Define if you want to enable ares support])
+       dnl substitute HAVE_ARES for curl-config and similar
+       HAVE_ARES="1"
+       AC_SUBST(HAVE_ARES)
 
-       ares="yes"
+       LIBS="$LIBS -lcares"
+
+       dnl For backwards compatibility default to includes/lib in srcdir/ares
+       dnl If a value is specified it is assumed that the libs are in $val/lib
+       dnl and the includes are in $val/include. This is the default setup for
+       dnl ares so it should not be a problem.
+       if test "x$enableval" = "xyes" ; then
+         if test -d "$srcdir/ares"; then
+            AC_CONFIG_SUBDIRS(ares)
+            aresinc=`cd $srcdir/ares && pwd`
+            CPPFLAGS="$CPPFLAGS -I$aresinc"
+
+            dnl the pwd= below cannot 'cd' into the ares dir to get the full
+            dnl path to it, since it may not exist yet if we build outside of
+            dnl the source tree
+            pwd=`pwd`
+            LDFLAGS="$LDFLAGS -L$pwd/ares"
+         fi
+       else
+         CPPFLAGS="$CPPFLAGS -I$enableval/include"
+         LDFLAGS="$LDFLAGS -L$enableval/lib"
+       fi
        ;;
   esac ],
        AC_MSG_RESULT(no)
 )
 
-AM_CONDITIONAL(ARES, test x$ares = xyes)
-
 AC_CONFIG_FILES([Makefile \
 	   docs/Makefile \
            docs/examples/Makefile \
@@ -1058,6 +1268,7 @@ AC_CONFIG_FILES([Makefile \
            packages/DOS/Makefile \
            packages/EPM/curl.list \
            packages/EPM/Makefile \
+           packages/vms/Makefile \
            curl-config
 ])
 AC_OUTPUT

curl-config.in

@@ -90,6 +90,9 @@ while test $# -gt 0; do
 	if test "@CURL_DISABLE_DICT@" = "1"; then
           echo "DICT-disabled"
         fi
+	if test "@HAVE_ARES@" = "1"; then
+          echo "AsynchDNS"
+        fi
 	;;
 
     --version)

curl-style.el

@@ -37,7 +37,7 @@
   (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"))
+	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"))
 	)
   ;; keybindings for C, C++, and Objective-C.  We can put these in
   ;; c-mode-base-map because of inheritance ...

docs/BINDINGS

@@ -35,6 +35,11 @@ Cocoa
   Written by Dan Wood.
   http://curlhandle.sourceforge.net/
 
+D
+
+  Written by Charles Sanders and James Wavro
+  http://www.atari-soldiers.com/libcurl.html
+
 Dylan
 
   Written by Chris Double.
@@ -45,6 +50,9 @@ Euphoria
   Written by Ray Smith.
   http://rays-web.com/eulibcurl.htm
 
+Ferite
+  http://www.ferite.org/
+
 Java
 
   Written by Daniel Stenberg.

docs/FAQ

@@ -1,8 +1,8 @@
-Updated: June 17, 2003 (http://curl.haxx.se/docs/faq.html)
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
+Updated: March 16, 2004 (http://curl.haxx.se/docs/faq.html)
+                                  _   _ ____  _
+                              ___| | | |  _ \| |
+                             / __| | | | |_) | |
+                            | (__| |_| |  _ <| |___
                              \___|\___/|_| \_\_____|
 
 FAQ
@@ -19,7 +19,7 @@ FAQ
 
  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.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?
@@ -40,6 +40,7 @@ FAQ
   3.12 Why do FTP specific features over HTTP proxy fail?
   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?
 
  4. Running Problems
   4.1 Problems connecting to SSL servers.
@@ -66,7 +67,7 @@ FAQ
   5.2 How can I receive all data into a large memory chunk?
   5.3 How do I fetch multiple files with libcurl?
   5.4 Does libcurl do Winsock initing on win32 systems?
-  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
+  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!
 
@@ -89,7 +90,7 @@ FAQ
   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 is a URL Request Library".
+  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.
@@ -100,7 +101,7 @@ FAQ
   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
   notice that this FAQ is directed at the command-line tool named curl (and
-  libcurl the library), and may therefore not be valid for other curl
+  libcurl the library), and may therefore not be valid for other curl-related
   projects.
 
   1.2 What is libcurl?
@@ -108,16 +109,16 @@ FAQ
   libcurl is a reliable and portable library which provides you with an easy
   interface to a range of common Internet protocols.
 
-  You can use libcurl for free in your application even if it is commercial
-  or closed-source.
+  You can use libcurl for free in your application, be it open source,
+  commercial or closed-source.
 
   1.3 What is cURL not?
-  
-  Curl is *not* a wget clone even though that is a very common misconception.
-  Never, during curl's development, have we intended curl to replace wget or
-  compete on its market. Curl is targeted at single-shot file transfers.
 
-  Curl is not a web site mirroring program. If you wanna use curl to mirror
+  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
+  market. Curl is targeted at single-shot file transfers.
+
+  Curl is not a web site mirroring program. If you want to use curl to mirror
   something: fine, go ahead and write a script that wraps around curl to make
   it reality (like curlmirror.pl does).
 
@@ -180,9 +181,8 @@ FAQ
   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 several
-  project services we take advantage from, like the bug tracker, mailing lists
-  and more.
+  Haxx owns the curl web site's domain and sourceforge.net hosts project
+  services we take advantage from, like the bug tracker.
 
   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
@@ -197,7 +197,7 @@ FAQ
   programming language for the web, named CURL.
 
   We are in no way associated with curl.com or their CURL programming
-  language. 
+  language.
 
   Our project name curl has been in effective use since 1998. We were not the
   first computer related project to use the name "curl" and do not claim any
@@ -280,8 +280,7 @@ FAQ
 
   2.4. Does cURL support Socks (RFC 1928) ?
 
-  There is limited support for SOCKS5 for curl built with IPv6 support
-  disabled.
+  Yes, SOCKS5 is supported when curl is built with IPv6 support disabled.
 
 
 3. Usage problems
@@ -413,7 +412,7 @@ FAQ
   put the entire option within quotes. Like in:
 
    curl -d " with spaces " url.com
-  
+
   or perhaps
 
    curl -d ' with spaces ' url.com
@@ -449,11 +448,19 @@ FAQ
 
     - Read the javascript code and rewrite the same logic in another language.
 
-    - Implement a javascript interpreted, people have successfully used the
+    - 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.
 
+  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.
+
+  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.
 
 4. Running Problems
 
@@ -469,7 +476,7 @@ FAQ
   requests properly. To correct this problem, tell curl to select SSLv2 from
   the command line (-2/--sslv2).
 
-  There has also been examples where the remote server didn't like the SSLv2
+  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?
@@ -545,7 +552,7 @@ FAQ
     containing a list of valid methods for the requested resource.
 
     4.5.6 "301 Moved Permanently"
- 
+
     If you get this return code and an HTML output similar to this:
 
        <H1>Moved Permanently</H1> The document has moved <A
@@ -568,21 +575,26 @@ FAQ
 
   The first part is to avoid having clear-text passwords in the command line
   so that they don't appear in 'ps' outputs and similar. That is easily
-  avoided by using the "-K" option to tell curl to read parameters from a
-  file or stdin to which you can pass the secret info.
+  avoided by using the "-K" option to tell curl to read parameters from a file
+  or stdin to which you can pass the secret info. curl itself will also
+  attempt to "hide" the given password by blanking out the option - this
+  doesn't work on all platforms.
 
   To keep the passwords in your account secret from the rest of the world is
   not a task that curl addresses. You could of course encrypt them somehow to
   at least hide them from being read by human eyes, but that is not what
   anyone would call security.
 
-  Also note that regular HTTP and FTP passwords are sent in clear across the
-  network. All it takes for anyone to fetch them is to listen on the network.
-  Eavesdropping is very easy.
+  Also note that regular HTTP (using Basic authentication) and FTP passwords
+  are sent in clear across the network. All it takes for anyone to fetch them
+  is to listen on the network.  Eavesdropping is very easy. Use more secure
+  authentication methods (like Digest, Negotiate or even NTLM) or consider the
+  SSL-based alternatives HTTPS and FTPS.
 
   4.8 I found a bug!
 
   It is not a bug if the behavior is documented. Read the docs first.
+  Especially check out the KNOWN_BUGS file, it may be a documented bug!
 
   If it is a problem with a binary you've downloaded or a package for your
   particular platform, try contacting the person who built the package/archive
@@ -620,7 +632,7 @@ FAQ
   You invoke curl 7.10 or later to communicate on a https:// URL and get an
   error back looking something similar to this:
 
-      curl: (35) SSL: error:14090086:SSL routines: 
+      curl: (35) SSL: error:14090086:SSL routines:
       SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
 
   Then it means that curl couldn't verify that the server's certificate was
@@ -677,7 +689,7 @@ FAQ
         {
           register int realsize = size * nmemb;
           struct MemoryStruct *mem = (struct MemoryStruct *)data;
-        
+
           mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
           if (mem->memory) {
             memcpy(&(mem->memory[mem->size]), ptr, realsize);
@@ -699,13 +711,15 @@ FAQ
 
   Yes, if told to in the curl_global_init() call.
 
-  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
+  5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ?
 
   Yes, but you cannot open a FILE * and pass the pointer to a DLL and have
-  that DLL use the FILE *. If you set CURLOPT_FILE you must also use
-  CURLOPT_WRITEFUNCTION as well to set a function that writes the file, even
-  if that simply writes the data to the specified FILE*. Similarly, if you use
-  CURLOPT_INFILE you must also specify CURLOPT_READFUNCTION.
+  that DLL use the FILE * (as the DLL and the client application cannot access
+  each others' variable memory areas). If you set CURLOPT_WRITEDATA you must
+  also use CURLOPT_WRITEFUNCTION as well to set a function that writes the
+  file, even if that simply writes the data to the specified FILE *.
+  Similarly, if you use CURLOPT_READDATA you must also specify
+  CURLOPT_READFUNCTION.
 
   (Provided by Joel DeYoung and Bob Schader)
 

docs/FEATURES

@@ -25,6 +25,7 @@ Misc
  - socks5 support
  - supports user name + password in proxy environment variables
  - operations through proxy "tunnel" (using CONNECT)
+ - supports transfers of large files (>2GB and >4GB)
 
 HTTP
  - HTTP/1.1 compliant (optionally uses 1.0)
@@ -80,6 +81,11 @@ FTP
  - all operations can be tunneled through a http-proxy
  - customizable to retrieve file modification date
 
+FTPS (*1)
+ - explicit ftps:// support that use SSL on both connections
+ - implicit "AUTH TSL" and "AUTH SSL" usage to "upgrade" plain ftp://
+   connection to use SSL for both or one of the connections
+
 TELNET
  - connection negotiation
  - custom telnet options

docs/HISTORY

@@ -23,17 +23,17 @@ the http-only days were already passed.
 
 The project slowly grew bigger. When upload capabilities were added and the
 name once again was misleading, a second name change was made and on March 20,
-1998 curl 4 was released. (The version numbering from the previous names were
+1998 curl 4 was released. (The version numbering from the previous names was
 kept.)
 
-(Unrelated to this project a company called Curl Corporation filed a US
+(Unrelated to this project a company called Curl Corporation registered a US
 trademark on the name "CURL" on May 18 1998. That company had then already
 registered the curl.com domain back in November of the previous year. All this
-was much later brought into the lights.)
+was revealed to us much later.)
 
 SSL support was added, powered by the SSLeay library.
 
-August 1998, added project curl to freshmeat.net.
+August 1998, first announcement of curl on freshmeat.net.
 
 October 1998, with the curl 4.9 release and the introduction of cookie
 support, curl was no longer released under the GPL license. Now we're at 4000
@@ -42,7 +42,7 @@ lines of code, we switched over to the MPL license to restrict the effects of
 
 November 1998, configure script and reported successful compiles on several
 major operating systems. The never-quite-understood -F option was added and
-curl could now simulate quite a lot of a browser.
+curl could now simulate quite a lot of a browser. TELNET support was added.
 
 Curl 5 was released in December 1998 and introduced the first ever curl man
 page. People started making Linux RPM packages out of it.
@@ -90,6 +90,8 @@ curl supports HTTP 1.1 starting with the release of 7.7, March 22 2001. This
 also introduced libcurl's ability to do persistent connections. 24000 lines of
 code.
 
+The first experimental ftps:// support was added in March 2001.
+
 August 2001. curl is bundled in Mac OS X, 10.1. It was already becoming more
 and more of a standard utility of Linux distributions and a regular in the BSD
 ports collections. The curl web site gets 8000 visits weekly. Curl Corporation
@@ -114,3 +116,13 @@ license only.
 
 February 2003, the curl site averages at 20000 visits weekly. At any given
 moment, there's an average of 3 people browsing the curl.haxx.se site.
+
+Multiple new authentication schemes are supported: Digest (May), NTLM (June)
+and Negotiate (June).
+
+November 2003: curl 7.10.8 is released. 45000 lines of code. ~55000 unique
+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.

docs/INSTALL

@@ -6,14 +6,13 @@
 
                                 How To Compile
 
-Curl has been compiled and built on numerous different operating systems.
+Installing Binary Packages
+==========================
 
-Most systems build curl the same way (unix-style). Continue reading below for
-more details if you're one of them.
-
-If you're using Windows (95/98/NT/ME/2000/XP or similar), VMS, RISC OS or OS/2
-or cross-compile, you should continue reading from one the paragraphs further
-down.
+   Lots of people download binary distributions of curl and libcurl. This
+   document does not describe how to install curl or libcurl using such a
+   binary package. This document describes how to compile, build and install
+   curl and libcurl from source code.
 
 UNIX
 ====
@@ -231,6 +230,36 @@ Win32
         project properties to use the SSL include path, link with the SSL libs
         and define the USE_SSLEAY symbol.
 
+      Using Borland C++ compiler version 5.5.1 (available as free download
+      from Borland's site)
+      ---------------------------------------------------------------------
+      
+        compile openssl
+      
+        Make sure you include the paths to curl/include and openssl/inc32 in
+        your bcc32.cnf file
+      
+
+        eg : -I"c:\Bcc55\include;c:\path_curl\include;c:\path_openssl\inc32"
+        
+        Check to make sure that all of the sources listed in lib/Makefile.b32
+        are present in the /path_to_curl/lib directory. (Check the src
+        directory for missing ones.)
+        
+        Make sure the environment variable "BCCDIR" is set to the install
+        location for the compiler eg : c:\Borland\BCC55
+        
+        command line:
+        make -f /path_to_curl/lib/Makefile-ssl.b32
+        
+        compile simplessl.c with appropriate links
+        
+        c:\curl\docs\examples\> bcc32 -L c:\path_to_curl\lib\libcurl.lib
+                                      -L c:\borland\bcc55\lib\psdk\ws2_32.lib
+                                      -L c:\openssl\out32\libeay32.lib
+                                      -L c:\openssl\out32\ssleay32.lib
+                                      simplessl.c
+
    Disabling Specific Protocols:
 
       The configure utility, unfortunately, is not available for the Windows
@@ -290,8 +319,6 @@ VMS
 ===
    (The VMS section is in whole contributed by the friendly Nico Baggus)
 
-   This is the first attempt at porting cURL to VMS.
-
    Curl seems to work with FTP & HTTP other protocols are not tested.  (the
    perl http/ftp testing server supplied as testing too cannot work on VMS
    because vms has no concept of fork(). [ I tried to give it a whack, but
@@ -300,7 +327,7 @@ VMS
    SSL stuff has not been ported.
 
    Telnet has about the same issues as for Win32. When the changes for Win32
-   are clear maybe they'l work for VMS too. The basic problem is that select
+   are clear maybe they'll work for VMS too. The basic problem is that select
    ONLY works for sockets.
 
    Marked instances of fopen/[f]stat that might become a problem, especially
@@ -422,6 +449,29 @@ RISC OS
    where riscos-gcc and riscos-ar are links to the gccsdk tools.
    You can then link your program with curl/lib/.libs/libcurl.a
 
+
+AmigaOS
+=======
+   (This section was graciously brought to us by Diego Casorran)
+
+   To build cURL/libcurl on AmigaOS just type 'make amiga' ...
+
+   What you need is:    (not tested with others versions)
+
+        GeekGadgets / gcc 2.95.3 (http://www.geekgadgets.org/)
+
+        AmiTCP SDK v4.3 (http://www.aminet.net/comm/tcp/AmiTCP-SDK-4.3.lha)
+
+        Native Developer Kit (http://www.amiga.com/3.9/download/NDK3.9.lha)
+
+   As no ixemul.library is required you will be able to build it for
+   WarpOS/PowerPC (not tested by me), as well a MorphOS version should be
+   possible with no problems.
+
+   To enable SSL support, you need a OpenSSL native version (without ixemul),
+   you can find a precompiled package at http://amiga.sourceforge.net/OpenSSL/
+
+
 PORTS
 =====
    This is a probably incomplete list of known hardware and operating systems
@@ -438,6 +488,7 @@ PORTS
         - Alpha Tru64 v5.0 5.1
         - HP-PA HP-UX 9.X 10.X 11.X
         - HP-PA Linux
+        - HP3000 MPE/iX
         - MIPS IRIX 6.2, 6.5
         - MIPS Linux
         - Pocket PC/Win CE 3.0
@@ -460,6 +511,7 @@ PORTS
         - i386 HURD
         - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4
         - i386 NetBSD
+        - i386 Novell NetWare
         - i386 OS/2
         - i386 OpenBSD
         - i386 SCO unix
@@ -497,7 +549,3 @@ OpenLDAP
 
       http://www.openldap.org
 
-   You need to install it with shared libraries, which is enabled when running
-   the ldap configure script with "--enable-shared". With my linux 2.0.36
-   kernel I also had to disable using threads (with --without-threads),
-   because the configure script couldn't figure out my system.

docs/KNOWN_BUGS

@@ -3,6 +3,13 @@ join in and help us correct one or more of these! Also be sure to check the
 changelog of the current development status, as one or more of these problems
 may have been fixed since this was written!
 
+* NTLM authentication with passwords longer than 14 letters fail. There is
+  a known fix for this, planned to come in curl 7.11.2
+
+* Doing resumed upload over HTTP does not work with '-C -', because curl
+  doesn't do a HEAD first to get the initial size. This needs to be done
+  manually for HTTP PUT resume to work, and then '-C [index]'.
+
 * CURLOPT_USERPWD and CURLOPT_PROXYUSERPWD have no way of providing user names
   that contain a colon. This can't be fixed easily in a backwards compatible
   way without adding new options (and then, they should most probably allow
@@ -37,20 +44,11 @@ may have been fixed since this was written!
 * 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.
 
-* Running 'make test' on Mac OS X gives 4 errors. This seems to be related
-  to some kind of libtool problem:
-  http://curl.haxx.se/mail/archive-2002-03/0029.html and
-  http://curl.haxx.se/mail/archive-2002-03/0033.html
-
-* libcurl does not deal nicely with files larger than 2GB
-
 * GOPHER transfers seem broken
 
 * configure --disable-http is not fully supported. All other protocols seem
   to work to disable.
 
-* The -m parameter does not work when using telnet with curl on Windows.
-
 * 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
@@ -60,63 +58,3 @@ may have been fixed since this was written!
   and havoc is what happens.
   More details on this is found in this libcurl mailing list thread:
   http://curl.haxx.se/mail/lib-2002-08/0000.html
-
-------------------------------------------------------------------------------
-
-Q: My program blows up when I run lots of curl_easy_perform() calls on a
-single thread
-Q: My program dies when a single thread re-enters the win32 select() call
-via curl_easy_perform()
-Q: --- add your own flavour here ---
-
-Single Threaded Re-Entracy
---------------------------
-
-There is a glitch / trick to using cURL on Win32 related to re-entrancy.
-This experience was gained on verion 7.9.4 using Windows NT SP3 in a banking
-environment (just in case you wanted to know).
-
-If you have already called curl_easy_perform(), and *somehow* you cause your
-single thread of execution to make another call to curl_easy_perform() - the
-windows socket() call used to create a new socket for the second connection
-can return with 10044 / 10043 error codes.
-
-The WSA errors we experienced are:
-WSAEPROTONOSUPPORT 
-(10043) 
-Protocol not supported. 
-The requested protocol has not been configured into the system, or no
-implementation for it exists. For example, a socket call requests a
-SOCK_DGRAM socket, but specifies a stream protocol. 
-
-WSAESOCKTNOSUPPORT 
-(10044) 
-Socket type not supported. 
-The support for the specified socket type does not exist in this address
-family. For example, the optional type SOCK_RAW might be selected in a
-socket call, and the implementation does not support SOCK_RAW sockets at
-all. 
-
-We have experienced this by creating a timer that ticks every 20ms, and on
-the tick making a curl_easy_perform() call.  The call usually completed in
-about 300ms.  And we expected (before this test) that the timer would NOT be
-fired during a call to curl_easy_perform(), howvever, while the first
-curl_easy_perform() is running a tick *is* fired by the windows API somehow,
-and we then call curl_easy_perform() again - thus single threaded
-re-entrancy is achieved.
-
-Notes:
-* We made sure that a new CURL structure was being used for each
-curl_easy_perform() request, and that the curl_global_init() had been called
-beforehand.  
-* I'm happy to answer any questions about this problem to try to track it
-down.
-* Once the socket() call started failing, there is no hope - it never works
-again.
-* Slowing the timer down to give each request enough time to complete solves
-this problem completely.
-
-If anyone has the source code to the WinNT implementation of socket() and
-can figure out WHY this can occur, more tracing can be performed.
-
-        John Clayton <John.Clayton at barclayscapital.com>

docs/MANUAL

@@ -836,8 +836,6 @@ PERSISTANT CONNECTIONS
   transfers faster. If you use a http proxy for file transfers, practicly
   all transfers will be persistant.
 
-  Persistant connections were introduced in curl 7.7.
-
 MAILING LISTS
 
   For your convenience, we have several open mailing lists to discuss curl,

docs/Makefile.am

@@ -8,10 +8,11 @@ man_MANS = \
 	curl.1 \
 	curl-config.1
 
-HTMLPAGES = \
+GENHTMLPAGES = \
 	curl.html \
-	curl-config.html \
-	index.html
+	curl-config.html
+
+HTMLPAGES = $(GENHTMLPAGES) index.html
 
 PDFPAGES = \
 	curl.pdf \
@@ -19,12 +20,14 @@ PDFPAGES = \
 
 SUBDIRS = examples libcurl
 
+CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)
+
 EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS	\
 	     README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS	\
 	     VERSIONS KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES) \
 	     HISTORY INSTALL libcurl-the-guide $(PDFPAGES)
 
-MAN2HTML= $(NROFF) -man $< | man2html >$@
+MAN2HTML= roffit < $< >$@
 
 SUFFIXES = .1 .html .pdf
 

docs/SSLCERTS

@@ -1,7 +1,7 @@
                       Peer SSL Certificate Verification
                       =================================
 
-Starting in 7.10, libcurl performs peer SSL certificate verification by
+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.
@@ -11,9 +11,11 @@ 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 the remote server uses a self-signed certificate, or if you don't install
-curl's CA cert bundle or if it uses a certificate signed by a CA that isn't
-included in the bundle, then you need to do one of the following:
+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
+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);
@@ -37,3 +39,8 @@ 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.
+
+The default path of the CA bundle installed with the curl package is:
+/usr/local/share/curl/curl-ca-bundle.crt, which can be changed by running
+configure with the --with-ca-bundle option pointing out the path of your
+choice.

docs/THANKS

@@ -1,6 +1,6 @@
-This project has been alive for several years. Countless people have provided
-feedback that have improved curl. Here follows a (incomplete) list of people
-that have contributed with non-trivial parts:
+ This project has been alive for several years. Countless people have provided
+ feedback that have improved curl. Here follows a (incomplete) list of people
+ that have contributed with non-trivial parts:
 
 Daniel Stenberg <daniel@haxx.se>
 Rafael Sagula <sagula@inf.ufrgs.br>
@@ -92,3 +92,9 @@ Jean-Philippe Barrette-LaPierre <jpb@rrette.com>
 Richard Bramante <RBramante@on.com>
 Daniel Kouril <kouril@ics.muni.cz>
 Dirk Manske <dm@nettraffic.de>
+David Meyer <meyer@paracel.com>
+Dominick Meglio <codemstr@ptd.net>
+Gisle Vanem <gvanem@broadpark.no>
+Giuseppe Attardi <attardi@di.unipi.it>
+Tor Arntsen <tor@spacetec.no>
+David Byron <DByron@everdreamcorp.com>

docs/TODO

@@ -25,14 +25,16 @@ TODO
    [http://curl.haxx.se/dev/no_copy_callbacks.txt]
 
  * More data sharing. curl_share_* functions already exist and work, and they
-   can be extended to share more.
+   can be extended to share more. For example, enable sharing of the ares
+   channel.
 
- * Set the SO_KEEPALIVE socket option to make libcurl notice and disconnect
-   very long time idle connections.
+ * Introduce a new error code indicating authentication problems (for proxy
+   CONNECT error 407 for example). This cannot be an error code, we must not
+   return informational stuff as errors, consider a new info returned by
+   curl_easy_getinfo() #845941
 
- * Go through the code and verify that libcurl deals with big files >2GB and
-   >4GB all over. Bug reports (and source reviews) show that it doesn't
-   currently work.
+ * Option to set the SO_KEEPALIVE socket option to make libcurl notice and
+   disconnect very long time idle connections.
 
  LIBCURL - multi interface
 
@@ -68,11 +70,6 @@ TODO
  * Since USERPWD always override the user and password specified in URLs, we
    might need another way to specify user+password for anonymous ftp logins.
 
- * Add FTPS support with SSL for the data connection too.  This should be made
-   according to the specs written in draft-murray-auth-ftp-ssl-12.txt,
-   "Securing FTP with TLS", valid until 28th February, 2004.
-   http://curl.haxx.se/rfc/draft-murray-auth-ftp-ssl-12.txt
-
  HTTP
 
  * Digest and GSS-Negotiate support for HTTP proxies. They only work on
@@ -153,8 +150,27 @@ TODO
    which should overwrite the program reasonable defaults (plain/text,
    8bit...) (Idea brough to us by kromJx)
 
+ * ability to specify the classic computing suffixes on the range
+   specifications. For example, to download the first 500 Kilobytes of a file,
+   be able to specify the following for the -r option: "-r 0-500K" or for the
+   first 2 Megabytes of a file: "-r 0-2M". (Mark Smith suggested)
+
+ * --data-encode that URL encodes the data before posting
+   http://curl.haxx.se/mail/archive-2003-11/0091.html (Kevin Roth suggested)
+
+ BUILD
+
+ * Consider extending 'roffit' to produce decent ASCII output, and use that
+   instead of (g)nroff when building src/hugehelp.c
+  
  TEST SUITE
 
+ * Make the test servers able to serve multiple running test suites. Like if
+   two users run 'make test' at once.
+
+ * Make runtests.pl capable of changing port numbers for the servers. This was
+   the intention from the start, but in practise it is now hard.
+
  * If perl wasn't found by the configure script, don't attempt to run the
    tests but explain something nice why it doesn't.
 
@@ -164,11 +180,20 @@ TODO
  * Make the test suite work on more platforms. OpenBSD and Mac OS. Remove
    fork()s and it should become even more portable.
 
- * Introduce a test suite that tests libcurl better and more explicitly.
-
-NEXT MAJOR RELEASE
+ NEXT MAJOR RELEASE
 
  * curl_easy_cleanup() returns void, but curl_multi_cleanup() returns a
    CURLMcode. These should be changed to be the same.
 
  * curl_formparse() should be removed
+
+ * remove obsolete defines from curl/curl.h
+
+ * remove the following functions from the public API:
+   curl_getenv
+   curl_mprintf (and variations)
+   curl_strequal
+   curl_strnequal
+
+   They will instead become curlx_ - alternatives. That makes the curl app
+   still capable of building with them from source.

docs/TheArtOfHttpScripting

@@ -1,7 +1,7 @@
 Online:  http://curl.haxx.se/docs/httpscripting.shtml
 Author:  Daniel Stenberg <daniel@haxx.se>
-Date:    October 31, 2001
-Version: 0.5
+Date:    November 6, 2001
+Version: 0.6
 
                 The Art Of Scripting HTTP Requests Using Curl
                 =============================================
@@ -65,7 +65,8 @@ Version: 0.5
 
  All HTTP replies contain a set of headers that are normally hidden, use
  curl's -i option to display them as well as the rest of the document. You can
- also ask the remote server for ONLY the headers by using the -I option.
+ also ask the remote server for ONLY the headers by using the -I option (which
+ will make curl issue a HEAD request).
 
 4. Forms
 
@@ -122,17 +123,22 @@ Version: 0.5
 
         <form method="POST" action="junk.cgi">
           <input type=text name="birthyear">
-          <input type=submit name=press value="OK">
+          <input type=submit name=press value=" OK ">
         </form>
 
   And to use curl to post this form with the same data filled in as before, we
   could do it like:
 
-        curl -d "birthyear=1905&press=OK" www.hotmail.com/when/junk.cgi
+        curl -d "birthyear=1905&press=%20OK%20" www.hotmail.com/when/junk.cgi
 
   This kind of POST will use the Content-Type
   application/x-www-form-urlencoded and is the most widely used POST kind.
 
+  The data you send to the server MUST already be properly encoded, curl will
+  not do that for you. For example, if you want the data to contain a space,
+  you need to replace that space with %20 etc. Failing to comply with this
+  will most likely cause your data to be received wrongly and messed up.
+
  4.3 FILE UPLOAD POST
 
   Back in late 1995 they defined a new way to post data over HTTP. It was
@@ -202,14 +208,18 @@ Version: 0.5
 
  Authentication is the ability to tell the server your username and password
  so that it can verify that you're allowed to do the request you're doing. The
- basic authentication used in HTTP is *plain* *text* based, which means it
- sends username and password only slightly obfuscated, but still fully
- readable by anyone that sniffs on the network between you and the remote
- server.
+ Basic authentication used in HTTP (which is the type curl uses by default) is
+ *plain* *text* based, which means it sends username and password only
+ slightly obfuscated, but still fully readable by anyone that sniffs on the
+ network between you and the remote server.
 
  To tell curl to use a user and password for authentication:
 
         curl -u name:password www.secrets.com
+
+ The site might require a different authentication method (check the headers
+ returned by the server), and then --ntlm, --digest, --negotiate or even
+ --anyauth might be options that suit you.
  
  Sometimes your HTTP access is only available through the use of a HTTP
  proxy. This seems to be especially common at various companies. A HTTP proxy
@@ -218,6 +228,9 @@ Version: 0.5
 
         curl -U proxyuser:proxypassword curl.haxx.se
 
+ If your proxy requires the authentication to be done using the NTLM method,
+ use --proxy-ntlm.
+
  If you use any one these user+password options but leave out the password
  part, curl will prompt for the password interactively.
 
@@ -309,6 +322,9 @@ Version: 0.5
 
         curl -D headers_and_cookies www.cookiesite.com
 
+ (Take note that the -c option described below is a better way to store
+ cookies.)
+
  Curl has a full blown cookie parsing engine built-in that comes to use if you
  want to reconnect to a server and use cookies that were stored from a
  previous connection (or handicrafted manually to fool the server into
@@ -362,6 +378,11 @@ Version: 0.5
 
         curl -E mycert.pem https://that.secure.server.com
 
+  curl also tries to verify that the server is who it claims to be, by
+  verifying the server's certificate against a CA cert bundle. Failing the
+  verification will cause curl to deny the connection. You must then use -k in
+  case you want to tell curl to ignore that the server can't be verified.
+
 12. REFERENCES
 
  RFC 2616 is a must to read if you want in-depth understanding of the HTTP

docs/curl.1

@@ -2,7 +2,7 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "22 Oct 2003" "Curl 7.10.8" "Curl Manual"
+.TH curl 1 "5 Mar 2004" "Curl 7.11.1" "Curl Manual"
 .SH NAME
 curl \- transfer a URL
 .SH SYNOPSIS
@@ -56,11 +56,10 @@ file instead of overwriting it. If the file doesn't exist, it will be created.
 
 If this option is used twice, the second one will disable append mode again.
 .IP "-A/--user-agent <agent string>"
-(HTTP)
-Specify the User-Agent string to send to the HTTP server. Some badly done CGIs
-fail if its not set to "Mozilla/4.0".  To encode blanks in the string,
-surround the string with single quote marks.  This can also be set with the
--H/--header flag of course.
+(HTTP) Specify the User-Agent string to send to the HTTP server. Some badly
+done CGIs fail if its not set to "Mozilla/4.0".  To encode blanks in the
+string, surround the string with single quote marks.  This can also be set
+with the \fI-H/--header\fP option of course.
 
 If this option is set more than once, the last one will be the one that's
 used.
@@ -69,7 +68,7 @@ used.
 most secure one the remote site claims it supports. This is done by first
 doing a request and checking the response-headers, thus inducing an extra
 network round-trip. This is used instead of setting a specific authentication
-method, which you can do with \fI--digest\fP, \fI--ntlm\fP, and
+method, which you can do with \fI--basic\fP, \fI--digest\fP, \fI--ntlm\fP, and
 \fI--negotiate\fP. (Added in 7.10.6)
 
 If this option is used several times, the following occurrences make no
@@ -84,14 +83,14 @@ If no '=' letter is used in the line, it is treated as a filename to use to
 read previously stored cookie lines from, which should be used in this session
 if they match. Using this method also activates the "cookie parser" which will
 make curl record incoming cookies too, which may be handy if you're using this
-in combination with the -L/--location option. The file format of the file to
-read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie
-file format.
+in combination with the \fI-L/--location\fP option. The file format of the
+file to read cookies from should be plain HTTP headers or the Netscape/Mozilla
+cookie file format.
 
-.B NOTE
-that the file specified with -b/--cookie is only used as input. No cookies
-will be stored in the file. To store cookies, use the -c/--cookie-jar option
-or you could even save the HTTP headers to a file using -D/--dump-header!
+\fBNOTE\fP that the file specified with \fI-b/--cookie\fP is only used as
+input. No cookies will be stored in the file. To store cookies, use the
+\fI-c/--cookie-jar\fP option or you could even save the HTTP headers to a file
+using \fI-D/--dump-header\fP!
 
 If this option is set more than once, the last one will be the one that's
 used.
@@ -112,7 +111,7 @@ difference.
 .IP "--ciphers <list of ciphers>"
 (SSL) Specifies which ciphers to use in the connection. The list of ciphers
 must be using valid ciphers. Read up on SSL cipher list details on this URL:
-.I http://www.openssl.org/docs/apps/ciphers.html
+\fIhttp://www.openssl.org/docs/apps/ciphers.html\fP
 
 If this option is used several times, the last one will override the others.
 .IP "--compressed"
@@ -166,8 +165,8 @@ that can emulate as if a user has filled in a HTML form and pressed the submit
 button. Note that the data is sent exactly as specified with no extra
 processing (with all newlines cut off).  The data is expected to be
 \&"url-encoded". This will cause curl to pass the data to the server using the
-content-type application/x-www-form-urlencoded. Compare to -F. If more than
-one -d/--data option is used on the same command line, the data pieces
+content-type application/x-www-form-urlencoded. Compare to \fI-F/--form\fP. If
+this option is used more than once on the same command line, the data pieces
 specified will be merged together with a separating &-letter. Thus, using '-d
 name=daniel -d skill=lousy' would generate a post chunk that looks like
 \&'name=daniel&skill=lousy'.
@@ -176,31 +175,32 @@ If you start the data with the letter @, the rest should be a file name to
 read the data from, or - if you want curl to read the data from stdin.  The
 contents of the file must already be url-encoded. Multiple files can also be
 specified. Posting data from a file named 'foobar' would thus be done with
-\&"--data @foobar".
+\fI--data\fP @foobar".
 
-To post data purely binary, you should instead use the --data-binary option.
+To post data purely binary, you should instead use the \fI--data-binary\fP
+option.
 
--d/--data is the same as --data-ascii.
+\fI-d/--data\fP is the same as \fI--data-ascii\fP.
 
 If this option is used several times, the ones following the first will
 append data.
 .IP "--data-ascii <data>"
-(HTTP) This is an alias for the -d/--data option.
+(HTTP) This is an alias for the \fI-d/--data\fP option.
 
 If this option is used several times, the ones following the first will
 append data.
 .IP "--data-binary <data>"
-(HTTP) This posts data in a similar manner as --data-ascii does, although when
-using this option the entire context of the posted data is kept as-is. If you
-want to post a binary file without the strip-newlines feature of the
---data-ascii option, this is for you.
+(HTTP) This posts data in a similar manner as \fI--data-ascii\fP does,
+although when using this option the entire context of the posted data is kept
+as-is. If you want to post a binary file without the strip-newlines feature of
+the \fI--data-ascii\fP option, this is for you.
 
 If this option is used several times, the ones following the first will
 append data.
 .IP "--digest"
 (HTTP) Enables HTTP Digest authentication. This is a authentication that
 prevents the password from being sent over the wire in clear text. Use this in
-combination with the normal -u/--user option to set user name and
+combination with the normal \fI-u/--user\fP option to set user name and
 password. See also \fI--ntlm\fP, \fI--negotiate\fP and \fI--anyauth\fP for
 related options. (Added in curl 7.10.6)
 
@@ -226,8 +226,8 @@ Write the protocol headers to the specified file.
 
 This option is handy to use when you want to store the headers that a HTTP
 site sends to you. Cookies from the headers could then be read in a second
-curl invoke by using the -b/--cookie option! The -c/--cookie-jar option is
-however a better way to store cookies.
+curl invoke by using the \fI-b/--cookie\fP option! The \fI-c/--cookie-jar\fP
+option is however a better way to store cookies.
 
 When used on FTP, the ftp server response lines are considered being "headers"
 and thus are saved there.
@@ -235,11 +235,10 @@ and thus are saved there.
 If this option is used several times, the last one will be used.
 .IP "-e/--referer <URL>"
 (HTTP) Sends the "Referer Page" information to the HTTP server. This can also
-be set with the -H/--header flag of course.  When used with
-.I -L/--location 
-you can append ";auto" to the referer URL to make curl automatically set the
-previous URL when it follows a Location: header. The ";auto" string can be
-used alone, even if you don't set an initial referer.
+be set with the \fI-H/--header\fP flag of course.  When used with
+\fI-L/--location\fP you can append ";auto" to the referer URL to make curl
+automatically set the previous URL when it follows a Location: header. The
+";auto" string can be used alone, even if you don't set an initial referer.
 
 If this option is used several times, the last one will be used.
 .IP "--environment"
@@ -251,8 +250,7 @@ If this option is used several times, each occurrence will toggle this on/off.
 .IP "--egd-file <file>"
 (HTTPS) Specify the path name to the Entropy Gathering Daemon socket. The
 socket is used to seed the random engine for SSL connections. See also the
-.I "--random-file"
-option.
+\fI--random-file\fP option.
 .IP "-E/--cert <certificate[:password]>"
 (HTTPS)
 Tells curl to use the specified certificate file when getting a file
@@ -261,6 +259,11 @@ If the optional password isn't specified, it will be queried for on
 the terminal. Note that this certificate is the private key and the private
 certificate concatenated!
 
+If this option is used several times, the last one will be used.
+.IP "--cert-type <type>"
+(SSL) Tells curl what certificate type the provided certificate is in. PEM,
+DER and ENG are recognized types.
+
 If this option is used several times, the last one will be used.
 .IP "--cacert <CA certificate>"
 (HTTPS) Tells curl to use the specified certificate file to verify the
@@ -279,9 +282,10 @@ If this option is used several times, the last one will be used.
 .IP "--capath <CA certificate directory>"
 (HTTPS) Tells curl to use the specified certificate directory to verify the
 peer. The certificates must be in PEM format, and the directory must have been
-processed using the c_rehash utility supplied with openssl. Using --capath can
-allow curl to make https connections much more efficiently than using --cacert
-if the --cacert file contains many CA certificates.
+processed using the c_rehash utility supplied with openssl. Using
+\fI--capath\fP can allow curl to make https connections much more efficiently
+than using \fI--cacert\fP if the \fI--cacert\fP file contains many CA
+certificates.
 
 If this option is used several times, the last one will be used.
 .IP "-f/--fail"
@@ -294,9 +298,19 @@ prevent curl from outputting that and fail silently instead.
 If this option is used twice, the second will again disable silent failure.
 .IP "--ftp-create-dirs"
 (FTP) When an FTP URL/operation uses a path that doesn't currently exist on
-the server, the standard behaviour of curl is to fail. Using this option, curl
+the server, the standard behavior of curl is to fail. Using this option, curl
 will instead attempt to create missing directories. (Added in 7.10.7)
 
+If this option is used twice, the second will again disable silent failure.
+.IP "--ftp-pasv"
+(FTP) Use PASV when transfering. PASV is the internal default behavior, but
+using this option can be used to override a previos --ftp-port option. (Added
+in 7.11.0)
+
+If this option is used twice, the second will again disable silent failure.
+.IP "--ftp-ssl"
+(FTP) Make the FTP connection switch to use SSL/TLS. (Added in 7.11.0)
+
 If this option is used twice, the second will again disable silent failure.
 .IP "-F/--form <name=content>"
 (HTTP) This lets curl emulate a filled in form in which a user has pressed the
@@ -331,10 +345,10 @@ you can specify URLs that contain the letters {}[] without having them being
 interpreted by curl itself. Note that these letters are not normal legal URL
 contents but they should be encoded according to the URI standard.
 .IP "-G/--get"
-When used, this option will make all data specified with -d/--data or
---data-binary to be used in a HTTP GET request instead of the POST request
-that otherwise would be used. The data will be appended to the URL with a '?'
-separator.
+When used, this option will make all data specified with \fI-d/--data\fP or
+\fI--data-binary\fP to be used in a HTTP GET request instead of the POST
+request that otherwise would be used. The data will be appended to the URL
+with a '?'  separator.
 
 If used in combination with -I, the POST data will instead be appended to the
 URL with a HEAD request.
@@ -352,6 +366,8 @@ set headers without knowing perfectly well what you're doing. Replacing an
 internal header with one without content on the right side of the colon will
 prevent that header from appearing.
 
+See also the \fI-A/--user-agent\fP and \fI-e/--referer\fP options.
+
 This option can be used multiple times to add/replace/remove multiple headers.
 .IP "-i/--include"
 (HTTP)
@@ -363,7 +379,7 @@ If this option is used twice, the second will again disable header include.
 Perform an operation using a specified interface. You can enter interface
 name, IP address or host name. An example could look like:
 
-.B "curl --interface eth0:1 http://www.netscape.com/"
+ curl --interface eth0:1 http://www.netscape.com/
 
 If this option is used several times, the last one will be used.
 .IP "-I/--head"
@@ -386,16 +402,27 @@ If this option is used several times, each occurrence will toggle this on/off.
 and transfers. Starting with curl 7.10, all SSL connections will be attempted
 to be made secure by using the CA certificate bundle installed by
 default. This makes all connections considered "insecure" to fail unless
--k/--insecure is used.
-
-This option is ignored if --cacert or --capath is used!
+\fI-k/--insecure\fP is used.
 
 If this option is used twice, the second time will again disable it.
+.IP "--key <key>"
+(SSL) Private key file name. Allows you to provide your private key in this
+separate file.
+
+If this option is used several times, the last one will be used.
+.IP "--key-type <type>"
+(SSL) Private key file type. Specify which type your \fI--key\fP provided
+private key is. DER, PEM and ENG are supported.
+
+If this option is used several times, the last one will be used.
 .IP "--krb4 <level>"
 (FTP) Enable kerberos4 authentication and use. The level must be entered and
 should be one of 'clear', 'safe', 'confidential' or 'private'. Should you use
 a level that is not one of these, 'private' will instead be used.
 
+This option requiures that the library was built with kerberos4 support. This
+is not very common. Use \fI-V/--version\fP to see if your curl supports it.
+
 If this option is used several times, the last one will be used.
 .IP "-K/--config <config file>"
 Specify which config file to read curl arguments from. The config file is a
@@ -409,7 +436,7 @@ treated as a comment.
 Specify the filename as '-' to make curl read the file from stdin.
 
 Note that to be able to specify a URL in the config file, you need to specify
-it using the --url option, and not by simply writing the URL on its own
+it using the \fI--url\fP option, and not by simply writing the URL on its own
 line. So, it could look similar to this:
 
 url = "http://curl.haxx.se/docs/"
@@ -420,10 +447,13 @@ Specify the maximum transfer rate you want curl to use. This feature is useful
 if you have a limited pipe and you'd like your transfer not use your entire
 bandwidth.
 
-The given speed is measured in bytes/second, unless a suffix is
-appended. Appending 'k' or 'K' will count the number as kilobytes, 'm' or M'
-makes it megabytes while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and
-1G.
+The given speed is measured in bytes/second, unless a suffix is appended.
+Appending 'k' or 'K' will count the number as kilobytes, 'm' or M' makes it
+megabytes while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G.
+
+If you are also using the \fI-Y/--speed-limit\fP option, that option will take
+precedence and might cripple the rate-limiting slightly, to help keeping the
+speed-limit logic working.
 
 This option was introduced in curl 7.10.
 
@@ -443,19 +473,20 @@ If this option is used twice, the second will again disable list only.
 .IP "-L/--location"
 (HTTP/HTTPS) If the server reports that the requested page has a different
 location (indicated with the header line Location:) this flag will let curl
-attempt to reattempt the get on the new place. If used together with -i or -I,
-headers from all requested pages will be shown. If authentication is used,
-curl will only send its credentials to the initial host, so if a redirect
-takes curl to a different host, it won't intercept the user+password. See also
-\fI--location-trusted\fP on how to change this.
+attempt to reattempt the get on the new place. If used together with
+\fI-i/--include\fP or \fI-I/--head\fP, headers from all requested pages will
+be shown. If authentication is used, curl will only send its credentials to
+the initial host, so if a redirect takes curl to a different host, it won't
+intercept the user+password. See also \fI--location-trusted\fP on how to
+change this.
 
 If this option is used twice, the second will again disable location following.
 .IP "--location-trusted"
-(HTTP/HTTPS) Like \fI--location\fP, but will allow sending the name + password
-to all hosts that the site may redirect to. This may or may not introduce a
-security breach if the site redirects you do a site to which you'll send your
-authentication info (which is plaintext in the case of HTTP Basic
-authentication).
+(HTTP/HTTPS) Like \fI-L/--location\fP, but will allow sending the name +
+password to all hosts that the site may redirect to. This may or may not
+introduce a security breach if the site redirects you do a site to which
+you'll send your authentication info (which is plaintext in the case of HTTP
+Basic authentication).
 
 If this option is used twice, the second will again disable location following.
 .IP "--max-filesize <bytes>"
@@ -476,11 +507,9 @@ If this option is used several times, the last one will be used.
 .IP "-M/--manual"
 Manual. Display the huge help text.
 .IP "-n/--netrc"
-Makes curl scan the
-.I .netrc
-file in the user's home directory for login name and password. This is
-typically used for ftp on unix. If used with http, curl will enable user
-authentication. See
+Makes curl scan the \fI.netrc\fP file in the user's home directory for login
+name and password. This is typically used for ftp on unix. If used with http,
+curl will enable user authentication. See
 .BR netrc(4)
 or
 .BR ftp(1)
@@ -489,14 +518,16 @@ hasn't the right permissions (it should not be world nor group
 readable). The environment variable "HOME" is used to find the home
 directory.
 
-A quick and very simple example of how to setup a
-.I .netrc
-to allow curl to ftp to the machine host.domain.com with user name
-\&'myself' and password 'secret' should look similar to:
+A quick and very simple example of how to setup a \fI.netrc\fP to allow curl
+to ftp to the machine host.domain.com with user name \&'myself' and password
+'secret' should look similar to:
 
 .B "machine host.domain.com login myself password secret"
 
 If this option is used twice, the second will again disable netrc usage.
+.IP "--netrc-optional"
+Very similar to \fI--netrc\fP, but this option makes the .netrc usage
+\fBoptional\fP and not mandatory as the \fI--netrc\fP does.
 .IP "--negotiate"
 (HTTP) Enables GSS-Negotiate authentication. The GSS-Negotiate method was
 designed by Microsoft and is used in their web aplications. It is primarily
@@ -504,9 +535,9 @@ meant as a support for Kerberos5 authentication but may be also used along
 with another authentication methods. For more information see IETF draft
 draft-brezak-spnego-http-04.txt. (Added in 7.10.6)
 
-\fBNOTE\fP that this option requiures that the library was built with GSSAPI
-support. This is not very common. Use \fIcurl --version\fP to see if your
-version supports GSS-Negotiate.
+This option requiures that the library was built with GSSAPI support. This is
+not very common. Use \fI-V/--version\fP to see if your version supports
+GSS-Negotiate.
 
 If this option is used several times, the following occurrences make no
 difference.
@@ -525,8 +556,11 @@ on their efforts. This kind of behavior should not be endorsed, you should
 encourage everyone who uses NTLM to switch to a public and documented
 authentication method instead. Such as Digest. (Added in 7.10.6)
 
-\fBNOTE\fP that this option requiures that the library was built with SSL
-support. Use \fIcurl --version\fP to see if your version supports NTLM.
+If you want to enable NTLM for your proxy authentication, then use
+\fI--proxy-ntlm\fP.
+
+This option requiures that the library was built with SSL support. Use
+\fI-V/--version\fP to see if your curl supports NTLM.
 
 If this option is used several times, the following occurrences make no
 difference.
@@ -544,46 +578,52 @@ or use several variables like:
 
 You may use this option as many times as you have number of URLs.
 
-See also the --create-dirs option to create the local directories dynamically.
+See also the \fI--create-dirs\fP option to create the local directories
+dynamically.
 .IP "-O/--remote-name"
 Write output to a local file named like the remote file we get. (Only the file
 part of the remote file is used, the path is cut off.)
 
 You may use this option as many times as you have number of URLs.
+.IP "--pass <phrase>"
+(SSL) Pass phrase for the private key
+
+If this option is used several times, the last one will be used.
+.IP "--proxy-ntlm"
+Tells curl to use NTLM authentication when communicating with the given
+proxy. Use \fI--ntlm\fP for enabling NTLM with a remote host.
+
+If this option is used twice, the second will again disable proxy NTLM.
 .IP "-p/--proxytunnel"
-When an HTTP proxy is used, this option will cause non-HTTP protocols to
-attempt to tunnel through the proxy instead of merely using it to do HTTP-like
-operations. The tunnel approach is made with the HTTP proxy CONNECT request
-and requires that the proxy allows direct connect to the remote port number
-curl wants to tunnel through to.
+When an HTTP proxy is used (\fI-x/--proxy\fP), this option will cause non-HTTP
+protocols to attempt to tunnel through the proxy instead of merely using it to
+do HTTP-like operations. The tunnel approach is made with the HTTP proxy
+CONNECT request and requires that the proxy allows direct connect to the
+remote port number curl wants to tunnel through to.
 
 If this option is used twice, the second will again disable proxy tunnel.
-.IP "-P/--ftpport <address>"
-(FTP)
-Reverses the initiator/listener roles when connecting with ftp. This
-switch makes Curl use the PORT command instead of PASV. In
-practice, PORT tells the server to connect to the client's specified
-address and port, while PASV asks the server for an ip address and
-port to connect to. <address> should be one of:
+.IP "-P/--ftp-port <address>"
+(FTP) Reverses the initiator/listener roles when connecting with ftp. This
+switch makes Curl use the PORT command instead of PASV. In practice, PORT
+tells the server to connect to the client's specified address and port, while
+PASV asks the server for an ip address and port to connect to. <address>
+should be one of:
 .RS
-.TP 12
-.B interface
+.IP interface
 i.e "eth0" to specify which interface's IP address you want to use  (Unix only)
-.TP
-.B "IP address"
+.IP "IP address"
 i.e "192.168.10.1" to specify exact IP number
-.TP
-.B "host name"
+.IP "host name"
 i.e "my.host.domain" to specify machine
-.TP
-.B "-"
+.IP "-"
 (any single-letter string) to make it pick the machine's default
 .RE
 
-If this option is used several times, the last one will be used.
+If this option is used several times, the last one will be used. Disable the
+use of PORT with \fI--ftp-pasv\fP. Disable the attempt to use the EPRT command
+instead of PORT by using \fI--disable-eprt\fP. EPRT is really PORT++.
 .IP "-q"
-If used as the first parameter on the command line, the
-.I $HOME/.curlrc
+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
@@ -598,9 +638,7 @@ This option can be used multiple times.
 .IP "--random-file <file>"
 (HTTPS) Specify the path name to file containing what will be considered as
 random data. The data is used to seed the random engine for SSL connections.
-See also the
-.I "--edg-file"
-option.
+See also the \fI--egd-file\fP option.
 .IP "-r/--range <range>"
 (HTTP/FTP)
 Retrieve a byte range (i.e a partial document) from a HTTP/1.1 or FTP
@@ -655,6 +693,14 @@ If this option is used twice, the second will again disable mute.
 When used with -s it makes curl show error message if it fails.
 
 If this option is used twice, the second will again disable show error.
+.IP "--socks <host[:port]>"
+Use the specified SOCKS5 proxy. If the port number is not specified, it is
+assumed at port 1080. (Option added in 7.11.1)
+
+This option overrides any previous use of \fI-x/--proxy\fP, as they are
+mutually exclusive.
+
+If this option is used several times, the last one will be used.
 .IP "--stderr <file>"
 Redirect all writes to stderr to the specified file instead. If the file name
 is a plain '-', it is instead written to stdout. This option has no point when
@@ -704,35 +750,26 @@ Enables a full trace dump of all incoming and outgoing data, including
 descriptive information, to the given output file. Use "-" as filename to have
 the output sent to stdout.
 
-This is very similar to --trace, but leaves out the hex part and only shows
-the ASCII part of the dump. It makes smaller output that might be easier to
-read for untrained humans.
+This is very similar to \fI--trace\fP, but leaves out the hex part and only
+shows the ASCII part of the dump. It makes smaller output that might be easier
+to read for untrained humans.
 
 If this option is used several times, the last one will be used. (Added in
 7.9.7)
 .IP "-u/--user <user:password>"
-Specify user and password to use when fetching. Read the MANUAL for detailed
-examples of how to use this. If no password is specified, curl will ask for it
-interactively.
-
-You can also use the --digest option to enable Digest authentication when
-communicating with HTTP 1.1 servers.
+Specify user and password to use for server authentication.
 
 If this option is used several times, the last one will be used.
 .IP "-U/--proxy-user <user:password>"
-Specify user and password to use for Proxy authentication. If no
-password is specified, curl will ask for it interactively.
+Specify user and password to use for proxy authentication.
 
 If this option is used several times, the last one will be used.
 .IP "--url <URL>"
 Specify a URL to fetch. This option is mostly handy when you want to specify
 URL(s) in a config file.
 
-This option may be used any number of times. To control where this URL is written, use the
-.I -o
-or the
-.I -O
-options.
+This option may be used any number of times. To control where this URL is
+written, use the \fI-o/--output\fP or the \fI-O/--remote-name\fP options.
 .IP "-v/--verbose"
 Makes the fetching more verbose/talkative. Mostly usable for debugging. Lines
 starting with '>' means data sent by curl, '<' means data received by curl
@@ -756,8 +793,30 @@ The second line (starts with "Protocols:") shows all protocols that libcurl
 reports to support.
 
 The third line (starts with "Features:") shows specific features libcurl
-reports to offer.
-
+reports to offer. Available features include:
+.RS
+.IP "IPv6"
+You can use IPv6 with this.
+.IP "krb4"
+Krb4 for ftp is supported.
+.IP "SSL"
+HTTPS and FTPS are supported.
+.IP "libz"
+Automatic decompression of compressed files over HTTP is supported.
+.IP "NTLM"
+NTLM authenticaion is supported.
+.IP "GSS-Negotiate"
+Negotiate authenticaion is supported.
+.IP "Debug"
+This curl uses a libcurl built with Debug. This enables more error-tracking
+and memory debugging etc. For curl-developers only!
+.IP "AsynchDNS"
+This curl uses asynchronous name resolves.
+.IP "SPNEGO"
+SPNEGO Negotiate authenticaion is supported.
+.IP "Largefile"
+This curl supports transfers of large files, files larger than 2GB.
+.RE
 .IP "-w/--write-out <format>"
 Defines what to display after a completed and successful operation. The format
 is a string that may contain plain text mixed with any number of variables. The
@@ -887,9 +946,9 @@ than the specified date/time.
 
 If this option is used several times, the last one will be used.
 .IP "-Z/--max-redirs <num>"
-Set maximum number of redirection-followings allowed. If -L/--location is
-used, this option can be used to prevent curl from following redirections "in
-absurdum".
+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".
 
 If this option is used several times, the last one will be used.
 .IP "-0/--http1.0"
@@ -987,7 +1046,7 @@ FTP quote error. A quote command returned error from the server.
 .IP 22
 HTTP page not retrieved. The requested url was not found or returned another
 error with the HTTP error code being 400 or above. This return code only
-appears if --fail is used.
+appears if \fI-f/--fail\fP is used.
 .IP 23
 Write error. Curl couldn't write data to a local filesystem or similar.
 .IP 24

docs/examples/curlgtk.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -17,10 +17,13 @@
 #include <curl/types.h> /* new for v7 */
 #include <curl/easy.h> /* new for v7 */
 
-#include <pthread.h>
-
 GtkWidget *Bar;
 
+size_t my_write_func(void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+  return fwrite(ptr, size, nmemb, stream);
+}
+
 size_t my_read_func(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
   return fread(ptr, size, nmemb, stream);
@@ -45,25 +48,27 @@ void *curl_thread(void *ptr)
   CURLcode res;
   FILE *outfile;
   gchar *url = ptr;
-  
+
   curl = curl_easy_init();
   if(curl)
   {
-    outfile = fopen("/tmp/test.curl", "w");
+    outfile = fopen("test.curl", "w");
 
     curl_easy_setopt(curl, CURLOPT_URL, url);
-    curl_easy_setopt(curl, CURLOPT_FILE, outfile);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_write_func);
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, my_read_func);
     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE);
     curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, my_progress_func);
     curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, Bar);
-    
+
     res = curl_easy_perform(curl);
 
     fclose(outfile);
     /* always cleanup */
     curl_easy_cleanup(curl);
   }
+
   return NULL;
 }
 
@@ -71,11 +76,10 @@ int main(int argc, char **argv)
 {
   GtkWidget *Window, *Frame, *Frame2;
   GtkAdjustment *adj;
-  pthread_t curl_tid;
 
   /* Init thread */
   g_thread_init(NULL);
-  
+
   gtk_init(&argc, &argv);
   Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   Frame = gtk_frame_new(NULL);
@@ -90,8 +94,10 @@ int main(int argc, char **argv)
   gtk_container_add(GTK_CONTAINER(Frame2), Bar);
   gtk_widget_show_all(Window);
 
-  pthread_create(&curl_tid, NULL, curl_thread, argv[1]);
-    
+  if (!g_thread_create(&curl_thread, argv[1], FALSE, NULL) != 0)
+    g_warning("can't create the thread");
+
+
   gdk_threads_enter();
   gtk_main();
   gdk_threads_leave();

docs/examples/fopen.c

@@ -51,11 +51,6 @@
 
 #include <curl/curl.h>
 
-#if (LIBCURL_VERSION_NUM < 0x070907)
-#error "too old libcurl version, get the latest!"
-#endif
-
-
 enum fcurl_type_e { CFTYPE_NONE=0, CFTYPE_FILE=1, CFTYPE_CURL=2 };
 
 struct fcurl_data
@@ -236,7 +231,7 @@ url_fopen(char *url,const char *operation)
 	file->handle.curl = curl_easy_init();
 
 	curl_easy_setopt(file->handle.curl, CURLOPT_URL, url);
-	curl_easy_setopt(file->handle.curl, CURLOPT_FILE, file);
+	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);
 

docs/examples/ftpget.c

@@ -58,7 +58,7 @@ int main(void)
     /* Define our callback to get called when there's data to be written */
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
     /* Set a pointer to our struct to pass to the callback */
-    curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &ftpfile);
 
     /* Switch on full protocol/debug output */
     curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);

docs/examples/ftpgetresp.c

@@ -45,7 +45,7 @@ int main(int argc, char **argv)
   if(curl) {
     /* Get a file listing from sunet */
     curl_easy_setopt(curl, CURLOPT_URL, "ftp://ftp.sunet.se/");
-    curl_easy_setopt(curl, CURLOPT_FILE, ftpfile);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, ftpfile);
     curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, write_response);
     curl_easy_setopt(curl, CURLOPT_WRITEHEADER, respfile);
     res = curl_easy_perform(curl);

docs/examples/ftpupload.c

@@ -70,10 +70,10 @@ int main(int argc, char **argv)
     curl_easy_setopt(curl, CURLOPT_POSTQUOTE, headerlist);
 
     /* now specify which file to upload */
-    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
+    curl_easy_setopt(curl, CURLOPT_READDATA, hd_src);
 
     /* and give the size of the upload (optional) */
-    curl_easy_setopt(curl, CURLOPT_INFILESIZE, file_info.st_size);
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, file_info.st_size);
 
     /* Now run off and do what you've been told! */
     res = curl_easy_perform(curl);

docs/examples/getinmemory.c

@@ -13,9 +13,6 @@
  * This exact source code has not been verified to work.
  */
 
-/* to make this work under windows, use the win32-functions from the
-   win32socket.c file as well */
-
 #include <stdio.h>
 
 #include <curl/curl.h>
@@ -51,6 +48,8 @@ int main(int argc, char **argv)
   chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
   chunk.size = 0;    /* no data at this point */
 
+  curl_global_init(CURL_GLOBAL_ALL);
+
   /* init the curl session */
   curl_handle = curl_easy_init();
 
@@ -61,7 +60,7 @@ int main(int argc, char **argv)
   curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
 
   /* we pass our 'chunk' struct to the callback function */
-  curl_easy_setopt(curl_handle, CURLOPT_FILE, (void *)&chunk);
+  curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chunk);
 
   /* get it! */
   curl_easy_perform(curl_handle);

docs/examples/httpput.c

@@ -78,14 +78,15 @@ int main(int argc, char **argv)
     /* HTTP PUT please */
     curl_easy_setopt(curl, CURLOPT_PUT, TRUE);
 
-    /* specify target */
+    /* specify target URL, and note that this URL should include a file
+       name, not only a directory */
     curl_easy_setopt(curl,CURLOPT_URL, url);
 
     /* now specify which file to upload */
-    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
+    curl_easy_setopt(curl, CURLOPT_READDATA, hd_src);
 
-    /* and give the size of the upload (optional) */
-    curl_easy_setopt(curl, CURLOPT_INFILESIZE, file_info.st_size);
+    /* and give the size of the upload */
+    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, file_info.st_size);
 
     /* Now run off and do what you've been told! */
     res = curl_easy_perform(curl);

docs/examples/persistant.c

@@ -10,26 +10,14 @@
 
 #include <stdio.h>
 #include <unistd.h>
-
 #include <curl/curl.h>
 
-/* to make this work under windows, use the win32-functions from the
-   docs/examples/win32socket.c file as well */
-
-/* This example REQUIRES libcurl 7.7 or later */
-#if (LIBCURL_VERSION_NUM < 0x070700)
-#error Too old libcurl version, upgrade or stay away.
-#endif
-
 int main(int argc, char **argv)
 {
   CURL *curl;
   CURLcode res;
 
-#ifdef MALLOCDEBUG
-  /* this sends all memory debug messages to a specified logfile */
-  curl_memdebug("memdump");
-#endif
+  curl_global_init(CURL_GLOBAL_ALL);
 
   curl = curl_easy_init();
   if(curl) {

docs/examples/post-callback.c

@@ -10,21 +10,11 @@
  * An example source code that issues a HTTP POST and we provide the actual
  * data through a read callback.
  *
- * Please be aware of the fact that the size of the posted data MUST be
- * specified before the transfer is being made (with CURLOPT_POSTFIELDSIZE).
- * This requirement will change when libcurl starts supporting chunked-encoded
- * sends.
- *
- * This example requires libcurl 7.9.6 or later.
  */
 #include <stdio.h>
 #include <string.h>
 #include <curl/curl.h>
 
-#if LIBCURL_VERSION_NUM < 0x070906
-#error this example source requires libcurl 7.9.6 or newer
-#endif
-
 char data[]="this is what we post to the silly web server";
 
 struct WriteThis {
@@ -74,7 +64,7 @@ int main(void)
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
 
     /* pointer to pass to our read function */
-    curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
+    curl_easy_setopt(curl, CURLOPT_READDATA, &pooh);
 
     /* get verbose debug output please */
     curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);

docs/examples/postit2.c

@@ -21,9 +21,6 @@
  * This exact source code has not been verified to work.
  */
 
-/* to make this work under windows, use the win32-functions from the
-   win32socket.c file as well */
-
 #include <stdio.h>
 #include <string.h>
 
@@ -31,10 +28,6 @@
 #include <curl/types.h>
 #include <curl/easy.h>
 
-#if LIBCURL_VERSION_NUM < 0x070900
-#error "curl_formadd() is not introduced until libcurl 7.9 and later"
-#endif
-
 int main(int argc, char *argv[])
 {
   CURL *curl;
@@ -45,6 +38,8 @@ int main(int argc, char *argv[])
   struct curl_slist *headerlist=NULL;
   char buf[] = "Expect:";
 
+  curl_global_init(CURL_GLOBAL_ALL);
+
   /* Fill in the file upload field */
   curl_formadd(&formpost,
                &lastptr,

docs/examples/sepheaders.c

@@ -8,9 +8,6 @@
  * $Id$
  */
 
-/* to make this work under windows, use the win32-functions from the
-   win32socket.c file as well */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,6 +30,8 @@ int main(int argc, char **argv)
   char *bodyfilename = "body.out";
   FILE *bodyfile;
 
+  curl_global_init(CURL_GLOBAL_ALL);
+
   /* init the curl session */
   curl_handle = curl_easy_init();
 

docs/libcurl-the-guide

@@ -222,12 +222,20 @@ Multi-threading issues
  handlers. Signals are needed for a SIGPIPE handler, and the alarm() syscall
  is used to catch timeouts (mostly during DNS lookup).
 
- So when using multiple threads you should first ignore SIGPIPE in your main
+ If you are accessing HTTPS or FTPS URLs in a multi-threaded manner, you are
+ then of course using OpenSSL multi-threaded and it has itself a few
+ requirements on this. Basicly, you need to provide one or two functions to
+ allow it to function properly. For all details, see this:
+
+   http://www.openssl.org/docs/crypto/threads.html#DESCRIPTION
+
+ When using multiple threads you should first ignore SIGPIPE in your main
  thread and set the CURLOPT_NOSIGNAL option to TRUE for all handles.
 
  Everything will work fine except that timeouts are not honored during the DNS
- lookup - this would require some sort of asynchronous DNS lookup (which is
- planned for a future libcurl version).
+ lookup - which you can work around by building libcurl with ares-support.
+ Ares is a library that provides asynchronous name resolves. Unfortunately,
+ ares does not yet support IPv6.
 
  For SIGPIPE info see the UNIX Socket FAQ at
  http://www.unixguide.net/network/socketfaq/2.22.shtml
@@ -298,9 +306,10 @@ Upload Data to a Remote Site
 
  A few protocols won't behave properly when uploads are done without any prior
  knowledge of the expected file size. So, set the upload file size using the
- CURLOPT_INFILESIZE for all known file sizes like this[1]:
+ CURLOPT_INFILESIZE_LARGE for all known file sizes like this[1]:
 
-    curl_easy_setopt(easyhandle, CURLOPT_INFILESIZE, file_size);
+    /* in this example, file_size must be an off_t variable */
+    curl_easy_setopt(easyhandle, CURLOPT_INFILESIZE_LARGE, file_size);
 
  When you call curl_easy_perform() this time, it'll perform all the necessary
  operations and when it has invoked the upload it'll call your supplied
@@ -361,20 +370,44 @@ Passwords
  without it. There are times when the password isn't optional, like when
  you're using an SSL private key for secure transfers.
 
- You can in this situation either pass a password to libcurl to use to unlock
- the private key, or you can let libcurl prompt the user for it. If you prefer
- to ask the user, then you can provide your own callback function that will be
- called when libcurl wants the password. That way, you can control how the
- question will appear to the user.
-
  To pass the known private key password to libcurl:
 
     curl_easy_setopt(easyhandle, CURLOPT_SSLKEYPASSWD, "keypassword");
 
- To make a password callback:
 
-    int enter_passwd(void *ourp, const char *prompt, char *buffer, int len);
-    curl_easy_setopt(easyhandle, CURLOPT_PASSWDFUNCTION, enter_passwd);
+HTTP Authentication
+
+ The previous chapter showed how to set user name and password for getting
+ URLs that require authentication. When using the HTTP protocol, there are
+ many different ways a client can provide those credentials to the server and
+ you can control what way libcurl will (attempt to) use. The default HTTP
+ authentication method is called 'Basic', which is sending the name and
+ password in clear-text in the HTTP request, base64-encoded. This is unsecure.
+
+ At the time of this writing libcurl can be built to use: Basic, Digest, NTLM,
+ Negotiate, GSS-Negotiate and SPNEGO. You can tell libcurl which one to use
+ with CURLOPT_HTTPAUTH as in:
+
+    curl_easy_setopt(easyhandle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+
+ And when you send authentication to a proxy, you can also set authentication
+ type the same way but instead with CURLOPT_PROXYAUTH:
+
+    curl_easy_setopt(easyhandle, CURLOPT_PROXYAUTH, CURLAUTH_NTLM);
+
+ Both these options allow you to set multiple types (by ORing them together),
+ to make libcurl pick the most secure one out of the types the server/proxy
+ claims to support. This method does however add a round-trip since libcurl
+ must first ask the server what it supports:
+
+    curl_easy_setopt(easyhandle, CURLOPT_HTTPAUTH,
+                                 CURLAUTH_DIGEST|CURLAUTH_BASIC);
+
+ For convenience, you can use the 'CURLAUTH_ANY' define (instead of a list
+ with specific types) which allows libcurl to use whatever method it wants.
+
+ When asking for multiple types, libcurl will pick the available one it
+ considers "best" in its own internal order of preference.
 
 
 HTTP POSTing
@@ -976,6 +1009,10 @@ FTP Peculiarities We Need
  or even a local network interface name that libcurl will get the IP address
  from.
 
+ When doing the "PORT" approach, libcurl will attempt to use the EPRT and the
+ LPRT before trying PORT, as they work with more protocols. You can disable
+ this behavior by setting CURLOPT_FTP_USE_EPRT to FALSE.
+
 
 Headers Equal Fun
 
@@ -1092,7 +1129,6 @@ Footnotes:
       Tranfer-Encoding in cases were HTTP uploads are done with data of an
       unknown size.
 
-
 [2] = This happens on Windows machines when libcurl is built and used as a
       DLL. However, you can still do this on Windows if you link with a static
       library.

docs/libcurl/Makefile.am

@@ -122,7 +122,7 @@ CLEANFILES = $(HTMLPAGES) $(PDFPAGES)
 
 EXTRA_DIST = $(man_MANS) $(HTMLPAGES) index.html $(PDFPAGES)
 
-MAN2HTML= $(NROFF) -man $< | man2html >$@
+MAN2HTML= roffit --mandir=. < $< >$@
 
 SUFFIXES = .3 .html
 

docs/libcurl/curl_easy_cleanup.3

@@ -7,13 +7,13 @@
 curl_easy_cleanup - End a libcurl easy session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
-.sp
+
 .BI "void curl_easy_cleanup(CURL *" handle ");"
-.ad
+
 .SH DESCRIPTION
 This function must be the last function to call for an easy session. It is the
-opposite of the \fIcurl_easy_init\fP function and must be called with the same
-\fIhandle\fP as input that the curl_easy_init call returned.
+opposite of the \fIcurl_easy_init(3)\fP function and must be called with the
+same \fIhandle\fP as input that the curl_easy_init call returned.
 
 This will effectively close all connections this handle has used and possibly
 has kept open until now. Don't call this function if you intend to transfer

docs/libcurl/curl_easy_duphandle.3

@@ -7,27 +7,25 @@
 curl_easy_duphandle - Clone a libcurl session handle
 .SH SYNOPSIS
 .B #include <curl/curl.h>
-.sp
+
 .BI "CURL *curl_easy_duphandle(CURL *"handle ");"
-.ad
+
 .SH DESCRIPTION
 This function will return a new curl handle, a duplicate, using all the
 options previously set in the input curl \fIhandle\fP. Both handles can
 subsequently be used independently and they must both be freed with
-\fIcurl_easy_cleanup()\fP.
+\fIcurl_easy_cleanup(3)\fP.
 
 All strings that the input handle has been told to point to (as opposed to
-copy) with previous calls to \fIcurl_easy_setopt\fP using char * inputs, will
-be pointed to by the new handle as well. You must therefore make sure to keep
-the data around until both handles have been cleaned up.
+copy) with previous calls to \fIcurl_easy_setopt(3)\fP using char * inputs,
+will be pointed to by the new handle as well. You must therefore make sure to
+keep the data around until both handles have been cleaned up.
 
 The new handle will \fBnot\fP inherit any state information, no connections,
 no SSL sessions and no cookies.
 
 \fBNote\fP that even in multi-threaded programs, this function must be called
 in a synchronous way, the input handle may not be in use when cloned.
-
-This function was added in libcurl 7.9.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and no valid handle was
 returned.

docs/libcurl/curl_easy_getinfo.3

@@ -4,12 +4,12 @@
 .\"
 .TH curl_easy_getinfo 3 "20 Aug 2003" "libcurl 7.10.8" "libcurl Manual"
 .SH NAME
-curl_easy_getinfo - Extract information from a curl session (added in 7.4)
+curl_easy_getinfo - extract information from a curl handle
 .SH SYNOPSIS
 .B #include <curl/curl.h>
-.sp
-.BI "CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... );"
-.ad
+
+.B "CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... );"
+
 .SH DESCRIPTION
 Request internal information from the curl session with this function.  The
 third argument
@@ -21,112 +21,94 @@ 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.
 .SH AVAILABLE INFORMATION
 These are informations that can be extracted:
-.TP 0.8i
-.B CURLINFO_EFFECTIVE_URL
+.IP CURLINFO_EFFECTIVE_URL
 Pass a pointer to a 'char *' to receive the last used effective URL.
-.TP
-.B CURLINFO_RESPONSE_CODE
+.IP CURLINFO_RESPONSE_CODE
 Pass a pointer to a long to receive the last received HTTP or FTP code. This
 option was known as CURLINFO_HTTP_CODE in libcurl 7.10.7 and earlier.
-.TP
-.B CURLINFO_FILETIME
+.IP CURLINFO_FILETIME
 Pass a pointer to a long to receive the remote time of the retrieved
 document. If you get -1, it can be because of many reasons (unknown, the
 server hides it or the server doesn't support the command that tells document
 time etc) and the time of the document is unknown. Note that you must tell the
 server to collect this information before the transfer is made, by using the
 CURLOPT_FILETIME option to \fIcurl_easy_setopt(3)\fP. (Added in 7.5)
-.TP
-.B CURLINFO_TOTAL_TIME
+.IP CURLINFO_TOTAL_TIME
 Pass a pointer to a double to receive the total transaction time in seconds
 for the previous transfer. This time does not include the connect time, so if
 you want the complete operation time, you should add the
 CURLINFO_CONNECT_TIME.
-.TP
-.B CURLINFO_NAMELOOKUP_TIME
+.IP CURLINFO_NAMELOOKUP_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the name resolving was completed.
-.TP
-.B CURLINFO_CONNECT_TIME
+.IP CURLINFO_CONNECT_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the connect to the remote host (or proxy) was completed.
-.TP
-.B CURLINFO_PRETRANSFER_TIME
+.IP CURLINFO_PRETRANSFER_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the file transfer is just about to begin. This includes all
 pre-transfer commands and negotiations that are specific to the particular
 protocol(s) involved.
-.TP
-.B CURLINFO_STARTTRANSFER_TIME
+.IP CURLINFO_STARTTRANSFER_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the first byte is just about to be transfered. This includes
 CURLINFO_PRETRANSFER_TIME and also the time the server needs to calculate
 the result.
-.TP
-.B CURLINFO_REDIRECT_TIME
+.IP CURLINFO_REDIRECT_TIME
 Pass a pointer to a double to receive the total time, in seconds, it took for
 all redirection steps include name lookup, connect, pretransfer and transfer
 before final transaction was started. CURLINFO_REDIRECT_TIME contains the
 complete execution time for multiple redirections.  (Added in 7.9.7)
-.TP
-.B CURLINFO_REDIRECT_COUNT
+.IP CURLINFO_REDIRECT_COUNT
 Pass a pointer to a long to receive the total number of redirections that were
 actually followed.  (Added in 7.9.7)
-.TP
-.B CURLINFO_SIZE_UPLOAD
+.IP CURLINFO_SIZE_UPLOAD
 Pass a pointer to a double to receive the total amount of bytes that were
 uploaded.
-.TP
-.B CURLINFO_SIZE_DOWNLOAD
+.IP CURLINFO_SIZE_DOWNLOAD
 Pass a pointer to a double to receive the total amount of bytes that were
 downloaded. The amount is only for the latest transfer and will be reset again
 for each new transfer.
-.TP
-.B CURLINFO_SPEED_DOWNLOAD
+.IP CURLINFO_SPEED_DOWNLOAD
 Pass a pointer to a double to receive the average download speed that curl
 measured for the complete download.
-.TP
-.B CURLINFO_SPEED_UPLOAD
+.IP CURLINFO_SPEED_UPLOAD
 Pass a pointer to a double to receive the average upload speed that curl
 measured for the complete upload.
-.TP
-.B CURLINFO_HEADER_SIZE
+.IP CURLINFO_HEADER_SIZE
 Pass a pointer to a long to receive the total size of all the headers
 received.
-.TP
-.B CURLINFO_REQUEST_SIZE
+.IP CURLINFO_REQUEST_SIZE
 Pass a pointer to a long to receive the total size of the issued
 requests. This is so far only for HTTP requests. Note that this may be more
 than one request if FOLLOWLOCATION is true.
-.TP
-.B CURLINFO_SSL_VERIFYRESULT
+.IP CURLINFO_SSL_VERIFYRESULT
 Pass a pointer to a long to receive the result of the certification
 verification that was requested (using the CURLOPT_SSL_VERIFYPEER option to
-curl_easy_setopt). (Added in 7.4.2)
-.TP
-.B CURLINFO_CONTENT_LENGTH_DOWNLOAD
+\fIcurl_easy_setopt(3)\fP).
+.IP CURLINFO_CONTENT_LENGTH_DOWNLOAD
 Pass a pointer to a double to receive the content-length of the download. This
-is the value read from the Content-Length: field.  (Added in 7.6.1)
-.TP
-.B CURLINFO_CONTENT_LENGTH_UPLOAD
+is the value read from the Content-Length: field.
+.IP CURLINFO_CONTENT_LENGTH_UPLOAD
 Pass a pointer to a double to receive the specified size of the upload.
-(Added in 7.6.1)
-.TP
-.B CURLINFO_CONTENT_TYPE
+.IP CURLINFO_CONTENT_TYPE
 Pass a pointer to a 'char *' to receive the content-type of the downloaded
 object. This is the value read from the Content-Type: field. If you get NULL,
 it means that the server didn't send a valid Content-Type header or that the
-protocol used doesn't support this.  (Added in 7.9.4)
-.TP
-.B CURLINFO_PRIVATE
+protocol used doesn't support this.
+.IP CURLINFO_PRIVATE
 Pass a pointer to a 'char *' to receive the pointer to the private data
-associated with the curl handle (set with the CURLOPT_PRIVATE option to curl_easy_setopt).
-(Added in 7.10.3)
-.PP
+associated with the curl handle (set with the CURLOPT_PRIVATE option to
+\fIcurl_easy_setopt(3)\fP). (Added in 7.10.3)
+.IP CURLINFO_HTTPAUTH_AVAIL
+Pass a pointer to a long to receive a bitmask indicating the authentication
+method(s) available. The meaning of the bits is explained in the
+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 athentication.  (Added in 7.10.8)
 .SH RETURN VALUE
 If the operation was successful, CURLE_OK is returned. Otherwise an
 appropriate error code will be returned.
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3)"
-.SH BUGS
-Surely there are some, you tell me!

docs/libcurl/curl_easy_init.3

@@ -7,14 +7,14 @@
 curl_easy_init - Start a libcurl easy session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
-.sp
+
 .BI "CURL *curl_easy_init( );"
-.ad
+
 .SH DESCRIPTION
 This function must be the first function to call, and it returns a CURL easy
 handle that you must use as input to other easy-functions. curl_easy_init
-intializes curl and this call MUST have a corresponding call to
-\fIcurl_easy_cleanup\fP when the operation is complete.
+intializes curl and this call \fBMUST\fP have a corresponding call to
+\fIcurl_easy_cleanup(3)\fP when the operation is complete.
 
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and you cannot use the

docs/libcurl/curl_easy_perform.3

@@ -8,31 +8,26 @@ curl_easy_perform - Perform a file transfer
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "CURLcode curl_easy_perform(CURL *" handle ");
+.BI "CURLcode curl_easy_perform(CURL *" handle ");"
 .ad
 .SH DESCRIPTION
-This function is called after the init and all the curl_easy_setopt() calls
-are made, and will perform the transfer as described in the options.
-It must be called with the same
+This function is called after the init and all the \fIcurl_easy_setopt(3)\fP
+calls are made, and will perform the transfer as described in the options.  It
+must be called with the same
 .I handle
 as input as the curl_easy_init call returned.
 
-libcurl version 7.7 or later (for older versions see below): You can do any
-amount of calls to curl_easy_perform() while using the same handle. If you
-intend to transfer more than one file, you are even encouraged to do
-so. libcurl will then attempt to re-use the same connection for the following
-transfers, thus making the operations faster, less CPU intense and using less
-network resources. Just note that you will have to use
-.I curl_easy_setopt
-between the invokes to set options for the following curl_easy_perform.
+You can do any amount of calls to \fIcurl_easy_perform(3)\fP while using the
+same handle. If you intend to transfer more than one file, you are even
+encouraged to do so. libcurl will then attempt to re-use the same connection
+for the following transfers, thus making the operations faster, less CPU
+intense and using less network resources. Just note that you will have to use
+\fIcurl_easy_setopt(3)\fP between the invokes to set options for the following
+curl_easy_perform.
 
 You must never call this function simultaneously from two places using the
 same handle. Let the function return first before invoking it another time. If
 you want parallel transfers, you must use several curl handles.
-
-Before libcurl version 7.7: You are only allowed to call this function once
-using the same handle. If you want to do repeated calls, you must call
-curl_easy_cleanup and curl_easy_init again first.
 .SH RETURN VALUE
 0 means everything was ok, non-zero means an error occurred as
 .I <curl/curl.h>
@@ -42,5 +37,4 @@ there will be a readable error message in the error buffer when non-zero is
 returned.
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), " curl_easy_setopt "(3), "
-.SH BUGS
-Surely there are some, you tell me!
+

docs/libcurl/curl_escape.3

@@ -23,4 +23,4 @@ You must curl_free() the returned string when you're done with it.
 .SH RETURN VALUE
 A pointer to a zero terminated string or NULL if it failed.
 .SH "SEE ALSO"
-.I curl_unescape(), curl_free(), RFC 2396
+.BR curl_unescape(3), curl_free(3), RFC 2396

docs/libcurl/curl_formadd.3

@@ -8,8 +8,8 @@ curl_formadd - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "CURLFORMcode curl_formadd(struct HttpPost ** " firstitem,
-.BI "struct HttpPost ** " lastitem, " ...);"
+.BI "CURLFORMcode curl_formadd(struct curl_httppost ** " firstitem,
+.BI "struct curl_httppost ** " lastitem, " ...);"
 .ad
 .SH DESCRIPTION
 curl_formadd() is used to append sections when building a multipart/formdata
@@ -92,8 +92,8 @@ name field in the content header.
 .B CURLFORM_BUFFERPTR
 followed by a pointer to a data area, tells libcurl the address of the buffer
 containing data to upload (as indicated with \fICURLFORM_BUFFER\fP). The
-buffer containing this data must not be freed until after curl_easy_cleanup is
-called.
+buffer containing this data must not be freed until after
+\fIcurl_easy_cleanup(3)\fP is called.
 
 .B CURLFORM_BUFFERLENGTH
 followed by a long with the size of the \fICURLFORM_BUFFERPTR\fP data area,
@@ -114,9 +114,9 @@ of headers to those libcurl automatically generates. The list must exist while
 the POST occurs, if you free it before the post completes you may experience
 problems.
 
-When you've passed the HttpPost pointer to \fIcurl_easy_setopt\fP (using the
-\fICURLOPT_HTTPPOST\fP option), you must not free the list until after you've
-called \fIcurl_easy_cleanup\fP for the curl handle.
+When you've passed the HttpPost pointer to \fIcurl_easy_setopt(3)\fP (using
+the \fICURLOPT_HTTPPOST\fP option), you must not free the list until after
+you've called \fIcurl_easy_cleanup(3)\fP for the curl handle.
 
 See example below.
 .SH RETURN VALUE
@@ -207,6 +207,3 @@ defines.
 .BR curl_easy_setopt "(3), "
 .BR curl_formparse "(3) [deprecated], "
 .BR curl_formfree "(3)"
-.SH BUGS
-Surely there are some, you tell me!
-

docs/libcurl/curl_formfree.3

@@ -8,20 +8,13 @@ curl_formfree - free a previously build multipart/formdata HTTP POST chain
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "void curl_formfree(struct HttpPost *" form);
+.BI "void curl_formfree(struct curl_httppost *" form);
 .ad
 .SH DESCRIPTION
 curl_formfree() is used to clean up data previously built/appended with
-curl_formadd()/curl_formparse(). This must be called when the data has
-been used, which typically means after the curl_easy_perform() has
-been called.
+\fIcurl_formadd(3)\fP. This must be called when the data has been used, which
+typically means after the \fIcurl_easy_perform(3)\fP has been called.
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
-.BR curl_formparse "(3) [deprecated], "
 .BR curl_formadd "(3) "
-.SH BUGS
-libcurl 7.7.1 and earlier versions does not allow a NULL pointer to be used as
-argument.
-
-

docs/libcurl/curl_free.3

@@ -11,7 +11,8 @@ curl_free - reclaim memory that has been obtained through a libcurl call
 .BI "void curl_free( char *" ptr " );"
 .ad
 .SH DESCRIPTION
-curl_free reclaims memory that has been obtained through a libcurl call. 
-Use curl_free() instead of free() to avoid anomalies that can result from differences in memory management between your application and libcurl.
+curl_free reclaims memory that has been obtained through a libcurl call.  Use
+curl_free() instead of free() to avoid anomalies that can result from
+differences in memory management between your application and libcurl.
 .SH "SEE ALSO"
-.I curl_unescape()
+.I curl_unescape(3)

docs/libcurl/curl_getdate.3

@@ -74,7 +74,7 @@ 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.
+
+It has been modified extensively since imported to curl.
 .SH "SEE ALSO"
-.BR 
-.SH BUGS
-Surely there are some, you tell me!
+.BR GNU date(1)

docs/libcurl/curl_getenv.3

@@ -8,7 +8,7 @@ curl_getenv - return value for environment name
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "char *curl_getenv(const char *" name ");
+.BI "char *curl_getenv(const char *" name ");"
 .ad
 .SH DESCRIPTION
 curl_getenv() is a portable wrapper for the getenv() function, meant to
@@ -18,7 +18,7 @@ systems libcurl builds on (including win32).
 If successful, curl_getenv() returns a pointer to the value of the specified
 environment. The memory it refers to is malloc()ed why the application must
 free() this when the data has completed to serve its purpose. When
-.I curl_getenv()
+.I curl_getenv(3)
 fails to find the specified name, it returns a null pointer.
 .SH NOTE
 Under unix operating systems, there isn't any point in returning an allocated
@@ -27,6 +27,3 @@ unix implementation thus have to suffer slightly from the drawbacks of other
 systems.
 .SH "SEE ALSO"
 .BR getenv "(3C), "
-.SH BUGS
-Surely there are some, you tell me!
-

docs/libcurl/curl_global_cleanup.3

@@ -4,7 +4,7 @@
 .\"
 .TH curl_global_cleanup 3 "28 May 2001" "libcurl 7.8" "libcurl Manual"
 .SH NAME
-curl_global_cleanup - Global libcurl cleanup
+curl_global_cleanup - global libcurl cleanup
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
@@ -15,13 +15,9 @@ curl_global_cleanup must be called once (no matter how many threads or libcurl
 sessions that'll be used) by every application that uses libcurl, after all
 uses of libcurl is complete.
 
-This is the opposite of \fIcurl_global_init\fP.
+This is the opposite of \fIcurl_global_init(3)\fP.
 
 Not calling this function may result in memory leaks.
-
-This function was added in libcurl 7.8.
 .SH "SEE ALSO"
 .BR curl_global_init "(3), "
-.SH BUGS
-None?
 

docs/libcurl/curl_global_init.3

@@ -14,18 +14,17 @@ curl_global_init - Global libcurl initialisation
 This function should only be called once (no matter how many threads or
 libcurl sessions that'll be used) by every application that uses libcurl.
 
-If this function hasn't been invoked when \fIcurl_easy_init\fP is called, it
-will be done automatically by libcurl.
+If this function hasn't been invoked when \fIcurl_easy_init(3)\fP is called,
+it will be done automatically by libcurl.
 
 The flags option is a bit pattern that tells libcurl exact what features to
 init, as described below. Set the desired bits by ORing the values together.
 
-You must however \fBalways\fP use the \fIcurl_global_cleanup\fP function, as
-that cannot be called automatically for you by libcurl.
+You must however \fBalways\fP use the \fIcurl_global_cleanup(3)\fP function,
+as that cannot be called automatically for you by libcurl.
 
 Calling this function more than once will cause unpredictable results.
 
-This function was added in libcurl 7.8.
 .SH FLAGS
 .TP 5
 .B CURL_GLOBAL_ALL
@@ -35,7 +34,7 @@ Initialize everything possible. This sets all known bits.
 Initialize SSL
 .TP
 .B CURL_GLOBAL_WIN32
-Initialize the Win32 socket libraries. (added in libcurl 7.8.1)
+Initialize the Win32 socket libraries.
 .TP
 .B CURL_GLOBAL_NOTHING
 Initialise nothing extra. This sets no bit.
@@ -44,6 +43,5 @@ If this function returns non-zero, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_global_cleanup "(3), "
-.SH BUGS
-None.
+
 

docs/libcurl/curl_multi_add_handle.3

@@ -9,11 +9,11 @@ curl_multi_add_handle - add an easy handle to a multi session
 CURLMcode curl_multi_add_handle(CURLM *multi_handle, CURL *easy_handle);
 .ad
 .SH DESCRIPTION
-Adds a standard easy handle to the multi stack. This will make this multi
-handle control the specified easy handle.
+Adds a standard easy handle to the multi stack. This function call will make
+this \fImulti_handle\fP control the specified \fIeasy_handle\fP.
 
 When an easy handle has been added to a multi stack, you can not and you must
-not use curl_easy_perform() on that handle!
+not use \fIcurl_easy_perform(3)\fP on that handle!
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code.
 .SH "SEE ALSO"