7.9.8 commit

Added 'dont_check' to be set during an FTP operation if the final status
message is supposed to be ignored.
2002-06-13 14:37:15 +00:00 · 2002-06-13 09:21:08 +00:00 · 2002-06-12 22:05:28 +00:00 · 2002-06-12 22:04:25 +00:00 · 2002-06-12 21:40:59 +00:00 · 2002-06-12 21:40:30 +00:00
225 changed files with 16344 additions and 6562 deletions
--- a/2315
+++ b/2315
--- a/CHANGES.0
+++ b/CHANGES.0
@@ -1,838 +1,3 @@
 Daniel (28 December 1999):
 - Tim Verhoeven correctly identified that curl
   doesn't support URL formatted file names when getting ftp. Now, there's a
   problem with getting very weird file names off FTP servers. RFC 959 defines
   that the file name syntax to use should be the same as in the native OS of
   the server. Since we don't know the peer server system we currently just
   translate the URL syntax into plain letters. It is still better and with
   the solaris 2.6-supplied ftp server it works with spaces in the file names.
 Daniel (27 December 1999):
 - When curl parsed cookies straight off a remote site, it corrupted the input
   data, which, if the downloaded headers were stored made very odd characters
   in the saved data. Correctly identified and reported by Paul Harrington.
 Daniel (13 December 1999):
 - General cleanups in the library interface. There had been some bad kludges
   added during times of stress and I did my best to clean them off. It was
   both regarding the lib API as well as include file confusions.
 Daniel (3 December 1999):
 - A small --stderr bug was reported by Eetu Ojanen...
 - who also brought the suggestion of extending the -X flag to ftp list as
   well. So, now it is and the long option is now --request instead. It is
   only for ftp list for now (and the former http stuff too of course).
 Lars J. Aas (24 November 1999):
 - Patched curl to compile and build under BeOS. Doesn't work yet though!
 - Corrected the Makefile.am files to allow putting object files in
   different directories than the sources.
 Version 6.3.1
 Daniel (23 November 1999):
 - I've had this major disk crash. My good old trust-worthy source disk died
   along with the machine that hosted it. Thank goodness most of all the
   things I've done are either backed up elsewhere or stored in this CVS
   server!
 - Michael S. Steuer pointed out a bug in the -F handling
   that made curl hang if you posted an empty variable such as '-F name='. It
   was one of those old bugs that never have worked properly...
 - Jason Baietto pointed out a general flaw in the HTTP
   download. Curl didn't complain if it was prematurely aborted before the
   entire download was completed. It does now.
 Daniel (19 November 1999):
 - Chris Maltby very accurately criticized the lack of
   return code checks on the fwrite() calls. I did a thorough check for all
   occurrences and corrected this.
 Daniel (17 November 1999):
 - Paul Harrington pointed out that the -m/--max-time option
   doesn't work for the slow system calls like gethostbyname()... I don't have
   any good fix yet, just a slightly less bad one that makes curl exit hard
   when the timeout is reached.
 - Bjorn Reese helped me point out a possible problem that might be the reason
   why Thomas Hurst experience problems in his Amiga version.
 Daniel (12 November 1999):
 - I found a crash in the new cookie file parser. It crashed when you gave
   a plain http header file as input...
 Version 6.3
 Daniel (10 November 1999):
 - I kind of found out that the HTTP time-conditional GETs (-z) aren't always
   respected by the web server and the document is therefore sent in whole
   again, even though it doesn't match the requested condition. After reading
   section 13.3.4 of RFC 2616, I think I'm doing the right thing now when I do
   my own check as well. If curl thinks the condition isn't met, the transfer
   is aborted prematurely (after all the headers have been received).
 - After comments from Robert Linden I also rewrote some parts of the man page
   to better describe how the -F works.
 - Michael Anti put up a new curl download mirror in
   China:  http://www.pshowing.com/curl/
 - I added the list of download mirrors to the README file
 - I did add more explanations to the man page
 Daniel (8 November 1999):
 - I made the -b/--cookie option capable of reading netscape formatted cookie
   files as well as normal http-header files. It should be able to
   transparently figure out what kind of file it got as input.
 Daniel (29 October 1999):
 - Another one of Sebastiaan van Erk's ideas (that has been requested before
   but I seem to have forgotten who it was), is to add support for ranges in
   FTP downloads. As usual, one request is just a request, when they're two
   it is a demand. I've added simple support for X-Y style fetches. X has to
   be the lower number, though you may omit one of the numbers. Use the -r/
   --range switch (previously HTTP-only).
 - Sebastiaan van Erk suggested that curl should be
   able to show the file size of a specified file. I think this is a splendid
   idea and the -I flag is now working for FTP. It displays the file size in
   this manner:
        Content-Length: XXXX
   As it resembles normal headers, and leaves us the opportunity to add more
   info in that display if we can come up with more in the future! It also
   makes sense since if you access ftp through a HTTP proxy, you'd get the
   file size the same way.
   I changed the order of the QUOTE command executions. They're now executed
   just after the login and before any other command. I made this to enable
   quote commands to run before the -I stuff is done too.
 - I found out that -D/--dump-header and -V/--version weren't documented in
   the man page.
 - Many HTTP/1.1 servers do not support ranges. Don't ask me why. I did add
   some text about this in the man page for the range option. The thread in
   the mailing list that started this was initiated by Michael Anti.
 - I get reports about nroff crashes on solaris 2.6+ when displaying the curl
   man page. Switch to gnroff instead, it is reported to work(!). Adam Barclay
   reported and brought the suggestion.
 - In a dialogue with Johannes G. Kristinsson we came
   up with the idea to let -H/--header specified headers replace the
   internally generated headers, if you happened to select to add a header
   that curl normally uses by itself. The advantage with this is not entirely
   obvious, but in Johannes' case it means that he can use another Host: than
   the one curl would set.
 Daniel (27 October 1999):
 - Jongki Suwandi brought a nice patch for (yet another) crash when following
   a location:. This time you had to follow a https:// server's redirect to
   get the core.
 Version 6.2
 Daniel (21 October 1999):
 - I think I managed to remove the suspicious (nil) that has been seen just
   before the "Host:" in HTTP requests when -v was used.
 - I found out that if you followed a location: when using a proxy, without
   having specified http:// in the URL, the protocol part was added once again
   when moving to the next URL! (The protocol part has to be added to the
   URL when going through a proxy since it has no protocol-guessing system
   such as curl has.)
 - Benjamin Ritcey reported a core dump under solaris 2.6
   with OpenSSL 0.9.4. It turned out this was due to a bad free() in main.c
   that occurred after the download was done and completed.
 - Benjamin found ftp downloads to show the first line of the download meter
   to get written twice, and I removed that problem. It was introduced with
   the multiple URL support.
 - Dan Zitter correctly pointed out that curl 6.1 and earlier versions didn't
   honor RFC 2616 chapter 4 section 2, "Message Headers": "...Field names are
   case-insensitive..."  HTTP header parsing assumed a certain casing. Dan
   also provided me with a patch that corrected this, which I took the liberty
   of editing slightly.
 - Dan Zitter also provided a nice patch for config.guess to better recognize
   the Mac OS X
 - Dan also corrected a minor problem in the lib/Makefile that caused linking
   to fail on OS X.
 Daniel (19 October 1999):
 - Len Marinaccio came up with some problems with curl.  Since Windows has a
   crippled shell, it can't redirect stderr and that causes trouble. I added
   --stderr today which allows the user to redirect the stderr stream to a
   file or stdout.
 Daniel (18 October 1999):
 - The configure script now understands the '--without-ssl' flag, which now
   totally disable SSL/https support. Previously it wasn't possible to force
   the configure script to leave SSL alone. The previous functionality has
   been retained. Troy Engel helped test this new one.
 Version 6.1
 Daniel (17 October 1999):
 - I ifdef'ed or commented all the zlib stuff in the sources and configure
   script. It turned out we needed to mock more with zlib than I initially
   thought, to make it capable of downloading compressed HTTP documents and
   uncompress them on the fly. I didn't mean the zlib parts of curl to become
   more than minor so this means I halt the zlib expedition for now and wait
   until someone either writes the code or zlib gets updated and better
   adjusted for this kind of usage.  I won't get into details here, but a
   short a summary is suitable:
   - zlib can't automatically detect whether to use zlib or gzip
     decompression methods.
   - zlib is very neat for reading gzipped files from a file descriptor,
     although not as nice for reading buffer-based data such as we would
     want it.
   - there are still some problems with the win32 version when reading from
     a file descriptor if that is a socket
 Daniel (14 October 1999):
 - Moved the (external) include files for libcurl into a subdirectory named
   curl and adjusted all #include lines to use <curl/XXXX> to maintain a
   better name space and control of the headers. This has been requested.
 Daniel (12 October 1999):
 - I modified the 'maketgz' script to perform a 'make' too before a release
   archive is put together in an attempt to make the time stamps better and
   hopefully avoid the double configure-running that use to occur.
 Daniel (11 October 1999):
 - Applied J<>rn's patches that fixes zlib for mingw32 compiles as well as
   some other missing zlib #ifdef and more text on the multiple URL docs in
   the man page.
 Version 6.1beta
 Daniel (6 October 1999):
 - Douglas E. Wegscheid sent me a patch that made the exact same thing as I
   just made: the -d switch is now capable of reading post data from a named
   file or stdin.  Use it similarly to the -F. To read the post data from a
   given file:
        curl -d @path/to/filename www.postsite.com
   or let curl read it out from stdin:
        curl -d @- www.postit.com
 J<>rn Hartroth (3 October 1999):
 - Brought some more patches for multiple URL functionality. The MIME
   separation ideas are almost scrapped now, and a custom separator is being
   used instead. This is still compile-time "flagged".
 Daniel
 - Updated curl.1 with multiple URL info.
 Daniel (30 September 1999):
 - Felix von Leitner brought openssl-check fixes for configure.in to work
   out-of-the-box when the openssl files are installed in the system default
   dirs.
 Daniel (28 September 1999)
 - Added libz functionality. This should enable decompressing gzip, compress
   or deflate encoding HTTP documents. It also makes curl send an accept that
   it accepts that kind of encoding. Compressed contents usually shortens
   download time. I *need* someone to tell me a site that uses compressed HTTP
   documents so that I can test this out properly.
 - As a result of the adding of zlib awareness, I changed the version string
   a little. I plan to add openldap version reporting in there too.
 Daniel (17 September 1999)
 - Made the -F option allow stdin when specifying files. By using '-' instead
   of file name, the data will be read from stdin.
 Version 6.0
 Daniel (13 September 1999)
 - Added -X/--http-request <request> to enable any HTTP command to be sent.
   Do not that your server has to support the exact string you enter. This
   should possibly a string like DELETE or TRACE.
 - Applied Douglas' mingw32-fixes for the makefiles.
 Daniel (10 September 1999)
 - Douglas E. Wegscheid pointed out a problem. Curl didn't check the FTP
   servers return code properly after the --quote commands were issued. It
   took anything non 200 as an error, when all 2XX codes should be accepted as
   OK.
 - Sending cookies to the same site in multiple lines like curl used to do
   turned out to be bad and breaking the cookie specs. Curl now sends all
   cookies on a single Cookie: line. Curl is not yet RFC 2109 compliant, but I
   doubt that many servers do use that syntax (yet).
 Daniel (8 September 1999)
 - J<>rn helped me make sure it still compiles nicely with mingw32 under win32.
 Daniel (7 September 1999)
 - FTP upload through proxy is now turned into a HTTP PUT. Requested by
   Stefan Kanthak.
 - Added the ldap files to the .m32 makefile.
 Daniel (3 September 1999)
 - Made cookie matching work while using HTTP proxy.
 Bjorn Reese (31 August 1999)
 - Passed his ldap:// patch. Note that this requires the openldap shared
   library to be installed and that LD_LIBRARY_PATH points to the
   directory where the lib will be found when curl is run with a
   ldap:// URL.
 J<>rn Hartroth (31 August 1999)
 - Made the Mingw32 makefiles into single files.
 - Made file:// work for Win32. The same code is now used for unix as well for
   performance reasons.
 Douglas E. Wegscheid (30 August 1999)
 - Patched the Mingw32 makefiles for SSL builds.
 Matthew Clarke (30 August 1999)
 - Made a cool patch for configure.in to allow --with-ssl to specify the
   root dir of the openssl installation, as in
        ./configure --with-ssl=/usr/ssl_here
 - Corrected the 'reconf' script to work better with some shells.
 J<>rn Hartroth (26 August 1999)
 - Fixed the Mingw32 makefiles in lib/ and corrected the file.c for win32
   compiles.
 Version 5.11
 Daniel (25 August 1999)
 - John Weismiller pointed out a bug in the header-line
   realloc() system in download.c.
 - I added lib/file.[ch] to offer a first, simple, file:// support. It
   probably won't do much good on win32 system at this point, but I see it
   as a start.
 - Made the release archives get a Makefile in the root dir, which can be
   used to start the compiling/building process easier. I haven't really
   changed any INSTALL text yet, I wanted to get some feed-back on this
   first.
 Daniel (17 August 1999)
 - Another Location: bug. Curl didn't do proper relative locations if the
   original URL had cgi-parameters that contained a slash. Nusu's page
   again.
 - Corrected the NO_PROXY usage. It is a list of substrings that if one of
   them matches the tail of the host name it should connect to, curl should
   not use a proxy to connect there. Pointed out to me by Douglas
   E. Wegscheid.  I also changed the README text a little regarding this.
 Daniel (16 August 1999)
 - Fixed a memory bug with http-servers that sent Location: to a Location:
   page. Nusu's page showed this too.
 - Made cookies work a lot better. Setting the same cookie name several times
   used to add more cookies instead of replacing the former one which it
   should've. Nusu <nus at intergorj.ro> brought me an URL that made this
   painfully visible...
 Troy (15 August 1999)
 - Brought new .spec files as well as a patch for configure.in that lets the
   configure script find the openssl files better, even when the include
   files are in /usr/include/openssl
 Version 5.10
 Daniel (13 August 1999)
 - SSL_CTX_set_default_passwd_cb() has been modified in the 0.9.4 version of
   OpenSSL. Now why couldn't they simply add a *new* function instead of
   modifying the parameters of an already existing function? This way, we get
   a compiler warning if compiling with 0.9.4 but not with earlier. So, I had
   to come up with a #if construction that deals with this...
 - Made curl output the SSL version number get displayed properly with 0.9.4.
 Troy (12 August 1999)
 - Added MingW32 (GCC-2.95) support under Win32. The INSTALL file was also
   a bit rearranged.
 Daniel (12 August 1999)
 - I had to copy a good <arpa/telnet.h> include file into the curl source
   tree to enable the silly win32 systems to compile. The distribution rights
   allows us to do that as long as the file remains unmodified.
 - I corrected a few minor things that made the compiler complain when
   -Wall -pedantic was used.
 - I'm moving the official curl web page to http://curl.haxx.nu. I think it
   will make it easier to remember as it is a lot shorter and less cryptic.
   The old one still works and shows the same info.
 Daniel (11 August 1999)
 - Albert Chin-A-Young mailed me another correction for NROFF in the
   configure.in that is supposed to be better for IRIX users.
 Daniel (10 August 1999)
 - Albert Chin-A-Young helped me with some stupid Makefile things, as well as
   some fiddling with the getdate.c stuff that he had problems with under
   HP-UX v10. getdate.y will now be compiled into getdate.c if the appropriate
   yacc or bison is found by the configure script. Since this is slightly new,
   we need to test the output getdate.c with win32 systems to make sure it
   still compiles there.
 Daniel (5 August 1999)
 - I've just setup a new mailing list with the intention to keep discussions
   around libcurl development in it. I mainly expect it to be for thoughts and
   brainstorming around a "next generation" library, rather than nitpicking
   about the current implementation or details in the current libcurl.
   To join our happy bunch of future-looking geeks, enter 'subscribe
   <address>' in the body of a mail and send it to
   libcurl-request@listserv.fts.frontec.se.  Curl bug reports, the usual curl
   talk and everything else should still be kept in this mailing list. I've
   started to archive this mailing list and have put the libcurl web page at
   www.fts.frontec.se/~dast/libcurl/.
 - Stefan Kanthak contacted me regarding a few problems in the configure
   script which he discovered when trying to make curl compile and build under
   Siemens SINIX-Z V5.42B2004!
 - Marcus Klein very accurately informed me that src/version.h was not present
   in the CVS repository. Oh, how silly...
 - Linus Nielsen rewrote the telnet:// part and now curl offers limited telnet
   support. If you run curl like 'curl telnet://host' you'll get all output on
   the screen and curl will read input from stdin. You'll be able to login and
   run commands etc, but since the output is buffered, expect to get a little
   weird output.
   This is still in its infancy and it might get changed. We need your
   feed-back and input in how this is best done.
   WIN32 NOTE: I bet we'll get problems when trying to compile the current
   lib/telnet.c on win32, but I think we can sort them out in time.
 - David Sanderson reported that FORCE_ALLOCA_H or HAVE_ALLOCA_H must be
   defined for getdate.c to compile properly on HP-UX 11.0. I updated the
   configure script to check for alloca.h which should make it.
 Daniel (4 August 1999)
 - I finally got to understand Marcus Klein's ftp download resume problem,
   which turns out to be due to different outputs from different ftp
   servers. It makes ftp download resuming a little trickier, but I've made
   some modifications I really believe will work for most ftp servers and I do
   hope you report if you have problems with this!
 - Added text about file transfer resuming to README.curl.
 Daniel (2 August 1999)
 - Applied a progress-bar patch from Lars J. Aas. It offers
   a new styled progress bar enabled with -#/--progress-bar. 
 T. Yamada <tai at imasy.or.jp> (30 July 1999)
 - It breaks with segfault when 1) curl is using .netrc to obtain
   username/password (option '-n'), and 2) is automatically redirected to
   another location (option '-L').
   There is a small bug in lib/url.c (block starting from line 641), which
   tries to take out username/password from user- supplied command-line
   argument ('-u' option). This block is never executed on first attempt since
   CONF_USERPWD bit isn't set at first, but curl later turns it on when it
   checks for CONF_NETRC bit. So when curl tries to redo everything due to
   redirection, it segfaults trying to access *data->userpwd.
 Version 5.9.1
 Daniel (30 July 1999)
 - Steve Walch pointed out that there is a memory leak in the formdata
   functions. I added a FormFree() function that is now used and supposed to
   correct this flaw.
 - Mark Wotton reported:
   'curl -L https://www.cwa.com.au/' core dumps.  I managed to cure this by
   correcting the cleanup procedure. The bug seems to be gone with my OpenSSL
   0.9.2b, although still occurs when I run the ~100 years old SSLeay 0.8.0. I
   don't know whether it is curl or SSLeay that is to blame for that.
 - Marcus Klein:
   Reported an FTP upload resume bug that I really can't repeat nor understand.
   I leave it here so that it won't be forgotten.
 Daniel (29 July 1999)
 - Costya Shulyupin suggested support for longer URLs when following Location:
   and I could only agree and fix it!
 - Leigh Purdie found a problem in the upload/POST department. It turned out
   that http.c accidentaly cleared the pointer instead of the byte counter
   when supposed to.
 - Costya Shulyupin pointed out a problem with port numbers and Location:. If
   you had a server at a non-standard port that redirected to an URL using a
   standard port number, curl still used that first port number.
 - Ralph Beckmann pointed out a problem when using both CONF_FOLLOWLOCATION
   and CONF_FAILONERROR simultaneously. Since the CONF_FAILONERROR exits on
   the 302-code that the follow location header outputs it will never show any
   html on location: pages. I have now made it look for >=400 codes if
   CONF_FOLLOWLOCATION is set.
 - 'struct slist' is now renamed to 'struct curl_slist' (as suggested by Ralph
   Beckmann).
 - Joshua Swink and Rick Welykochy were the first to point out to me that the
   latest OpenSSL package now have moved the standard include path. It is now
   in /usr/local/ssl/include/openssl and I have now modified the --enable-ssl
   option for the configure script to use that as the primary path, and I
   leave the former path too to work with older packages of OpenSSL too.
 Daniel (9 June 1999)
 - I finally understood the IRIX problem and now it seem to compile on it!
   I am gonna remove those #define strcasecmp() things once and for all now.
 Daniel (4 June 1999)
 - I adjusted the FTP reply 227 parser to make the PASV command work better
   with more ftp servers. Appearantly the Roxen Challanger server replied
   something curl 5.9 could deal with! :-( Reported by Ashley Reid-Montanaro
   and Mark Butler brought a solution for it.
 Daniel (26 May 1999)
 - Rearranged. README is new, the old one is now README.curl and I added a
   README.libcurl with text I got from Ralph Beckmann.
 - I also updated the INSTALL text.
 Daniel (25 May 1999)
 - David Jonathan Lowsky correctly pointed out that curl didn't properly deal
   with form posting where the variable shouldn't have any content, as in curl
   -F "form=" www.site.com. It was now fixed.
 Version 5.9
 Daniel (22 May 1999)
 - I've got a bug report from Aaron Scarisbrick in which he states he has some
   problems with -L under FreeBSD 3.0. I have previously got another bug
   report from Stefan Grether which points at an error with similar sympthoms
   when using win32. I made the allocation of the new url string a bit faster
   and different, don't know if it actually improves anything though...
 Daniel (20 May 1999)
 - Made the cookie parser deal with CRLF newlines too.
 Daniel (19 May 1999)
 - Download() didn't properly deal with failing return codes from the sread()
   function. Adam Coyne found the problem in the win32 version, and Troy Engel
   helped me out isolating it.
 Daniel (16 May 1999)
 - Richard Adams pointed out a bug I introduced in 5.8. --dump-header doesn't
   work anymore! :-/ I fixed it now.
 - After a suggestion by Joshua Swink I added -S / --show-error to force curl
   to display the error message in case of an error, even if -s/--silent was
   used.
 Daniel (10 May 1999)
 - I moved the stuff concerning HTTP, DICT and TELNET it their own source
   files now. It is a beginning on my clean-up of the sources to make them
   layer all those protocols better to enable more to be added easier in the
   future!
 - Leon Breedt sent me some files I've not put into the main curl
   archive. They're for creating the Debian package thingie. He also sent me a
   debian package that I've made available for download at the web page
 Daniel (9 May 1999)
 - Made it compile on cygwin too.
 Troy Engel (7 May 1999)
 - Brought a series of patches to allow curl to compile smoothly on MSVC++ 6
   again!
 Daniel (6 May 1999)
 - I changed the #ifdef HAVE_STRFTIME placement for the -z code so that it
   will be easier to discover systems that don't have that function and thus
   can't use -z successfully. Made the strftime() get used if WIN32 is defined
   too.
 Version 5.8
 Daniel (5 May 1999)
 - I've had it with this autoconf/automake mess. It seems to work allright
   for most people who don't have automake installed, but for those who have
   there are problems all over.
   I've got like five different bug reports on this only the last
   week... Claudio Neves and Federico Bianchi and root <duggerj001 at
   hawaii.rr.com> are some of them reporting this.
   Currently, I have no really good fix since I want to use automake myself to
   generate the Makefile.in files. I've found out that the @SHELL@-problems
   can often be fixed by manually invoking 'automake' in the archive root
   before you run ./configure... I've hacked my maketgz script now to fiddle
   a bit with this and my tests seem to work better than before at least!
 Daniel (4 May 1999)
 - mkhelp.pl has been doing badly lately. I corrected a case problem in
   the regexes.
 - I've now remade the -o option to not touch the file unless it needs to.
   I had to do this to make -z option really fine, since now you can make a
   curl fetch and use a local copy's time when downloading to that file, as
   in:
        curl -z dump -o dump remote.site.com/file.html
   This will only get the file if the remote one is newer than the local.
   I'm aware that this alters previous behaviour a little. Some scripts out
   there may depend on that the file is always touched...
 - Corrected a bug in the SSLv2/v3 selection.
 - Felix von Leitner requested that curl should be able to send
   "If-Modified-Since" headers, which indeed is a fair idea.  I implemented it
   right away! Try -z <expression> where expression is a full GNU date
   expression or a file name to get the date from!
 Stephan Lagerholm (30 Apr 1999)
 - Pointed out a problem with the src/Makefile for FreeBSD. The RM variable
   isn't set and causes the make to fail.
 Daniel (26 April 1999)
 - Am I silly or what? Irving Wolfe pointed out to me that the curl version
   number was not set properly. Hasn't been since 5.6. This was due to a bug
   in my maketgz script!
 David Eriksson (25 Apr 1999)
 - Found a bug in cookies.c that made it crash at times.
 Version 5.7.1
 Doug Kaufman (23 Apr 1999)
 - Brought two sunos 4 fixes. One of them being the hostip.c fix mentioned
   below and the other one a correction in include/stdcheaders.h
 - Added a paragraph about compiling with the US-version of openssl to the
   INSTALL file.
 Daniel
 - New mailing list address. Info updated on the web page as well as in the
   README file
 Greg Onufer (20 Apr 1999)
 - hostip.c didn't compile properly on SunOS 5.5.1.
   It needs an #include <sys/types.h>
 Version 5.7
 Daniel (Apr 20 1999)
 - Decided to upload a non-beta version right now!
 - Made curl support any-length HTTP headers. The destination buffer is now
   simply enlarged every time it turns out to be too small!
 - Added the FAQ file to the archive. Still a bit smallish, but it is a
   start.
 Eric Thelin (15 Apr 1999)
 - Made -D accept '-' instead of filename to write to stdout.
 Version 5.6.3beta
 Daniel (Apr 12 1999)
 - Changed two #ifdef WIN32 to better #ifdef <errorcode> when connect()ing
   in url.c and ftp.c. Makes cygwin32 deal with them better too. We should
   try to get some decent win32-replacement there. Anyone?
 - The old -3/--crlf option is now ONLY --crlf!
 - I changed the "SSL fix" to a more lame one, but that doesn't remove as
   much functionality. Now I've enabled the lib to select what SSL version it
   should try first. Appearantly some older SSL-servers don't like when you
   talk v3 with them so you need to be able to force curl to talk v2 from the
   start. The fix dated April 6 and posted on the mailing list forced curl to
   use v2 at all times using a modern OpenSSL version, but we don't really
   want such a crippled solution.
 - Marc Boucher sent me a patch that corrected a math error for the
   "Curr.Speed" progress meter.
 - Eric Thelin sent me a patch that enables '-K -' to read a config file from
   stdin.
 - I found out we didn't close the file properly before so I added it!
 Daniel (Apr 9 1999)
 - Yu Xin pointed out a problem with ftp download resume.  It didn't work at
   all! ;-O
 Daniel (Apr 6 1999)
 - Corrected the version string part generated for the SSL version.
 - I found a way to make some other SSL page work with openssl 0.9.1+ that
   previously didn't (ssleay 0.8.0 works with it though!). Trying to get
   some real info from the OpenSSL guys to see how I should do to behave the
   best way. SSLeay 0.8.0 shouldn't be that much in use anyway these days!
 Version 5.6.2beta
 Daniel (Apr 4 1999)
 - Finally have curl more cookie "aware". Now read carefully. This is how
   it works.
   To make curl read cookies from an already existing file, in plain header-
   format (like from the headers of a previous fetch) invoke curl with the
   -b flag like:
        curl -b file http://site/foo.html
   Curl will then use all cookies it finds matching. The old style that sets
   a single cookie with -b is still supported and is used if the string
   following -b includes a '=' letter, as in "-b name=daniel".
   To make curl read the cookies sent in combination with a location: (which
   sites often do) point curl to read a non-existing file at first (i.e
   to start with no existing cookies), like:
        curl -b nowhere http://site/setcookieandrelocate.html
 - Added a paragraph in the TODO file about the SSL problems recently
   reported. Evidently, some kind of SSL-problem curl may need to address.
 - Better "Location:" following.
 Douglas E. Wegscheid (Tue, 30 Mar 1999)
 - A subsecond display patch.
 Daniel (Mar 14 1999)
 - I've separated the version number of libcurl and curl now. To make
   things a little easier, I decided to start the curl numbering from
   5.6 and the former version number known as "curl" is now the one
   set for libcurl.
 - Removed the 'enable-no-pass' from configure, I doubt anyone wanted
   that.
 - Made lots of tiny adjustments to compile smoothly with cygwin under
   win32. It's a killer for porting this to win32, bye bye VC++! ;-)
   Compiles and builds out-of-the-box now. See the new wordings in
   INSTALL for details.
 - Beginning experiments with downloading multiple document from a http
   server while remaining connected.
 Version 5.6beta
 Daniel (Mar 13 1999)
 - Since I've changed so much, I thought I'd just go ahead and implement the
   suggestion from Douglas E. Wegscheid. -D or --dump-header is now storing
   HTTP headers separately in the specified file.
 - Added new text to INSTALL on what to do to build this on win32 now.
 - Aaargh. I had to take a step back and prefix the shared #include files
   in the sources with "../include/" to please VC++...
 Daniel (Mar 12 1999)
 - Split the url.c source into many tiny sources for better readability
   and smaller size.
 Daniel (Mar 11 1999)
 - Started to change stuff for a move to make libcurl and a more separate
   curl application that uses the libcurl. Made the libcurl sources into
   the new lib directory while the curl application will remain in src as
   before. New makefiles, adjusted configure script and so.
   libcurl.a built quickly and easily. I better make a better interface to
   the lib functions though.
   The new root dir include/ is supposed to contain the public information
   about the new libcurl. It is a little ugly so far :-)
 Daniel (Mar 1 1999)
 - Todd Kaufmann sent me a good link to Netscape's cookie spec as well as the
   info that RFC 2109 specifies how to use them.  The link is now in the
   README and the RFC in the RESOURCES.
 Daniel (Feb 23 1999)
 - Finally made configure accept --with-ssl to look for SSL libs and includes
   in the "standard" place /usr/local/ssl...
 Daniel (Feb 22 1999)
 - Verified that curl linked fine with OpenSSL 0.9.1c which seems to be
   the most recent.
 Henri Gomez (Fri Feb  5 1999)
 - Sent in an updated curl-ssl.spec. I still miss the script that builds an
   RPM automatically...
 Version 5.5.1
 Mark Butler (27 Jan 1999)
 - Corrected problems in Download().
 Danitel Stenberg (25 Jan 1999)
 - Jeremie Petit pointed out a few flaws in the source that prevented it from
   compile warning free with the native compiler under Digital Unix v4.0d.
 Version 5.5
 Daniel Stenberg (15 Jan 1999)
 - Added Bjorns small text to the README about the DICT protocol.
 Daniel Stenberg (11 Jan 1999)
 - <jswink at softcom.net> reported about the win32-versioin: "Doesn't use
   ALL_PROXY environment variable". Turned out to be because of the static-
   buffer nature of the win32 environment variable calls!
 Bjorn Reese (10 Jan 1999)
 - I have attached a simple addition for the DICT protocol (RFC 2229).
   It performs dictionary lookups. The output still needs to be better
   formatted.
   To test it try (the exact format, and more examples are described in
   the RFC)
        dict://dict.org/m:hello
        dict://dict.org/m:hello::soundex
 Vicente Garcia (10 Jan 1999)
 - Corrected the progress meter for files larger than 20MB.
 Daniel Stenberg (7 Jan 1999)
 - Corrected the -t and -T help texts. They claimed to be FTP only.
 Version 5.4
 Daniel Stenberg
 (7 Jan 1999)
 - Irving Wolfe reported that curl -s didn't always supress the progress
   reporting. It was the form post that autoamtically always switched it on
   again. This is now corrected!
 (4 Jan 1999)
 - Andreas Kostyrka suggested I'd add PUT and he helped me out to test it. If
   you use -t or -T now on a http or https server, PUT will be used for file
   upload.
   I removed the former use of -T with HTTP. I doubt anyone ever really used
   that.
 (4 Jan 1999)
 - Erik Jacobsen found a width bug in the mprintf() function.  I corrected it
   now.
 (4 Jan 1999)
 - As John V. Chow pointed out to me, curl accepted very limited URL sizes. It
   should now accept path parts that are up to at least 4096 bytes.
 - Somehow I screwed up when applying the AIX fix from Gilbert Ramirez, so
   I redid that now.
 Version 5.3a (win32 only)
 Troy Engel
--- a/CHANGES.1999
+++ b/CHANGES.1999
@@ -0,0 +1,835 @@
 Daniel (28 December 1999):
 - Tim Verhoeven correctly identified that curl
   doesn't support URL formatted file names when getting ftp. Now, there's a
   problem with getting very weird file names off FTP servers. RFC 959 defines
   that the file name syntax to use should be the same as in the native OS of
   the server. Since we don't know the peer server system we currently just
   translate the URL syntax into plain letters. It is still better and with
   the solaris 2.6-supplied ftp server it works with spaces in the file names.
 Daniel (27 December 1999):
 - When curl parsed cookies straight off a remote site, it corrupted the input
   data, which, if the downloaded headers were stored made very odd characters
   in the saved data. Correctly identified and reported by Paul Harrington.
 Daniel (13 December 1999):
 - General cleanups in the library interface. There had been some bad kludges
   added during times of stress and I did my best to clean them off. It was
   both regarding the lib API as well as include file confusions.
 Daniel (3 December 1999):
 - A small --stderr bug was reported by Eetu Ojanen...
 - who also brought the suggestion of extending the -X flag to ftp list as
   well. So, now it is and the long option is now --request instead. It is
   only for ftp list for now (and the former http stuff too of course).
 Lars J. Aas (24 November 1999):
 - Patched curl to compile and build under BeOS. Doesn't work yet though!
 - Corrected the Makefile.am files to allow putting object files in
   different directories than the sources.
 Version 6.3.1
 Daniel (23 November 1999):
 - I've had this major disk crash. My good old trust-worthy source disk died
   along with the machine that hosted it. Thank goodness most of all the
   things I've done are either backed up elsewhere or stored in this CVS
   server!
 - Michael S. Steuer pointed out a bug in the -F handling
   that made curl hang if you posted an empty variable such as '-F name='. It
   was one of those old bugs that never have worked properly...
 - Jason Baietto pointed out a general flaw in the HTTP
   download. Curl didn't complain if it was prematurely aborted before the
   entire download was completed. It does now.
 Daniel (19 November 1999):
 - Chris Maltby very accurately criticized the lack of
   return code checks on the fwrite() calls. I did a thorough check for all
   occurrences and corrected this.
 Daniel (17 November 1999):
 - Paul Harrington pointed out that the -m/--max-time option
   doesn't work for the slow system calls like gethostbyname()... I don't have
   any good fix yet, just a slightly less bad one that makes curl exit hard
   when the timeout is reached.
 - Bjorn Reese helped me point out a possible problem that might be the reason
   why Thomas Hurst experience problems in his Amiga version.
 Daniel (12 November 1999):
 - I found a crash in the new cookie file parser. It crashed when you gave
   a plain http header file as input...
 Version 6.3
 Daniel (10 November 1999):
 - I kind of found out that the HTTP time-conditional GETs (-z) aren't always
   respected by the web server and the document is therefore sent in whole
   again, even though it doesn't match the requested condition. After reading
   section 13.3.4 of RFC 2616, I think I'm doing the right thing now when I do
   my own check as well. If curl thinks the condition isn't met, the transfer
   is aborted prematurely (after all the headers have been received).
 - After comments from Robert Linden I also rewrote some parts of the man page
   to better describe how the -F works.
 - Michael Anti put up a new curl download mirror in
   China:  http://www.pshowing.com/curl/
 - I added the list of download mirrors to the README file
 - I did add more explanations to the man page
 Daniel (8 November 1999):
 - I made the -b/--cookie option capable of reading netscape formatted cookie
   files as well as normal http-header files. It should be able to
   transparently figure out what kind of file it got as input.
 Daniel (29 October 1999):
 - Another one of Sebastiaan van Erk's ideas (that has been requested before
   but I seem to have forgotten who it was), is to add support for ranges in
   FTP downloads. As usual, one request is just a request, when they're two
   it is a demand. I've added simple support for X-Y style fetches. X has to
   be the lower number, though you may omit one of the numbers. Use the -r/
   --range switch (previously HTTP-only).
 - Sebastiaan van Erk suggested that curl should be
   able to show the file size of a specified file. I think this is a splendid
   idea and the -I flag is now working for FTP. It displays the file size in
   this manner:
        Content-Length: XXXX
   As it resembles normal headers, and leaves us the opportunity to add more
   info in that display if we can come up with more in the future! It also
   makes sense since if you access ftp through a HTTP proxy, you'd get the
   file size the same way.
   I changed the order of the QUOTE command executions. They're now executed
   just after the login and before any other command. I made this to enable
   quote commands to run before the -I stuff is done too.
 - I found out that -D/--dump-header and -V/--version weren't documented in
   the man page.
 - Many HTTP/1.1 servers do not support ranges. Don't ask me why. I did add
   some text about this in the man page for the range option. The thread in
   the mailing list that started this was initiated by Michael Anti.
 - I get reports about nroff crashes on solaris 2.6+ when displaying the curl
   man page. Switch to gnroff instead, it is reported to work(!). Adam Barclay
   reported and brought the suggestion.
 - In a dialogue with Johannes G. Kristinsson we came
   up with the idea to let -H/--header specified headers replace the
   internally generated headers, if you happened to select to add a header
   that curl normally uses by itself. The advantage with this is not entirely
   obvious, but in Johannes' case it means that he can use another Host: than
   the one curl would set.
 Daniel (27 October 1999):
 - Jongki Suwandi brought a nice patch for (yet another) crash when following
   a location:. This time you had to follow a https:// server's redirect to
   get the core.
 Version 6.2
 Daniel (21 October 1999):
 - I think I managed to remove the suspicious (nil) that has been seen just
   before the "Host:" in HTTP requests when -v was used.
 - I found out that if you followed a location: when using a proxy, without
   having specified http:// in the URL, the protocol part was added once again
   when moving to the next URL! (The protocol part has to be added to the
   URL when going through a proxy since it has no protocol-guessing system
   such as curl has.)
 - Benjamin Ritcey reported a core dump under solaris 2.6
   with OpenSSL 0.9.4. It turned out this was due to a bad free() in main.c
   that occurred after the download was done and completed.
 - Benjamin found ftp downloads to show the first line of the download meter
   to get written twice, and I removed that problem. It was introduced with
   the multiple URL support.
 - Dan Zitter correctly pointed out that curl 6.1 and earlier versions didn't
   honor RFC 2616 chapter 4 section 2, "Message Headers": "...Field names are
   case-insensitive..."  HTTP header parsing assumed a certain casing. Dan
   also provided me with a patch that corrected this, which I took the liberty
   of editing slightly.
 - Dan Zitter also provided a nice patch for config.guess to better recognize
   the Mac OS X
 - Dan also corrected a minor problem in the lib/Makefile that caused linking
   to fail on OS X.
 Daniel (19 October 1999):
 - Len Marinaccio came up with some problems with curl.  Since Windows has a
   crippled shell, it can't redirect stderr and that causes trouble. I added
   --stderr today which allows the user to redirect the stderr stream to a
   file or stdout.
 Daniel (18 October 1999):
 - The configure script now understands the '--without-ssl' flag, which now
   totally disable SSL/https support. Previously it wasn't possible to force
   the configure script to leave SSL alone. The previous functionality has
   been retained. Troy Engel helped test this new one.
 Version 6.1
 Daniel (17 October 1999):
 - I ifdef'ed or commented all the zlib stuff in the sources and configure
   script. It turned out we needed to mock more with zlib than I initially
   thought, to make it capable of downloading compressed HTTP documents and
   uncompress them on the fly. I didn't mean the zlib parts of curl to become
   more than minor so this means I halt the zlib expedition for now and wait
   until someone either writes the code or zlib gets updated and better
   adjusted for this kind of usage.  I won't get into details here, but a
   short a summary is suitable:
   - zlib can't automatically detect whether to use zlib or gzip
     decompression methods.
   - zlib is very neat for reading gzipped files from a file descriptor,
     although not as nice for reading buffer-based data such as we would
     want it.
   - there are still some problems with the win32 version when reading from
     a file descriptor if that is a socket
 Daniel (14 October 1999):
 - Moved the (external) include files for libcurl into a subdirectory named
   curl and adjusted all #include lines to use <curl/XXXX> to maintain a
   better name space and control of the headers. This has been requested.
 Daniel (12 October 1999):
 - I modified the 'maketgz' script to perform a 'make' too before a release
   archive is put together in an attempt to make the time stamps better and
   hopefully avoid the double configure-running that use to occur.
 Daniel (11 October 1999):
 - Applied J<>rn's patches that fixes zlib for mingw32 compiles as well as
   some other missing zlib #ifdef and more text on the multiple URL docs in
   the man page.
 Version 6.1beta
 Daniel (6 October 1999):
 - Douglas E. Wegscheid sent me a patch that made the exact same thing as I
   just made: the -d switch is now capable of reading post data from a named
   file or stdin.  Use it similarly to the -F. To read the post data from a
   given file:
        curl -d @path/to/filename www.postsite.com
   or let curl read it out from stdin:
        curl -d @- www.postit.com
 J<>rn Hartroth (3 October 1999):
 - Brought some more patches for multiple URL functionality. The MIME
   separation ideas are almost scrapped now, and a custom separator is being
   used instead. This is still compile-time "flagged".
 Daniel
 - Updated curl.1 with multiple URL info.
 Daniel (30 September 1999):
 - Felix von Leitner brought openssl-check fixes for configure.in to work
   out-of-the-box when the openssl files are installed in the system default
   dirs.
 Daniel (28 September 1999)
 - Added libz functionality. This should enable decompressing gzip, compress
   or deflate encoding HTTP documents. It also makes curl send an accept that
   it accepts that kind of encoding. Compressed contents usually shortens
   download time. I *need* someone to tell me a site that uses compressed HTTP
   documents so that I can test this out properly.
 - As a result of the adding of zlib awareness, I changed the version string
   a little. I plan to add openldap version reporting in there too.
 Daniel (17 September 1999)
 - Made the -F option allow stdin when specifying files. By using '-' instead
   of file name, the data will be read from stdin.
 Version 6.0
 Daniel (13 September 1999)
 - Added -X/--http-request <request> to enable any HTTP command to be sent.
   Do not that your server has to support the exact string you enter. This
   should possibly a string like DELETE or TRACE.
 - Applied Douglas' mingw32-fixes for the makefiles.
 Daniel (10 September 1999)
 - Douglas E. Wegscheid pointed out a problem. Curl didn't check the FTP
   servers return code properly after the --quote commands were issued. It
   took anything non 200 as an error, when all 2XX codes should be accepted as
   OK.
 - Sending cookies to the same site in multiple lines like curl used to do
   turned out to be bad and breaking the cookie specs. Curl now sends all
   cookies on a single Cookie: line. Curl is not yet RFC 2109 compliant, but I
   doubt that many servers do use that syntax (yet).
 Daniel (8 September 1999)
 - J<>rn helped me make sure it still compiles nicely with mingw32 under win32.
 Daniel (7 September 1999)
 - FTP upload through proxy is now turned into a HTTP PUT. Requested by
   Stefan Kanthak.
 - Added the ldap files to the .m32 makefile.
 Daniel (3 September 1999)
 - Made cookie matching work while using HTTP proxy.
 Bjorn Reese (31 August 1999)
 - Passed his ldap:// patch. Note that this requires the openldap shared
   library to be installed and that LD_LIBRARY_PATH points to the
   directory where the lib will be found when curl is run with a
   ldap:// URL.
 J<>rn Hartroth (31 August 1999)
 - Made the Mingw32 makefiles into single files.
 - Made file:// work for Win32. The same code is now used for unix as well for
   performance reasons.
 Douglas E. Wegscheid (30 August 1999)
 - Patched the Mingw32 makefiles for SSL builds.
 Matthew Clarke (30 August 1999)
 - Made a cool patch for configure.in to allow --with-ssl to specify the
   root dir of the openssl installation, as in
        ./configure --with-ssl=/usr/ssl_here
 - Corrected the 'reconf' script to work better with some shells.
 J<>rn Hartroth (26 August 1999)
 - Fixed the Mingw32 makefiles in lib/ and corrected the file.c for win32
   compiles.
 Version 5.11
 Daniel (25 August 1999)
 - John Weismiller pointed out a bug in the header-line
   realloc() system in download.c.
 - I added lib/file.[ch] to offer a first, simple, file:// support. It
   probably won't do much good on win32 system at this point, but I see it
   as a start.
 - Made the release archives get a Makefile in the root dir, which can be
   used to start the compiling/building process easier. I haven't really
   changed any INSTALL text yet, I wanted to get some feed-back on this
   first.
 Daniel (17 August 1999)
 - Another Location: bug. Curl didn't do proper relative locations if the
   original URL had cgi-parameters that contained a slash. Nusu's page
   again.
 - Corrected the NO_PROXY usage. It is a list of substrings that if one of
   them matches the tail of the host name it should connect to, curl should
   not use a proxy to connect there. Pointed out to me by Douglas
   E. Wegscheid.  I also changed the README text a little regarding this.
 Daniel (16 August 1999)
 - Fixed a memory bug with http-servers that sent Location: to a Location:
   page. Nusu's page showed this too.
 - Made cookies work a lot better. Setting the same cookie name several times
   used to add more cookies instead of replacing the former one which it
   should've. Nusu <nus at intergorj.ro> brought me an URL that made this
   painfully visible...
 Troy (15 August 1999)
 - Brought new .spec files as well as a patch for configure.in that lets the
   configure script find the openssl files better, even when the include
   files are in /usr/include/openssl
 Version 5.10
 Daniel (13 August 1999)
 - SSL_CTX_set_default_passwd_cb() has been modified in the 0.9.4 version of
   OpenSSL. Now why couldn't they simply add a *new* function instead of
   modifying the parameters of an already existing function? This way, we get
   a compiler warning if compiling with 0.9.4 but not with earlier. So, I had
   to come up with a #if construction that deals with this...
 - Made curl output the SSL version number get displayed properly with 0.9.4.
 Troy (12 August 1999)
 - Added MingW32 (GCC-2.95) support under Win32. The INSTALL file was also
   a bit rearranged.
 Daniel (12 August 1999)
 - I had to copy a good <arpa/telnet.h> include file into the curl source
   tree to enable the silly win32 systems to compile. The distribution rights
   allows us to do that as long as the file remains unmodified.
 - I corrected a few minor things that made the compiler complain when
   -Wall -pedantic was used.
 - I'm moving the official curl web page to http://curl.haxx.nu. I think it
   will make it easier to remember as it is a lot shorter and less cryptic.
   The old one still works and shows the same info.
 Daniel (11 August 1999)
 - Albert Chin-A-Young mailed me another correction for NROFF in the
   configure.in that is supposed to be better for IRIX users.
 Daniel (10 August 1999)
 - Albert Chin-A-Young helped me with some stupid Makefile things, as well as
   some fiddling with the getdate.c stuff that he had problems with under
   HP-UX v10. getdate.y will now be compiled into getdate.c if the appropriate
   yacc or bison is found by the configure script. Since this is slightly new,
   we need to test the output getdate.c with win32 systems to make sure it
   still compiles there.
 Daniel (5 August 1999)
 - I've just setup a new mailing list with the intention to keep discussions
   around libcurl development in it. I mainly expect it to be for thoughts and
   brainstorming around a "next generation" library, rather than nitpicking
   about the current implementation or details in the current libcurl.
   To join our happy bunch of future-looking geeks, enter 'subscribe
   <address>' in the body of a mail and send it to
   libcurl-request@listserv.fts.frontec.se.  Curl bug reports, the usual curl
   talk and everything else should still be kept in this mailing list. I've
   started to archive this mailing list and have put the libcurl web page at
   www.fts.frontec.se/~dast/libcurl/.
 - Stefan Kanthak contacted me regarding a few problems in the configure
   script which he discovered when trying to make curl compile and build under
   Siemens SINIX-Z V5.42B2004!
 - Marcus Klein very accurately informed me that src/version.h was not present
   in the CVS repository. Oh, how silly...
 - Linus Nielsen rewrote the telnet:// part and now curl offers limited telnet
   support. If you run curl like 'curl telnet://host' you'll get all output on
   the screen and curl will read input from stdin. You'll be able to login and
   run commands etc, but since the output is buffered, expect to get a little
   weird output.
   This is still in its infancy and it might get changed. We need your
   feed-back and input in how this is best done.
   WIN32 NOTE: I bet we'll get problems when trying to compile the current
   lib/telnet.c on win32, but I think we can sort them out in time.
 - David Sanderson reported that FORCE_ALLOCA_H or HAVE_ALLOCA_H must be
   defined for getdate.c to compile properly on HP-UX 11.0. I updated the
   configure script to check for alloca.h which should make it.
 Daniel (4 August 1999)
 - I finally got to understand Marcus Klein's ftp download resume problem,
   which turns out to be due to different outputs from different ftp
   servers. It makes ftp download resuming a little trickier, but I've made
   some modifications I really believe will work for most ftp servers and I do
   hope you report if you have problems with this!
 - Added text about file transfer resuming to README.curl.
 Daniel (2 August 1999)
 - Applied a progress-bar patch from Lars J. Aas. It offers
   a new styled progress bar enabled with -#/--progress-bar. 
 T. Yamada <tai at imasy.or.jp> (30 July 1999)
 - It breaks with segfault when 1) curl is using .netrc to obtain
   username/password (option '-n'), and 2) is automatically redirected to
   another location (option '-L').
   There is a small bug in lib/url.c (block starting from line 641), which
   tries to take out username/password from user- supplied command-line
   argument ('-u' option). This block is never executed on first attempt since
   CONF_USERPWD bit isn't set at first, but curl later turns it on when it
   checks for CONF_NETRC bit. So when curl tries to redo everything due to
   redirection, it segfaults trying to access *data->userpwd.
 Version 5.9.1
 Daniel (30 July 1999)
 - Steve Walch pointed out that there is a memory leak in the formdata
   functions. I added a FormFree() function that is now used and supposed to
   correct this flaw.
 - Mark Wotton reported:
   'curl -L https://www.cwa.com.au/' core dumps.  I managed to cure this by
   correcting the cleanup procedure. The bug seems to be gone with my OpenSSL
   0.9.2b, although still occurs when I run the ~100 years old SSLeay 0.8.0. I
   don't know whether it is curl or SSLeay that is to blame for that.
 - Marcus Klein:
   Reported an FTP upload resume bug that I really can't repeat nor understand.
   I leave it here so that it won't be forgotten.
 Daniel (29 July 1999)
 - Costya Shulyupin suggested support for longer URLs when following Location:
   and I could only agree and fix it!
 - Leigh Purdie found a problem in the upload/POST department. It turned out
   that http.c accidentaly cleared the pointer instead of the byte counter
   when supposed to.
 - Costya Shulyupin pointed out a problem with port numbers and Location:. If
   you had a server at a non-standard port that redirected to an URL using a
   standard port number, curl still used that first port number.
 - Ralph Beckmann pointed out a problem when using both CONF_FOLLOWLOCATION
   and CONF_FAILONERROR simultaneously. Since the CONF_FAILONERROR exits on
   the 302-code that the follow location header outputs it will never show any
   html on location: pages. I have now made it look for >=400 codes if
   CONF_FOLLOWLOCATION is set.
 - 'struct slist' is now renamed to 'struct curl_slist' (as suggested by Ralph
   Beckmann).
 - Joshua Swink and Rick Welykochy were the first to point out to me that the
   latest OpenSSL package now have moved the standard include path. It is now
   in /usr/local/ssl/include/openssl and I have now modified the --enable-ssl
   option for the configure script to use that as the primary path, and I
   leave the former path too to work with older packages of OpenSSL too.
 Daniel (9 June 1999)
 - I finally understood the IRIX problem and now it seem to compile on it!
   I am gonna remove those #define strcasecmp() things once and for all now.
 Daniel (4 June 1999)
 - I adjusted the FTP reply 227 parser to make the PASV command work better
   with more ftp servers. Appearantly the Roxen Challanger server replied
   something curl 5.9 could deal with! :-( Reported by Ashley Reid-Montanaro
   and Mark Butler brought a solution for it.
 Daniel (26 May 1999)
 - Rearranged. README is new, the old one is now README.curl and I added a
   README.libcurl with text I got from Ralph Beckmann.
 - I also updated the INSTALL text.
 Daniel (25 May 1999)
 - David Jonathan Lowsky correctly pointed out that curl didn't properly deal
   with form posting where the variable shouldn't have any content, as in curl
   -F "form=" www.site.com. It was now fixed.
 Version 5.9
 Daniel (22 May 1999)
 - I've got a bug report from Aaron Scarisbrick in which he states he has some
   problems with -L under FreeBSD 3.0. I have previously got another bug
   report from Stefan Grether which points at an error with similar sympthoms
   when using win32. I made the allocation of the new url string a bit faster
   and different, don't know if it actually improves anything though...
 Daniel (20 May 1999)
 - Made the cookie parser deal with CRLF newlines too.
 Daniel (19 May 1999)
 - Download() didn't properly deal with failing return codes from the sread()
   function. Adam Coyne found the problem in the win32 version, and Troy Engel
   helped me out isolating it.
 Daniel (16 May 1999)
 - Richard Adams pointed out a bug I introduced in 5.8. --dump-header doesn't
   work anymore! :-/ I fixed it now.
 - After a suggestion by Joshua Swink I added -S / --show-error to force curl
   to display the error message in case of an error, even if -s/--silent was
   used.
 Daniel (10 May 1999)
 - I moved the stuff concerning HTTP, DICT and TELNET it their own source
   files now. It is a beginning on my clean-up of the sources to make them
   layer all those protocols better to enable more to be added easier in the
   future!
 - Leon Breedt sent me some files I've not put into the main curl
   archive. They're for creating the Debian package thingie. He also sent me a
   debian package that I've made available for download at the web page
 Daniel (9 May 1999)
 - Made it compile on cygwin too.
 Troy Engel (7 May 1999)
 - Brought a series of patches to allow curl to compile smoothly on MSVC++ 6
   again!
 Daniel (6 May 1999)
 - I changed the #ifdef HAVE_STRFTIME placement for the -z code so that it
   will be easier to discover systems that don't have that function and thus
   can't use -z successfully. Made the strftime() get used if WIN32 is defined
   too.
 Version 5.8
 Daniel (5 May 1999)
 - I've had it with this autoconf/automake mess. It seems to work allright
   for most people who don't have automake installed, but for those who have
   there are problems all over.
   I've got like five different bug reports on this only the last
   week... Claudio Neves and Federico Bianchi and root <duggerj001 at
   hawaii.rr.com> are some of them reporting this.
   Currently, I have no really good fix since I want to use automake myself to
   generate the Makefile.in files. I've found out that the @SHELL@-problems
   can often be fixed by manually invoking 'automake' in the archive root
   before you run ./configure... I've hacked my maketgz script now to fiddle
   a bit with this and my tests seem to work better than before at least!
 Daniel (4 May 1999)
 - mkhelp.pl has been doing badly lately. I corrected a case problem in
   the regexes.
 - I've now remade the -o option to not touch the file unless it needs to.
   I had to do this to make -z option really fine, since now you can make a
   curl fetch and use a local copy's time when downloading to that file, as
   in:
        curl -z dump -o dump remote.site.com/file.html
   This will only get the file if the remote one is newer than the local.
   I'm aware that this alters previous behaviour a little. Some scripts out
   there may depend on that the file is always touched...
 - Corrected a bug in the SSLv2/v3 selection.
 - Felix von Leitner requested that curl should be able to send
   "If-Modified-Since" headers, which indeed is a fair idea.  I implemented it
   right away! Try -z <expression> where expression is a full GNU date
   expression or a file name to get the date from!
 Stephan Lagerholm (30 Apr 1999)
 - Pointed out a problem with the src/Makefile for FreeBSD. The RM variable
   isn't set and causes the make to fail.
 Daniel (26 April 1999)
 - Am I silly or what? Irving Wolfe pointed out to me that the curl version
   number was not set properly. Hasn't been since 5.6. This was due to a bug
   in my maketgz script!
 David Eriksson (25 Apr 1999)
 - Found a bug in cookies.c that made it crash at times.
 Version 5.7.1
 Doug Kaufman (23 Apr 1999)
 - Brought two sunos 4 fixes. One of them being the hostip.c fix mentioned
   below and the other one a correction in include/stdcheaders.h
 - Added a paragraph about compiling with the US-version of openssl to the
   INSTALL file.
 Daniel
 - New mailing list address. Info updated on the web page as well as in the
   README file
 Greg Onufer (20 Apr 1999)
 - hostip.c didn't compile properly on SunOS 5.5.1.
   It needs an #include <sys/types.h>
 Version 5.7
 Daniel (Apr 20 1999)
 - Decided to upload a non-beta version right now!
 - Made curl support any-length HTTP headers. The destination buffer is now
   simply enlarged every time it turns out to be too small!
 - Added the FAQ file to the archive. Still a bit smallish, but it is a
   start.
 Eric Thelin (15 Apr 1999)
 - Made -D accept '-' instead of filename to write to stdout.
 Version 5.6.3beta
 Daniel (Apr 12 1999)
 - Changed two #ifdef WIN32 to better #ifdef <errorcode> when connect()ing
   in url.c and ftp.c. Makes cygwin32 deal with them better too. We should
   try to get some decent win32-replacement there. Anyone?
 - The old -3/--crlf option is now ONLY --crlf!
 - I changed the "SSL fix" to a more lame one, but that doesn't remove as
   much functionality. Now I've enabled the lib to select what SSL version it
   should try first. Appearantly some older SSL-servers don't like when you
   talk v3 with them so you need to be able to force curl to talk v2 from the
   start. The fix dated April 6 and posted on the mailing list forced curl to
   use v2 at all times using a modern OpenSSL version, but we don't really
   want such a crippled solution.
 - Marc Boucher sent me a patch that corrected a math error for the
   "Curr.Speed" progress meter.
 - Eric Thelin sent me a patch that enables '-K -' to read a config file from
   stdin.
 - I found out we didn't close the file properly before so I added it!
 Daniel (Apr 9 1999)
 - Yu Xin pointed out a problem with ftp download resume.  It didn't work at
   all! ;-O
 Daniel (Apr 6 1999)
 - Corrected the version string part generated for the SSL version.
 - I found a way to make some other SSL page work with openssl 0.9.1+ that
   previously didn't (ssleay 0.8.0 works with it though!). Trying to get
   some real info from the OpenSSL guys to see how I should do to behave the
   best way. SSLeay 0.8.0 shouldn't be that much in use anyway these days!
 Version 5.6.2beta
 Daniel (Apr 4 1999)
 - Finally have curl more cookie "aware". Now read carefully. This is how
   it works.
   To make curl read cookies from an already existing file, in plain header-
   format (like from the headers of a previous fetch) invoke curl with the
   -b flag like:
        curl -b file http://site/foo.html
   Curl will then use all cookies it finds matching. The old style that sets
   a single cookie with -b is still supported and is used if the string
   following -b includes a '=' letter, as in "-b name=daniel".
   To make curl read the cookies sent in combination with a location: (which
   sites often do) point curl to read a non-existing file at first (i.e
   to start with no existing cookies), like:
        curl -b nowhere http://site/setcookieandrelocate.html
 - Added a paragraph in the TODO file about the SSL problems recently
   reported. Evidently, some kind of SSL-problem curl may need to address.
 - Better "Location:" following.
 Douglas E. Wegscheid (Tue, 30 Mar 1999)
 - A subsecond display patch.
 Daniel (Mar 14 1999)
 - I've separated the version number of libcurl and curl now. To make
   things a little easier, I decided to start the curl numbering from
   5.6 and the former version number known as "curl" is now the one
   set for libcurl.
 - Removed the 'enable-no-pass' from configure, I doubt anyone wanted
   that.
 - Made lots of tiny adjustments to compile smoothly with cygwin under
   win32. It's a killer for porting this to win32, bye bye VC++! ;-)
   Compiles and builds out-of-the-box now. See the new wordings in
   INSTALL for details.
 - Beginning experiments with downloading multiple document from a http
   server while remaining connected.
 Version 5.6beta
 Daniel (Mar 13 1999)
 - Since I've changed so much, I thought I'd just go ahead and implement the
   suggestion from Douglas E. Wegscheid. -D or --dump-header is now storing
   HTTP headers separately in the specified file.
 - Added new text to INSTALL on what to do to build this on win32 now.
 - Aaargh. I had to take a step back and prefix the shared #include files
   in the sources with "../include/" to please VC++...
 Daniel (Mar 12 1999)
 - Split the url.c source into many tiny sources for better readability
   and smaller size.
 Daniel (Mar 11 1999)
 - Started to change stuff for a move to make libcurl and a more separate
   curl application that uses the libcurl. Made the libcurl sources into
   the new lib directory while the curl application will remain in src as
   before. New makefiles, adjusted configure script and so.
   libcurl.a built quickly and easily. I better make a better interface to
   the lib functions though.
   The new root dir include/ is supposed to contain the public information
   about the new libcurl. It is a little ugly so far :-)
 Daniel (Mar 1 1999)
 - Todd Kaufmann sent me a good link to Netscape's cookie spec as well as the
   info that RFC 2109 specifies how to use them.  The link is now in the
   README and the RFC in the RESOURCES.
 Daniel (Feb 23 1999)
 - Finally made configure accept --with-ssl to look for SSL libs and includes
   in the "standard" place /usr/local/ssl...
 Daniel (Feb 22 1999)
 - Verified that curl linked fine with OpenSSL 0.9.1c which seems to be
   the most recent.
 Henri Gomez (Fri Feb  5 1999)
 - Sent in an updated curl-ssl.spec. I still miss the script that builds an
   RPM automatically...
 Version 5.5.1
 Mark Butler (27 Jan 1999)
 - Corrected problems in Download().
 Danitel Stenberg (25 Jan 1999)
 - Jeremie Petit pointed out a few flaws in the source that prevented it from
   compile warning free with the native compiler under Digital Unix v4.0d.
 Version 5.5
 Daniel Stenberg (15 Jan 1999)
 - Added Bjorns small text to the README about the DICT protocol.
 Daniel Stenberg (11 Jan 1999)
 - <jswink at softcom.net> reported about the win32-versioin: "Doesn't use
   ALL_PROXY environment variable". Turned out to be because of the static-
   buffer nature of the win32 environment variable calls!
 Bjorn Reese (10 Jan 1999)
 - I have attached a simple addition for the DICT protocol (RFC 2229).
   It performs dictionary lookups. The output still needs to be better
   formatted.
   To test it try (the exact format, and more examples are described in
   the RFC)
        dict://dict.org/m:hello
        dict://dict.org/m:hello::soundex
 Vicente Garcia (10 Jan 1999)
 - Corrected the progress meter for files larger than 20MB.
 Daniel Stenberg (7 Jan 1999)
 - Corrected the -t and -T help texts. They claimed to be FTP only.
 Version 5.4
 Daniel Stenberg
 (7 Jan 1999)
 - Irving Wolfe reported that curl -s didn't always supress the progress
   reporting. It was the form post that autoamtically always switched it on
   again. This is now corrected!
 (4 Jan 1999)
 - Andreas Kostyrka suggested I'd add PUT and he helped me out to test it. If
   you use -t or -T now on a http or https server, PUT will be used for file
   upload.
   I removed the former use of -T with HTTP. I doubt anyone ever really used
   that.
 (4 Jan 1999)
 - Erik Jacobsen found a width bug in the mprintf() function.  I corrected it
   now.
 (4 Jan 1999)
 - As John V. Chow pointed out to me, curl accepted very limited URL sizes. It
   should now accept path parts that are up to at least 4096 bytes.
 - Somehow I screwed up when applying the AIX fix from Gilbert Ramirez, so
   I redid that now.
--- a/CHANGES.2001
+++ b/CHANGES.2001
--- a/40
+++ b/40
@@ -10,14 +10,10 @@ This file is only present in the CVS - never in release archives. It contains
 information about other files and things that the CVS repository keeps in its
 inner sanctum.
-Use autoconf 2.50 and no earlier. Also, try having automake 1.5 and libtool
+Compile and build instructions follow below.
 1.4.1 at least.
 You will need perl to generate the src/hugehelp.c file. The file
 src/hugehelp.c.cvs is a one-shot file that you can rename to src/hugehelp.c if
 you really can't generate the true file yourself!
  CHANGES.0     contains ancient changes.
  CHANGES.$year contains changes for the particular year.
  memanalyze.pl is for analyzing the output generated by curl if -DMALLOCDEBUG
                is used when compiling
@@ -26,12 +22,38 @@ you really can't generate the true file yourself!
  Makefile.dist is included as the root Makefile in distribution archives
-  perl/contrib/ is a subdirectory with various perl scripts
+  perl/         is a subdirectory with various perl scripts
  java/         is a subdirectory with the Java interface to libcurl
 To build after having extracted everything from CVS, do this:
 ./buildconf
 ./configure
 make
 REQUIREMENTS
 You need the following software installed:
 o autoconf 2.50 (or later)
 o automake 1.5 (or later)
 o libtool  1.4 (or later)
 o GNU m4 (required by autoconf)
 o nroff + perl (if you don't have nroff and perl and you for some reason
   don't want to install them, you can rename the source file
   src/hugehelp.c.cvs to src/hugehelp.c and avoid having to generate this
   file. This will of course give you an older version of the file that isn't
   up-to-date. That file was checked in once and won't be updated very
   regularly.)
 MAC OS X
 For Mac OS X users, Guido Neitzer write down the following step-by-step guide:
 1. Install fink (http://fink.sourceforge.net)
 2. Update fink to the newest version (with the installed fink)
 3. Install the latest version of autoconf, automake and m4 with fink
 4. Install version 1.4.1 of libtool - you find it in the "unstable" section
    (read the manual to see how to get unstable versions)
 5. Get cURL from the cvs
 6. Build cURL with "./buildconf", "./configure", "make", "sudo make install"
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,11 @@
 # $Id$
 #
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST =						\
 	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt	\
-	reconf Makefile.dist curl-config.in build_vms.com curl-mode.el \
+	reconf Makefile.dist curl-config.in build_vms.com curl-mode.el
 	config-vms.h config-win32.h config-riscos.h config-mac.h
 bin_SCRIPTS = curl-config
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___ 
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 2002, 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.
@@ -51,6 +51,12 @@ vc-ssl:
 	cd lib
 	nmake -f Makefile.vc6 cfg=release-ssl
 	cd ..\src
 	nmake -f Makefile.vc6 cfg=release-ssl
 vc-ssl-dll:
 	cd lib
 	nmake -f Makefile.vc6 cfg=release-ssl-dll
 	cd ..\src
 	nmake -f Makefile.vc6
 cygwin:
--- a/5
+++ b/5
@@ -19,9 +19,10 @@ README
  Study the LEGAL file for distribution terms and similar.
-  Always try the Curl web site for the latest news:
+  Visit the curl web site or mirror for the latest news:
-        http://curl.haxx.se
+        http://curl.haxx.se/
        http://curl.sf.net/
  The official download mirror sites are:
--- a/acconfig.h
+++ b/acconfig.h
@@ -64,3 +64,24 @@
 /* Define this to 'int' if in_addr_t is not an available typedefed type */
 #undef in_addr_t
 /* Define to disable DICT */
 #undef CURL_DISABLE_DICT
 /* Define to disable FILE */
 #undef CURL_DISABLE_FILE
 /* Define to disable FTP */
 #undef CURL_DISABLE_FTP
 /* Define to disable GOPHER */
 #undef CURL_DISABLE_GOPHER
 /* Define to disable HTTP */
 #undef CURL_DISABLE_HTTP
 /* Define to disable LDAP */
 #undef CURL_DISABLE_LDAP
 /* Define to disable TELNET */
 #undef CURL_DISABLE_TELNET
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -176,7 +176,7 @@ AC_DEFUN([TYPE_IN_ADDR_T],
      AC_DEFINE_UNQUOTED(in_addr_t, $curl_cv_in_addr_t_equiv,
 			[type to use in place of in_addr_t if not defined])],
      [#include <sys/types.h>
-#include <sys/socket.h>,
+#include <sys/socket.h>
 #include <arpa/inet.h>])
 ])
@@ -377,6 +377,7 @@ AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
 int
 gethostbyname_r(const char *, struct hostent *, struct hostent_data *);],[
 struct hostent_data data;
 gethostbyname_r(NULL, NULL, NULL);],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
@@ -394,6 +395,7 @@ gethostbyname_r(NULL, NULL, NULL);],[
 int
 gethostbyname_r(const char *,struct hostent *, struct hostent_data *);],[
 struct hostent_data data;
 gethostbyname_r(NULL, NULL, NULL);],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
--- a/build_vms.com
+++ b/build_vms.com
@@ -6,14 +6,16 @@ $	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/"",""../"")"
+$	cc_qual = "/define=HAVE_CONFIG_H=1/include=(""../include/"",""../"",""../../openssl-0_9_6c/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
+$	link /exe=curl.exe [.src]curl/lib/include=main,[.lib]curl/lib, -
 		[-.openssl-0_9_6c.axp.exe.ssl]libssl/lib, -
 		[-.openssl-0_9_6c.axp.exe.crypto]libcrypto/lib
 $
 $
 $	goto Common_Exit
--- a/2
+++ b/2
@@ -5,7 +5,7 @@ die(){
 	exit
 }
 automake          || die "The command 'automake $MAKEFILES' failed"
 aclocal           || die "The command 'aclocal' failed"
 autoheader        || die "The command 'autoheader' failed"
 autoconf          || die "The command 'autoconf' failed"
 automake -a       || die "The command 'automake $MAKEFILES' failed"
--- a/config-riscos.h
+++ b/config-riscos.h
@@ -1,25 +0,0 @@
 #define socklen_t int
 #define HAVE_SYS_SOCKET_H
 #define HAVE_ARPA_INET_H
 #define HAVE_SYS_SELECT_H
 #define HAVE_FCNTL_H
 #define HAVE_GETTIMEOFDAY
 #define HAVE_SELECT
 #define HAVE_SOCKET
 #define ifr_dstaddr ifr_addr
 #include <sys/socket.h>
 #include <sys/if.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #define ioctl(a,b,c,d) (ioctl(a,b,c) * (d==d))
 #define OS "RISC OS"
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_PREREQ(2.50)
 dnl First some basic init macros
 AC_INIT
 AC_CONFIG_SRCDIR([lib/urldata.h])
-AM_CONFIG_HEADER(config.h src/config.h)
+AM_CONFIG_HEADER(lib/config.h src/config.h tests/server/config.h)
 dnl figure out the libcurl version
 VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
@@ -56,24 +56,117 @@ dnl AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 dnl ************************************************************
-dnl lame option to switch on debug options
+dnl switch off particular protocols
 dnl
-AC_MSG_CHECKING([whether to enable debug options])
+AC_MSG_CHECKING([whether to support http])
-AC_ARG_ENABLE(debug,
+AC_ARG_ENABLE(http,
-[  --enable-debug		Enable pedantic debug options
+[  --enable-http		Enable HTTP support
-  --disable-debug		Disable debug options],
+  --disable-http	Disable HTTP support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_HTTP)
       AC_MSG_WARN([disable HTTP disables FTP over proxy and GOPHER too])
       AC_DEFINE(CURL_DISABLE_GOPHER)
       AC_SUBST(CURL_DISABLE_HTTP)
       AC_SUBST(CURL_DISABLE_GOPHER)
       ;;
  *)   AC_MSG_RESULT(yes)
    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
    CFLAGS="-W -Wall -Wwrite-strings -pedantic -g" 
       ;;
  esac ],
-       AC_MSG_RESULT(no)
+       AC_MSG_RESULT(yes)
 )
 AC_MSG_CHECKING([whether to support ftp])
 AC_ARG_ENABLE(ftp,
 [  --enable-ftp		Enable FTP support
  --disable-ftp	Disable FTP support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_FTP)
       AC_SUBST(CURL_DISABLE_FTP)
       ;;
  *)   AC_MSG_RESULT(yes)
       ;;
  esac ],
       AC_MSG_RESULT(yes)
 )
 AC_MSG_CHECKING([whether to support gopher])
 AC_ARG_ENABLE(gopher,
 [  --enable-gopher		Enable GOPHER support
  --disable-gopher	Disable GOPHER support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_GOPHER)
       AC_SUBST(CURL_DISABLE_GOPHER)
       ;;
  *)   AC_MSG_RESULT(yes)
       ;;
  esac ],
       AC_MSG_RESULT(yes)
 )
 AC_MSG_CHECKING([whether to support file])
 AC_ARG_ENABLE(file,
 [  --enable-file		Enable FILE support
  --disable-file	Disable FILE support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_FILE)
       AC_SUBST(CURL_DISABLE_FILE)
       ;;
  *)   AC_MSG_RESULT(yes)
       ;;
  esac ],
       AC_MSG_RESULT(yes)
 )
 AC_MSG_CHECKING([whether to support ldap])
 AC_ARG_ENABLE(ldap,
 [  --enable-ldap		Enable LDAP support
  --disable-ldap	Disable LDAP support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_LDAP)
       AC_SUBST(CURL_DISABLE_LDAP)
       ;;
  *)   AC_MSG_RESULT(yes)
       ;;
  esac ],
       AC_MSG_RESULT(yes)
 )
 AC_MSG_CHECKING([whether to support dict])
 AC_ARG_ENABLE(dict,
 [  --enable-dict		Enable DICT support
  --disable-dict	Disable DICT support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_DICT)
       AC_SUBST(CURL_DISABLE_DICT)
       ;;
  *)   AC_MSG_RESULT(yes)
       ;;
  esac ],
       AC_MSG_RESULT(yes)
 )
 AC_MSG_CHECKING([whether to support telnet])
 AC_ARG_ENABLE(telnet,
 [  --enable-telnet		Enable TELNET support
  --disable-telnet	Disable TELNET support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       AC_DEFINE(CURL_DISABLE_TELNET)
       AC_SUBST(CURL_DISABLE_TELNET)
       ;;
  *)   AC_MSG_RESULT(yes)
       ;;
  esac ],
       AC_MSG_RESULT(yes)
 )
 dnl **********************************************************************
 dnl Checks for IPv6
@@ -392,6 +485,10 @@ else
        OPENSSL_ENABLED=1)
    fi
    dnl Check for the OpenSSL engine header, it is kind of "separated"
    dnl from the main SSL check
    AC_CHECK_HEADERS(openssl/engine.h)
    AC_SUBST(OPENSSL_ENABLED)
  fi
@@ -469,6 +566,8 @@ else
  dnl is there a localtime_r()
  CURL_CHECK_LOCALTIME_R()
  AC_CHECK_FUNCS( gmtime_r )
 fi
 dnl **********************************************************************
@@ -504,7 +603,8 @@ AC_CHECK_HEADERS( \
        io.h \
        pwd.h \
        utime.h \
-        sys/utime.h
+        sys/utime.h \
        setjmp.h
 )
 dnl Check for libz header
@@ -518,9 +618,9 @@ AC_HEADER_TIME
 # mprintf() checks:
 # check for 'long double'
-AC_CHECK_SIZEOF(long double, 8)
+# AC_CHECK_SIZEOF(long double, 8)
 # check for 'long long'
-AC_CHECK_SIZEOF(long long, 4)
+# AC_CHECK_SIZEOF(long long, 4)
 # check for ssize_t
 AC_CHECK_TYPE(ssize_t, int)
@@ -559,9 +659,23 @@ AC_CHECK_FUNCS( socket \
                getpwuid \
                geteuid \
                dlopen \
-                utime
+                utime \
                sigsetjmp
 )
 dnl sigsetjmp() might be a macro and no function so if it isn't found already
 dnl we make an extra check here!
 if test "$ac_cv_func_sigsetjmp" != "yes"; then
  AC_MSG_CHECKING([for sigsetjmp defined as macro])
  AC_TRY_LINK( [#include <setjmp.h>],
               [sigjmp_buf jmpenv;
                sigsetjmp(jmpenv, 1);],
               AC_MSG_RESULT(yes)
               AC_DEFINE(HAVE_SIGSETJMP),
               AC_MSG_RESULT(no)
               )
 fi
 dnl removed 'getpass' check on October 26, 2000
 if test "$ac_cv_func_select" != "yes"; then
@@ -585,15 +699,37 @@ dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib,
 dnl   $PATH:/usr/bin/:/usr/local/bin )
 dnl AC_SUBST(RANLIB)
 dnl ************************************************************
 dnl lame option to switch on debug options
 dnl
 AC_MSG_CHECKING([whether to enable debug options])
 AC_ARG_ENABLE(debug,
 [  --enable-debug	Enable pedantic debug options
  --disable-debug	Disable debug options],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       ;;
  *)   AC_MSG_RESULT(yes)
    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
    CFLAGS="-W -Wall -Wwrite-strings -pedantic -Wundef -Wpointer-arith -Wcast-align -Wnested-externs -g" 
       ;;
  esac ],
       AC_MSG_RESULT(no)
 )
 AC_CONFIG_FILES([Makefile \
 	   docs/Makefile \
           docs/examples/Makefile \
           docs/libcurl/Makefile \
 	   include/Makefile \
 	   include/curl/Makefile \
 	   src/Makefile \
           lib/Makefile \
           tests/Makefile \
           tests/data/Makefile \
           tests/server/Makefile \
 	   packages/Makefile \
 	   packages/Win32/Makefile \
 	   packages/Win32/cygwin/Makefile \
@@ -602,6 +738,8 @@ AC_CONFIG_FILES([Makefile \
 	   packages/Linux/RPM/curl.spec \
 	   packages/Linux/RPM/curl-ssl.spec \
           packages/Solaris/Makefile \
           packages/EPM/curl.list \
           packages/EPM/Makefile \
           curl-config
 ])
 AC_OUTPUT
--- a/curl-config.in
+++ b/curl-config.in
@@ -16,6 +16,7 @@ Usage: curl-config [OPTION]
 Available values for OPTION include:
  --cc        compiler
  --cflags    pre-processor and compiler flags
  --feature   newline separated list of enabled features
  --help      display this help and exit
@@ -42,6 +43,10 @@ while test $# -gt 0; do
    esac
    case "$1" in
    --cc)
 	echo @CC@
 	;;
    --prefix)
 	echo $prefix
 	;;
@@ -56,6 +61,27 @@ while test $# -gt 0; do
 	if test "@IPV6_ENABLED@" = "1"; then
          echo "IPv6"
        fi
 	if test "@CURL_DISABLE_HTTP@" = "1"; then
          echo "HTTP-disabled"
        fi
 	if test "@CURL_DISABLE_FTP@" = "1"; then
          echo "FTP-disabled"
        fi
 	if test "@CURL_DISABLE_GOPHER@" = "1"; then
          echo "GOPHER-disabled"
        fi
 	if test "@CURL_DISABLE_FILE@" = "1"; then
          echo "FILE-disabled"
        fi
 	if test "@CURL_DISABLE_TELNET@" = "1"; then
          echo "TELNET-disabled"
        fi
 	if test "@CURL_DISABLE_LDAP@" = "1"; then
          echo "LDAP-disabled"
        fi
 	if test "@CURL_DISABLE_DICT@" = "1"; then
          echo "DICT-disabled"
        fi
 	;;
    --version)
--- a/docs/BINDINGS
+++ b/docs/BINDINGS
@@ -0,0 +1,96 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
                               libcurl bindings
 Creative people have written particular bindings or interfaces for various
 environments and programming languages. Using one of these allows you to take
 advantage of curl powers from within your favourite language or system.
 This is a list of all known interfaces as of this writing.
 The bindings listed below are not part of the curl/libcurl distribution
 archives, but must be downloaded and installed separately.
 Basic
  ScriptBasic bindings to libcurl. Writtten by Peter Verhas.
  http://scriptbasic.com/
 C++
  Maintained by Jean-Philippe Barrette-LaPierre.
  http://curl.haxx.se/libcurl/cplusplus/
 Cocoa
  Written by Dan Wood.
  http://curlhandle.sourceforge.net/
 Dylan
  Written by Chris Double.
  http://dylanlibs.sourceforge.net/
 Java
  Written by Daniel Stenberg.
  http://curl.haxx.se/libcurl/java/
 Lua
  Written by Steve Dekorte.
  http://curl.haxx.se/libcurl/lua/
 Object-Pascal
  Free Pascal, Delphi and Kylix binding written by Christophe Espern.
  http://www.tekool.com/opcurl
 Pascal
  Free Pascal, Delphi and Kylix binding written by Jeffrey Pohlmeyer.
  http://houston.quik.com/jkp/curlpas/
 Perl
  Maintained by Cris Bailiff.
  http://curl.haxx.se/libcurl/perl/
 PHP
  Written by Sterling Hughes.
  http://curl.haxx.se/libcurl/php/
 PostgreSQL
  Written by Gian Paolo Ciceri.
  http://gborg.postgresql.org/project/pgcurl/projdisplay.php
 Python
  Written by Kjetil Jacobsen.
  http://pycurl.sourceforge.net/
 Rexx
  Written Mark Hessling. 
  http://rexxcurl.sourceforge.net/
 Ruby
  Written by Hirotaka Matsuyuki. 
  http://www.d1.dion.ne.jp/~matuyuki/ruby.html
 Scheme
  Bigloo binding written by Kirill Lisovsky.
  http://curl.haxx.se/libcurl/scheme/
 Tcl
  Written by Andr<64>s Garc<72>a. 
  http://personal1.iddeo.es/andresgarci/tclcurl/english/docs.html
--- a/docs/BUGS
+++ b/docs/BUGS
@@ -8,25 +8,46 @@ $Id$
 BUGS
  Curl and libcurl have grown substantially since the beginning. At the time
-  of writing (mid March 2001), there are 23000 lines of source code, and by
+  of writing (end of April 2002), there are 32000 lines of source code, and by
  the time you read this it has probably grown even more.
  Of course there are lots of bugs left. And lots of misfeatures.
  To help us make curl the stable and solid product we want it to be, we need
-  bug reports and bug fixes. If you can't fix a bug yourself and submit a fix
+  bug reports and bug fixes.
-  for it, try to report an as detailed report as possible to the curl mailing
+
-  list to allow one of us to have a go at a solution. You should also post
+WHERE TO REPORT
-  your bug/problem at curl's bug tracking system over at
+
  If you can't fix a bug yourself and submit a fix for it, try to report an as
  detailed report as possible to the curl mailing list to allow one of us to
  have a go at a solution. You should also post your bug/problem at curl's bug
  tracking system over at
        http://sourceforge.net/bugs/?group_id=976
  (but please read the section below first before doing that)
 WHAT TO REPORT
  When reporting a bug, you should include information that will help us
-  understand what's wrong, what you expected to happen and how to repeat the
+  understand what's wrong what you expected to happen and how to repeat the
-  bad behaviour. You therefore need to supply your operating system's name and
+  bad behavior. You therefore need to tell us:
-  version number (uname -a under a unix is fine), what version of curl you're
+
-  using (curl -V is fine), what URL you were working with and anything else
+   - your operating system's name and version number (uname -a under a unix
-  you think matters.
+     is fine)
   - what version of curl you're using (curl -V is fine)
   - what URL you were working with (if possible), at least which protocol
  and anything and everything else you think matters. Tell us what you
  expected to happen, tell use what did happen, tell us how you could make it
  work another way. Dig around, try out, test. Then include all the tiny bits
  and pieces in your report. You will benefit from this yourself, as it will
  enable us to help you quicker and more accurately.
  Since curl deals with networks, it often helps us if you include a protocol
  debug dump with your bug report. The output you get by using the -v
  flag. Usually, you also get more info by using -i so that is likely to be
  useful when reporting bugs as well.
  If curl crashed, causing a core dump (in unix), there is hardly any use to
  send that huge file to anyone of us. Unless we have an exact same system
@@ -36,8 +57,7 @@ BUGS
  The address and how to subscribe to the mailing list is detailed in the
  MANUAL file.
-  How To Get A Stack Trace
+HOW TO GET A STACK TRACE
  ========================
  First, you must make sure that you compile all sources with -g and that you
  don't 'strip' the final executable. Try to avoid optimizing the code as
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: November 27, 2001 (http://curl.haxx.se/docs/faq.shtml)
+Updated: May 23, 2002 (http://curl.haxx.se/docs/faq.html)
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -15,6 +15,7 @@ FAQ
  1.5 Who makes cURL?
  1.6 What do you get for making cURL?
  1.7 What about CURL from curl.com?
  1.8 I have a problem who do I mail?
 2. Install Related Problems
  2.1 configure doesn't find OpenSSL even when it is installed
@@ -30,13 +31,15 @@ FAQ
  3.3 Why doesn't my posting using -F work?
  3.4 How do I tell curl to run custom FTP commands?
  3.5 How can I disable the Pragma: nocache header?
-  3.6 Does curl support javascript, ASP, XML, XHTML or HTML version Y?
+  3.6 Does curl support ASP, XML, XHTML or HTML version Y?
  3.7 Can I use curl to delete/rename a file through FTP?
  3.8 How do I tell curl to follow HTTP redirects?
-  3.9 How do I use curl in PHP, Perl, Tcl, Ruby or Java?
+  3.9 How do I use curl in my favorite programming language?
  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
  3.11 How do I POST with a different Content-Type?
  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)?
 4. Running Problems
  4.1 Problems connecting to SSL servers.
@@ -49,10 +52,12 @@ FAQ
   4.5.3 "403 Forbidden"
   4.5.4 "404 Not Found"
   4.5.5 "405 Method Not Allowed"
   4.5.6 "301 Moved Permanently"
  4.6 Can you tell me what error code 142 means?
  4.7 How do I keep user names and passwords secret in Curl command lines?
  4.8 I found a bug!
  4.9 Curl can't authenticate to the server that requires NTLM?
  4.10 My HTTP request using HEAD, PUT or DELETE doesn't work!
 5. libcurl Issues
  5.1 Is libcurl thread-safe?
@@ -162,9 +167,8 @@ FAQ
  1.6 What do you get for making cURL?
-  Project cURL is entirely free and open, without any commercial interests or
+  Project cURL is entirely free and open. No person gets paid in any way for
-  money involved. No person gets paid in any way for developing curl. We all
+  developing curl. We all do this voluntarily on our spare time.
  do this voluntarily on our spare time.
  We get some help from companies. Contactor Data hosts the curl web site and
  the main mailing list, Haxx owns the curl web site's domain and
@@ -192,6 +196,21 @@ FAQ
  We recognize that we will be living in parallel with curl.com and wish them
  every success.
  1.8 I have a problem who do I mail?
  Please do not attempt to mail any single individual unless you really need
  to. Keep curl-related questions on a suitable mailing list. All available
  mailing lists are listed in the MANUAL document and online at
  http://curl.haxx.se/mail/
  Keeping curl-related questions and discussions on mailing lists allows others
  to join in and help, to share their ideas, contribute their suggestions and
  spread their wisdom. Keeping discussions on public mailing lists also allows
  for others to learn from this (both current and future users thanks to the
  web based archives of the mailing lists), thus saving us from having to
  repeat ourselves even more. Thanks for respecting this.
 2. Install Related Problems
  2.1. configure doesn't find OpenSSL even when it is installed
@@ -307,16 +326,14 @@ FAQ
  the -H/--header option. By adding a header with empty contents you safely
  disable that one. Use -H "Pragma:" to disable that specific header.
-  3.6. Does curl support javascript, ASP, XML, XHTML or HTML version Y?
+  3.6. Does curl support ASP, XML, XHTML or HTML version Y?
  To curl, all contents are alike. It doesn't matter how the page was
  generated. It may be ASP, PHP, Perl, shell-script, SSI or plain
  HTML-files. There's no difference to curl and it doesn't even know what kind
  of language that generated the page.
-  Javascript is slightly different since that is code embedded in the HTML
+  See also item 3.14 regarding javascript.
  that is sent for the client to interpret and curl has no javascript
  interpreter.
  3.7. Can I use curl to delete/rename a file through FTP?
@@ -334,31 +351,21 @@ FAQ
     curl -L http://redirector.com
-  3.9 How do I use curl in PHP, Perl, Tcl, Ruby or Java?
+  3.9 How do I use curl in my favorite programming language?
-  There exist many language-interfaces for curl that integrates it better with
+  There exist many language interfaces/bindings for curl that integrates it
-  various languages. If you are fluid in a script language, you may very well
+  better with various languages. If you are fluid in a script language, you
-  opt to use such an interface instead of using the command line tool.
+  may very well opt to use such an interface instead of using the command line
-
+  tool.
  At the time of writing, there are bindings for the five language mentioned
  above, but chances are there are even more by the time you read this. Or you
  may be able you write your own wrapper for a not-yet supported language!
  Find out more about which languages that support curl directly, and how to
  install and use them, in the libcurl section of the curl web site:
        http://curl.haxx.se/libcurl/
-  PHP4 has the ability to use libcurl as an internal module if built with that
+  In December 2001, there are interfaces available for the following
-  option enabled. You then get a set of extra functions that can be used
+  languages: C/C++, Cocoa, Dylan, Java, Perl, PHP, Python, Rexx, Ruby, Scheme
-  within your PHP programs. You find all details about those functions in the
+  and Tcl. By the time you read this, additional ones may have appeared!
  curl section in the PHP manual, see the online version at:
        http://www.php.net/manual/ref.curl.php
  PHP also offers the option to run a command line, and then you can of course
  invoke the curl tool using a command line. This is the way to use curl if
  you're using PHP3 or PHP4 built without curl module support.
  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
@@ -381,14 +388,62 @@ FAQ
  Because when you use a HTTP proxy, the protocol spoken on the network will
  be HTTP, even if you specify a FTP URL. This effectively means that you
-  normally can't use FTP specific features such as ftp upload and ftp quote
+  normally can't use FTP specific features such as FTP upload and FTP quote
  etc.
  There is one exception to this rule, and that is if you can "tunnel through"
  the given HTTP proxy. Proxy tunneling is enabled with a special option (-p)
-  and is generally not available as proxy admins usuable disable tunneling to
+  and is generally not available as proxy admins usually disable tunneling to
  other ports than 443 (which is used for HTTPS access through proxies).
  3.13 Why does my single/double quotes fail?
  To specify a command line option that includes spaces, you might need to
  put the entire option within quotes. Like in:
   curl -d " with spaces " url.com
  or perhaps
   curl -d ' with spaces ' url.com
  Exactly what kind of quotes and how to do this is entirely up to the shell
  or command line interpreter that you are using. For most unix shells, you
  can more or less pick either single (') or double (") quotes. For
  Windows/DOS prompts I believe you're forced to use double (") quotes.
  Please study the documentation for your particular environment. Examples in
  the curl docs will use a mix of both these ones as shown above. You must
  adjust them to work in your environment.
  Remember that curl works and runs on more operating systems than most single
  individuals have ever tried.
  3.14 Does curl support javascript or pac (automated proxy config)?
  Many web pages do magic stuff using embedded javascript. Curl and libcurl
  have no built-in support for that, so it will be treated just like any other
  contents.
  .pac files are a netscape invention and are sometimes used by organizations
  to allow them to differentiate which proxies to use. The .pac contents is
  just a javascript program that gets invoked by the browser and that returns
  the name of the proxy to connect to. Since curl doesn't support javascript,
  it can't support .pac proxy configuration either.
  Some work-arounds usually suggested to overcome this javascript dependency:
    - Depending on the javascript complexity, write up a script that
      translates it to another language and execute that.
    - Read the javascript code and rewrite the same logic in another language.
    - Implement a javascript interpreted, people have successfully used the
      Mozilla javascript engine in the past.
    - Ask your admins to stop this, for a static proxy setup or similar.
 4. Running Problems
  4.1. Problems connecting to SSL servers.
@@ -478,6 +533,17 @@ FAQ
    identified by the Request-URI. The response MUST include an Allow header
    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
       HREF="http://same_url_now_with_a_trailing_slash/">here</A>.
    it might be because you request a directory URL but without the trailing
    slash. Try the same operation again _with_ the trailing URL, or use the
    -L/--location option to follow the redirection.
  4.6. Can you tell me what error code 142 means?
  All error codes that are larger than the highest documented error code means
@@ -511,12 +577,8 @@ FAQ
  particular platform, try contacting the person who built the package/archive
  you have.
-  If there is a bug, post a bug report in the Curl Bug Track System over at
+  If there is a bug, read the BUGS document first. Then report it as described
-  http://sourceforge.net/bugs/?group_id=976
+  in there.
  Always include as many details you can think of, including curl version,
  operating system name and version and complete instructions how to repeat
  the bug.
  4.9. Curl can't authenticate to the server that requires NTLM?
@@ -524,6 +586,18 @@ FAQ
  currently support that. Proprietary formats are evil. You should not use
  such ones.
  4.10 My HTTP request using HEAD, PUT or DELETE doesn't work!
  Many web servers allow or demand that the administrator configures the
  server properly for these requests to work on the web server.
  Some servers seem to support HEAD only on certain kinds of URLs.
  To fully grasp this, try the documentation for the particular server
  software you're trying to interact with. This is not anything curl can do
  anything about.
 5. libcurl Issues
  5.1. Is libcurl thread-safe?
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -201,17 +201,34 @@ Win32
      Microsoft command line style
      ----------------------------
        Please read the OpenSSL documentation on how to compile and install
-        the OpenSSL library.  This generates the libeay32.dll and ssleay32.dll
+        the OpenSSL libraries.  The build process of OpenSSL generates the
-        files.
+        libeay32.dll and ssleay32.dll files in the out32dll subdirectory in
        the OpenSSL home directory.  OpenSSL static libraries (libeay32.lib,
        ssleay32.lib, RSAglue.lib) are created in the out32 subdirectory.
-        Run the 'vcvars32.bat' file to get the proper environment variables
+        Run the 'vcvars32.bat' file to get a proper environment. The
-        set. Edit the makefile.vc6 in the lib directory and define
+        vcvars32.bat file is part of the Microsoft development environment and
-        OPENSSL_PATH.  Set the location of the OpenSSL library and run 'nmake
+        you may find it in 'C:\Program Files\Microsoft Visual Studio\vc98\bin'
-        vc-ssl' in the root directory.
+        provided that you installed Visual C/C++ 6 in the default directory.
-        The vcvars32.bat file is part of the Microsoft development
+        Before running nmake define the OPENSSL_PATH environment variable with
-        environment.
+        the root/base directory of OpenSSL, for example:
          set OPENSSL_PATH=c:\openssl-0.9.6b
        Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
        directory.  'nmake vc-ssl' will create a libcurl static and dynamic
        libraries in the lib subdirectory, as well as a statically linked
        version of curl.exe in the src subdirectory.  This statically linked
        version is a standalone executable not requiring any DLL at
        runtime. This make method requires that you have the static OpenSSL
        libraries available in OpenSSL's out32 subdirectory.
 	'nmake vc-ssl-dll' creates the libcurl dynamic library and
 	links curl.exe against libcurl and OpenSSL dynamically.
 	This executable requires libcurl.dll and the OpenSSL DLLs
 	at runtime.
      Microsoft / Borland style
      -------------------------
@@ -322,6 +339,20 @@ VMS
   13-jul-2001
   N. Baggus
 QNX
 ===
   (This section was graciously brought to us by David Bentham)
   As QNX is targetted for resource constrained environments, the QNX headers
   set conservative limits. This includes the FD_SETSIZE macro, set by default
   to 32. Socket descriptors returned within the CURL library may exceed this,
   resulting in memory faults/SIGSEGV crashes when passed into select(..)
   calls using fd_set macros.
   A good all-round solution to this is to override the default when building
   libcurl, by overriding CFLAGS during configure, example
   #  configure CFLAGS='-DFD_SETSIZE=64 -g -O2'
 CROSS COMPILE
 =============
@@ -364,19 +395,23 @@ CROSS COMPILE
 PORTS
 =====
   This is a probably incomplete list of known hardware and operating systems
-   that curl has been compiled for:
+   that curl has been compiled for. If you know a system curl compiles and
   runs on, that isn't listed, please let us know!
        - Alpha DEC OSF 4
        - Alpha Digital UNIX v3.2
-        - Alpha FreeBSD 4.1
+        - Alpha FreeBSD 4.1, 4.5
-        - Alpha Linux 2.2.16
+        - Alpha Linux 2.2, 2.4
        - Alpha NetBSD 1.5.2
        - Alpha OpenBSD 3.0
        - Alpha OpenVMS V7.1-1H2
        - Alpha Tru64 v5.0 5.1
        - HP-PA HP-UX 9.X 10.X 11.X
        - HP-PA Linux
        - MIPS IRIX 6.2, 6.5
        - MIPS Linux
-        - Power AIX 4.2, 4.3.1, 4.3.2
+        - Pocket PC/Win CE 3.0
        - Power AIX 4.2, 4.3.1, 4.3.2, 5.1
        - PowerPC Darwin 1.0
        - PowerPC Linux
        - PowerPC Mac OS 9
@@ -391,6 +426,7 @@ PORTS
        - Ultrix 4.3a
        - i386 BeOS
        - i386 FreeBSD
        - i386 HURD
        - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4
        - i386 NetBSD
        - i386 OS/2
@@ -398,6 +434,7 @@ PORTS
        - i386 SCO unix
        - i386 Solaris 2.7
        - i386 Windows 95, 98, ME, NT, 2000
        - i386 QNX 6
        - ia64 Linux 2.3.99
        - m68k AmigaOS 3
        - m68k Linux
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -54,7 +54,7 @@ Windows vs Unix
 Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All
 conditionals that deal with features *should* instead be in the format
 '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
- we maintain two config-win32.h files (one in / and one in src/) that are
+ we maintain two config-win32.h files (one in lib/ and one in src/) that are
 supposed to look exactly as a config.h file would have looked like on a
 Windows machine!
@@ -69,10 +69,10 @@ Library
 rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
 put in the lib/easy.c file.
- Starting with libcurl 7.8, curl_global_init_() and curl_global_cleanup() were
+ curl_global_init_() and curl_global_cleanup() should be called by the
- introduced. They should be called by the application to initialize and clean
+ application to initialize and clean up global stuff in the library. As of
- up global stuff in the library. As of today, they just do the global SSL
+ today, it can handle the global SSL initing if SSL is enabled and it can init
- initing if SSL is enabled. libcurl itself has no "global" scope.
+ the socket layer on windows machines. libcurl itself has no "global" scope.
 All printf()-style functions use the supplied clones in lib/mprintf.c. This
 makes sure we stay absolutely platform independent.
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -0,0 +1,73 @@
 These are problems known to exist at the time of this release. Feel free to
 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!
 * 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
 ------------------------------------------------------------------------------
 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>
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -246,25 +246,25 @@ POST (HTTP)
  -F accepts parameters like -F "name=contents". If you want the contents to
  be read from a file, use <@filename> as contents. When specifying a file,
  you can also specify the file content type by appending ';type=<mime type>'
-  to the file name. You can also post the contents of several files in one field.
+  to the file name. You can also post the contents of several files in one
-  For example, the field name 'coolfiles' is used to send three  files, with
+  field.  For example, the field name 'coolfiles' is used to send three files,
-  different content types using the following syntax:
+  with different content types using the following syntax:
        curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
        http://www.post.com/postit.cgi
  If the content-type is not specified, curl will try to guess from the file
-  extension  (it only knows a few), or use the previously specified type
+  extension (it only knows a few), or use the previously specified type (from
-  (from an earlier file if several files are specified in a list) or else it
+  an earlier file if several files are specified in a list) or else it will
-  will  using the default type 'text/plain'.
+  using the default type 'text/plain'.
  Emulate a fill-in form with -F. Let's say you fill in three fields in a
  form. One field is a file name which to post, one field is your name and one
  field is a file description. We want to post the file we have written named
  "cooltext.txt". To let curl do the posting of this data instead of your
-  favourite browser, you have to read the HTML source of the form page and find
+  favourite browser, you have to read the HTML source of the form page and
-  the names of the input fields. In our example, the input field names are
+  find the names of the input fields. In our example, the input field names
-  'file', 'yourname' and 'filedescription'.
+  are 'file', 'yourname' and 'filedescription'.
        curl -F "file=@cooltext.txt" -F "yourname=Daniel" \
             -F "filedescription=Cool text file with cool text inside" \
@@ -601,15 +601,15 @@ RESUMING FILE TRANSFERS
 Continue downloading a document:
-        curl -c -o file ftp://ftp.server.com/path/file
+        curl -C - -o file ftp://ftp.server.com/path/file
 Continue uploading a document(*1):
-        curl -c -T file ftp://ftp.server.com/path/file
+        curl -C - -T file ftp://ftp.server.com/path/file
 Continue downloading a document from a web server(*2):
-        curl -c -o file http://www.server.com/
+        curl -C - -o file http://www.server.com/
 (*1) = This requires that the ftp server supports the non-standard command
        SIZE. If it doesn't, curl will say so.
@@ -668,8 +668,14 @@ LDAP
  and offer ldap:// support.
  LDAP is a complex thing and writing an LDAP query is not an easy task. I do
-  advice you to dig up the syntax description for that elsewhere, RFC 1959 if
+  advice you to dig up the syntax description for that elsewhere. Two places
-  no other place is better.
+  that might suit you are:
  Netscape's "Netscape Directory SDK 3.0 for C Programmer's Guide Chapter 10:
  Working with LDAP URLs":
  http://developer.netscape.com/docs/manuals/dirsdk/csdk30/url.htm
  RFC 2255, "The LDAP URL Format" http://www.rfc-editor.org/rfc/rfc2255.txt
  To show you an example, this is now I can get all people from my local LDAP
  server that has a certain sub-domain in their email address:
@@ -683,7 +689,7 @@ ENVIRONMENT VARIABLES
  Curl reads and understands the following environment variables:
-        HTTP_PROXY, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY
+        http_proxy, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY
  They should be set for protocol-specific proxies. General proxy should be
  set with
@@ -710,9 +716,9 @@ NETRC
  passwords, so therefor most unix programs won't read this file unless it is
  only readable by yourself (curl doesn't care though).
-  Curl supports .netrc files if told so (using the -n/--netrc option). This is
+  Curl supports .netrc files if told so (using the -n/--netrc and
-  not restricted to only ftp, but curl can use it for all protocols where
+  --netrc-optional options). This is not restricted to only ftp,
-  authentication is used.
+  but curl can use it for all protocols where authentication is used.
  A very simple .netrc file could look something like:
@@ -794,19 +800,39 @@ PERSISTANT CONNECTIONS
 MAILING LISTS
  For your convenience, we have several open mailing lists to discuss curl,
-  its development and things relevant to this.
+  its development and things relevant to this. Get all info at
  http://curl.haxx.se/mail/. The lists available are:
-  To subscribe to the main curl list, mail curl-request@contactor.se with
+  curl-users
  "subscribe <fill in your email address>" in the body.
-  To subscribe to the curl-library users/deverlopers list, follow the
+    Users of the command line tool. How to use it, what doesn't work, new
-  instructions at http://curl.haxx.se/mail/
+    features, related tools, questions, news, installations, compilations,
    running, porting etc.
-  To subscribe to the curl-announce list, to only get information about new
+  curl-library
  releases, follow the instructions at http://curl.haxx.se/mail/
-  To subscribe to the curl-and-PHP list in which curl using with PHP is
+    Developers using or developing libcurl. Bugs, extensions, improvements.
-  discussed, follow the instructions at http://curl.haxx.se/mail/
+
  curl-announce
    Low-traffic. Only announcements of new public versions.
  curl-and-PHP
    Using the curl functions in PHP. Everything curl with a PHP angle. Or PHP
    with a curl angle.
  curl-commits
    Receives notifications on all CVS commits done to the curl source module.
    This can become quite a large amount of mails during intense development,
    be aware. This is for us who liks email...
  curl-www-commits
    Receives notifications on all CVS commits done to the curl www module
    (basicly the web site).  This can become quite a large amount of mails
    during intense changing, be aware. This is for us who liks email...
  Please direct curl questions, feature requests and trouble reports to one of
  these mailing lists instead of mailing any individual.
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -6,69 +6,24 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 man_MANS = \
 	curl.1 \
-	curl-config.1 \
+	curl-config.1
 	curl_easy_cleanup.3 \
 	curl_easy_getinfo.3 \
 	curl_easy_init.3 \
 	curl_easy_perform.3 \
 	curl_easy_setopt.3 \
 	curl_easy_duphandle.3 \
 	curl_formparse.3 \
 	curl_formadd.3 \
 	curl_formfree.3 \
 	curl_getdate.3 \
 	curl_getenv.3 \
 	curl_slist_append.3 \
 	curl_slist_free_all.3 \
 	curl_version.3 \
 	curl_escape.3 \
 	curl_unescape.3 \
 	curl_strequal.3 \
 	curl_strnequal.3 \
 	curl_mprintf.3 \
 	curl_global_init.3 \
 	curl_global_cleanup.3 \
 	libcurl.3
 SUBDIRS = examples
 HTMLPAGES = \
 	curl.html \
-	curl-config.html \
+	curl-config.html
 	curl_easy_cleanup.html \
 	curl_easy_getinfo.html \
 	curl_easy_init.html \
 	curl_easy_perform.html \
 	curl_easy_setopt.html \
 	curl_easy_duphandle.html \
 	curl_formadd.html \
 	curl_formparse.html \
 	curl_formfree.html \
 	curl_getdate.html \
 	curl_getenv.html \
 	curl_slist_append.html \
 	curl_slist_free_all.html \
 	curl_version.html \
 	curl_escape.html \
 	curl_unescape.html \
 	curl_strequal.html \
 	curl_strnequal.html \
 	curl_mprintf.html \
 	curl_global_init.html \
 	curl_global_cleanup.html \
 	libcurl.html \
 	index.html
-EXTRA_DIST = $(man_MANS) \
+SUBDIRS = examples libcurl
-	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \
+
 EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS		\
 	     README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS	\
-	VERSIONS $(HTMLPAGES)
+	     VERSIONS KNOWN_BUGS BINDINGS $(man_MANS) $(HTMLPAGES)
 MAN2HTML= gnroff -man $< | man2html >$@
 SUFFIXES = .1 .3 .html
 html: $(HTMLPAGES)
 	cd libcurl; make html
 .3.html:
 	$(MAN2HTML)
--- a/docs/RESOURCES
+++ b/docs/RESOURCES
@@ -5,10 +5,9 @@
                             \___|\___/|_| \_\_____|
-This document has been introduced in order to let you find documents that
+This document lists documents that specify standards used by curl, software
-specify standards used by curl, software that extends curl, web pages with
+that extends curl, web pages with similar utilities and information pages that
-"competing" utilities and information pages that describe some of the tools
+describe some of the tools that we use to build/compile/develop curl.
 that we use to build/compile/develop curl.
 Standards
 ---------
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -76,3 +76,8 @@ that have contributed with non-trivial parts:
 - Tomasz Lacki <Tomasz.Lacki@primark.pl>
 - Georg Huettenegger <georg@ist.org>
 - John Lask <johnlask@hotmail.com>
 - Eric Lavigne <erlavigne@wanadoo.fr>
 - Marcus Webster <marcus.webster@phocis.com>
 - G<>tz Babin-Ebell <babin<69>ebell@trustcenter.de>
 - Andreas Damm <andreas-sourceforge@radab.org>
 - Jacky Lam <sylam@emsoftltd.com>
--- a/docs/TODO
+++ b/docs/TODO
@@ -17,27 +17,48 @@ TODO
 * Make content encoding/decoding internally be made using a filter system.
 * The new 'multi' interface is being designed. Work out the details, start
   implementing and write test applications!
   [http://curl.haxx.se/dev/multi.h]
 * Add a name resolve cache to libcurl to make repeated fetches to the same
   host name (when persitancy isn't available) faster.
 * Introduce another callback interface for upload/download that makes one
   less copy of data and thus a faster operation.
   [http://curl.haxx.se/dev/no_copy_callbacks.txt]
 * Add configure options that disables certain protocols in libcurl to
   decrease footprint.  '--disable-[protocol]' where protocol is http, ftp,
   telnet, ldap, dict or file.
 * Add asynchronous name resolving. http://curl.haxx.se/dev/async-resolver.txt
   This should be made to work on most of the supported platforms, or
   otherwise it isn't really interesting.
 * Data sharing. Tell which easy handles within a multi handle that should
   share cookies, connection cache, dns cache, ssl session cache.  Full
   suggestion found here: http://curl.haxx.se/dev/sharing.txt
 * Mutexes. By adding mutex callback support, the 'data sharing' mentioned
   above can be made between several easy handles running in different threads
   too. The actual mutex implementations will be left for the application to
   implement, libcurl will merely call 'getmutex' and 'leavemutex' callbacks.
   Part of the sharing suggestion at: http://curl.haxx.se/dev/sharing.txt
 * No-faster-then-this transfers. Many people have limited bandwidth and they
   want the ability to make sure their transfers never use more bandwith than
   they think is good.
 * Set the SO_KEEPALIVE socket option to make libcurl notice and disconnect
   very long time idle connections.
 * Make sure we don't ever loop because of non-blocking sockets return
   EWOULDBLOCK or similar. This concerns the HTTP request sending (and
   especially regular HTTP POST), the FTP command sending etc.
 * Go through the code and verify that libcurl deals with big files >2GB and
   >4GB all over. Bug reports (and source reviews) indicate that it doesn't
   currently work properly.
 * Make the built-in progress meter use its own dedicated output stream, and
   make it possible to set it. Use stderr by default.
 * CURLOPT_MAXFILESIZE. Prevent downloads that are larger than the specified
   size. CURLE_FILESIZE_EXCEEDED would then be returned. Gautam Mani
   requested.
 DOCUMENTATION
 * Document all CURLcode error codes, why they happen and what most likely
   will make them not happen again.
 FTP
@@ -52,11 +73,9 @@ TODO
   already working http dito works. It of course requires that 'MDTM' works,
   and it isn't a standard FTP command.
- * Suggested on the mailing list: CURLOPT_FTP_MKDIR...!
+ * 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-08.txt,
- * Always use the FTP SIZE command before downloading, as that makes it more
+   "Securing FTP with TLS"
   likely that we know the size when downloading. Some sites support SIZE but
   don't show the size in the RETR response!
 HTTP
@@ -65,6 +84,12 @@ TODO
   encoding. [http://curl.haxx.se/dev/HTTP-PUT-stdin.txt] When the filter
   system mentioned above gets real, it'll be a piece of cake to add.
 * Pass a list of host name to libcurl to which we allow the user name and
   password to get sent to. Currently, it only get sent to the host name that
   the first URL uses (to prevent others from being able to read it), but this
   also prevents the authentication info from getting sent when following
   locations to legitimate other host names.
 * "Content-Encoding: compress/gzip/zlib" HTTP 1.1 clearly defines how to get
   and decode compressed documents. There is the zlib that is pretty good at
   decompressing stuff. This work was started in October 1999 but halted again
@@ -81,34 +106,66 @@ TODO
   http://www.innovation.ch/java/ntlm.html that contains detailed reverse-
   engineered info.
- * RFC2617 compliance, "Digest Access Authentication"
+ * RFC2617 compliance, "Digest Access Authentication" A valid test page seem
-   A valid test page seem to exist at:
+   to exist at: http://hopf.math.nwu.edu/testpage/digest/ And some friendly
-   http://hopf.math.nwu.edu/testpage/digest/
+   person's server source code is available at
-   And some friendly person's server source code is available at
+   http://hopf.math.nwu.edu/digestauth/index.html Then there's the Apache
-   http://hopf.math.nwu.edu/digestauth/index.html
+   mod_digest source code too of course.  It seems as if Netscape doesn't
-   Then there's the Apache mod_digest source code too of course.  It seems as
+   support this, and not many servers do. Although this is a lot better
-   if Netscape doesn't support this, and not many servers do. Although this is
+   authentication method than the more common "Basic". Basic sends the
-   a lot better authentication method than the more common "Basic". Basic
+   password in cleartext over the network, this "Digest" method uses a
-   sends the password in cleartext over the network, this "Digest" method uses
+   challange-response protocol which increases security quite a lot.
-   a challange-response protocol which increases security quite a lot.
+
 * Pipelining. Sending multiple requests before the previous one(s) are done.
   This could possibly be implemented using the multi interface to queue
   requests and the response data.
 TELNET
 * Make TELNET work on windows98!
 * Reading input (to send to the remote server) on stdin is a crappy solution
   for library purposes. We need to invent a good way for the application to
   be able to provide the data to send.
 * Move the telnet support's network select() loop go away and merge the code
   into the main transfer loop. Until this is done, the multi interface won't
   work for telnet.
 SSL
 * If you really want to improve the SSL situation, you should probably have a
   look at SSL cafile loading as well - quick traces look to me like these are
   done on every request as well, when they should only be necessary once per
   ssl context (or once per handle). Even better would be to support the SSL
   CAdir option - instead of loading all of the root CA certs for every
   request, this option allows you to only read the CA chain that is actually
   required (into the cache)...
 * Add an interface to libcurl that enables "session IDs" to get
   exported/imported. Cris Bailiff said: "OpenSSL has functions which can
   serialise the current SSL state to a buffer of your choice, and
   recover/reset the state from such a buffer at a later date - this is used
-   by mod_ssl for apache to implement and SSL session ID cache"
+   by mod_ssl for apache to implement and SSL session ID cache". This whole
   idea might become moot if we enable the 'data sharing' as mentioned in the
   LIBCURL label above.
 * OpenSSL supports a callback for customised verification of the peer
   certificate, but this doesn't seem to be exposed in the libcurl APIs. Could
   it be? There's so much that could be done if it were! (brought by Chris
   Clark)
 * Make curl's SSL layer option capable of using other free SSL libraries.
   Such as the Mozilla Security Services
   (http://www.mozilla.org/projects/security/pki/nss/) and GNUTLS
   (http://gnutls.hellug.gr/)
 LDAP
 * Look over the implementation. The looping will have to "go away" from the
   lib/ldap.c source file and get moved to the main network code so that the
   multi interface and friends will work for LDAP as well.
 CLIENT
 * "curl ftp://site.com/*.txt"
@@ -117,6 +174,23 @@ TODO
   the same syntax to specify several files to get uploaded (using the same
   persistant connection), using -T.
 * When the multi interface has been implemented and proved to work, the
   client could be told to use maximum N simultaneous transfers and then just
   make sure that happens. It should of course not make more than one
   connection to the same remote host.
 * Extending the capabilities of the multipart formposting. How about leaving
   the ';type=foo' syntax as it is and adding an extra tag (headers) which
   works like this: curl -F "coolfiles=@fil1.txt;headers=@fil1.hdr" where
   fil1.hdr contains extra headers like
     Content-Type: text/plain; charset=KOI8-R"
     Content-Transfer-Encoding: base64
     X-User-Comment: Please don't use browser specific HTML code
   which should overwrite the program reasonable defaults (plain/text,
   8bit...) (Idea brough to us by kromJx)
 TEST SUITE
 * Extend the test suite to include more protocols. The telnet could just do
--- a/docs/curl-config.1
+++ b/docs/curl-config.1
@@ -2,7 +2,7 @@
 .\" nroff -man curl-config.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl-config 1 "16 August 2001" "Curl 7.8.1" "curl-config manual"
+.TH curl-config 1 "21 January 2002" "Curl 7.9.3" "curl-config manual"
 .SH NAME
 curl-config \- Get information about a libcurl installation
 .SH SYNOPSIS
@@ -11,6 +11,8 @@ curl-config \- Get information about a libcurl installation
 .B curl-config
 displays information about a previous curl and libcurl installation.
 .SH OPTIONS
 .IP "--cc"
 Displays the compiler used to build libcurl.
 .IP "--cflags"
 Set of compiler options (CFLAGS) to use when compiling files that use
 libcurl. Currently that is only thw include path to the curl include files.
@@ -38,18 +40,23 @@ major, minor, patch. So that libcurl 7.7.4 would appear as 070704 and libcurl
 .SH "EXAMPLES"
 What linker options do I need when I link with libcurl?
-  curl-config --libs
+  $ curl-config --libs
 What compiler options do I need when I compile using libcurl functions?
-  curl-config --cflags
+  $ curl-config --cflags
 How do I know if libcurl was built with SSL support?
-  curl-config --feature | grep SSL
+  $ curl-config --feature | grep SSL
 What's the installed libcurl version?
-  curl-config --version
+  $ curl-config --version
 How do I build a single file with a one-line command?
  $ `curl-config --cc --cflags --libs` -o example example.c
 .SH "SEE ALSO"
 .BR curl (1)
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -2,10 +2,9 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "30 Nov 2001" "Curl 7.9.2" "Curl Manual"
+.TH curl 1 "7 May 2002" "Curl 7.9.7" "Curl Manual"
 .SH NAME
-curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
+curl \- transfer a URL
 HTTPS syntax.
 .SH SYNOPSIS
 .B curl [options]
 .I [URL...]
@@ -100,10 +99,7 @@ If this option is used severl times, the last one will override the others.
 .IP "--connect-timeout <seconds>"
 Maximum time in seconds that you allow the connection to the server to take.
 This only limits the connection phase, once curl has connected this option is
-of no more use. This option didn't work in win32 systems until 7.7.2.  See
+of no more use. See also the \fI--max-time\fP option.
 also the
 .I "--max-time"
 option.
 If this option is used several times, the last one will be used.
 .IP "-c/--cookie-jar <file name>"
@@ -126,6 +122,10 @@ Use "-C -" to tell curl to automatically find out where/how to resume the
 transfer. It then uses the given output/input files to figure that out.
 If this option is used several times, the last one will be used.
 .IP "--crlf"
 (FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
 If this option is used twice, the second will again disable crlf converting.
 .IP "-d/--data <data>"
 (HTTP) Sends the specified data in a POST request to the HTTP server, in a way
 that can emulate as if a user has filled in a HTML form and pressed the submit
@@ -168,16 +168,17 @@ append data.
 downloads. Curl will normally always first attempt to use EPSV before PASV,
 but with this option, it will not try using EPSV.
-IF this option is used several times, each occurrence will toggle this on/off.
+If this option is used several times, each occurrence will toggle this on/off.
 .IP "-D/--dump-header <file>"
-(HTTP/FTP)
+Write the protocol headers to the specified file.
 Write the HTTP headers to this file. Write the FTP file info to this
 file if -I/--head is used.
 This option is handy to use when you want to store the cookies that a HTTP
 site sends to you. The cookies could then be read in a second curl invoke by
 using the -b/--cookie option!
 When used on FTP, the ftp server response lines are considered being "headers"
 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
@@ -188,6 +189,12 @@ 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"
 (RISC OS ONLY) Sets a range of environment variables, using the names the -w
 option supports, to easier allow extraction of useful information after having
 run curl.
 If this option is used several times, each occurrence will toggle this on/off.
 .IP "--egd-file <file>"
 (HTTPS) Specify the path name to the Entropy Gathering Daemon socket. The
 socket is used to seed the random engine for SSL connections. See also the
@@ -204,17 +211,25 @@ certificate concatenated!
 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
-peer. The certificate must be in PEM format.
+peer. The file may contain multiple CA certificates. The certificate(s) must
 be in PEM format.
 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. Certificate directories
 are not supported under Windows (because c_rehash uses symbolink links to
 create them). Using --capath can allow curl to make https connections much
 more efficiently than using --cacert if the --cacert file contains many CA certificates.
 If this option is used several times, the last one will be used.
 .IP "-f/--fail"
-(HTTP)
+(HTTP) Fail silently (no output at all) on server errors. This is mostly done
-Fail silently (no output at all) on server errors. This is mostly done
+like this to better enable scripts etc to better deal with failed attempts. In
-like this to better enable scripts etc to better deal with failed
+normal cases when a HTTP server fails to deliver a document, it returns a HTML
-attempts. In normal cases when a HTTP server fails to deliver a
+document stating so (which often also describes why and more). This flag will
-document, it returns a HTML document stating so (which often also
+prevent curl from outputting that and fail silently instead.
 describes why and more). This flag will prevent curl from
 outputting that and fail silently instead.
 If this option is used twice, the second will again disable silent failure.
 .IP "-F/--form <name=content>"
@@ -242,13 +257,17 @@ This option can be used multiple times.
 This option switches off the "URL globbing parser". When you set this option,
 you can specify URLs that contain the letters {}[] without having them being
 interpreted by curl itself. Note that these letters are not normal legal URL
-contents but they should be encoded according to the URI standard. (Option
+contents but they should be encoded according to the URI standard.
 added in curl 7.6)
 .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. (Option added in curl 7.9)
 If used in combination with -I, the POST data will instead be appended to the
 URL with a HEAD request.
 If used multiple times, nothing special happens.
 .IP "-h/--help"
 Usage help.
 .IP "-H/--header <header>"
@@ -261,7 +280,7 @@ 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.
-This option can be used multiple times.
+This option can be used multiple times to add/replace/remove multiple headers.
 .IP "-i/--include"
 (HTTP)
 Include the HTTP-header in the output. The HTTP-header includes things
@@ -282,6 +301,13 @@ which this uses to get nothing but the header of a document. When used
 on a FTP file, curl displays the file size only.
 If this option is used twice, the second will again disable header only.
 .IP "-j/--junk-session-cookies"
 (HTTP) When curl is told to read cookies from a given file, this option will
 make it discard all "session cookies". This will basicly have the same effect
 as if a new session is started. Typical browsers always discard session
 cookies when they're closed down. (Added in 7.9.7)
 If this option is used several times, each occurrence will toggle this on/off.
 .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
@@ -299,6 +325,12 @@ 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
 line. So, it could look similar to this:
 url = "http://curl.haxx.se/docs/"
 This option can be used multiple times.
 .IP "-l/--list-only"
 (FTP)
@@ -307,6 +339,10 @@ Especially useful if you want to machine-parse the contents of an FTP
 directory since the normal directory view doesn't use a standard look
 or format.
 This option causes an FTP NLST command to be sent.  Some FTP servers
 list only files in their response to NLST; they do not include
 subdirectories and symbolic links.
 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
@@ -320,10 +356,8 @@ If this option is used twice, the second will again disable location following.
 .IP "-m/--max-time <seconds>"
 Maximum time in seconds that you allow the whole operation to take.  This is
 useful for preventing your batch jobs from hanging for hours due to slow
-networks or links going down.  This doesn't work fully in win32 systems.
+networks or links going down.  This doesn't work fully in win32 systems.  See
-See also the
+also the \fI--connect-timeout\fP option.
 .I "--connect-timeout"
 option.
 If this option is used several times, the last one will be used.
 .IP "-M/--manual"
@@ -480,6 +514,12 @@ 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 "--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
 you're using a shell with decent redirecting capabilities.
 If this option is used several times, the last one will be used.
 .IP "-t/--telnet-option <OPT=val>"
 Pass options to the telnet protocol. Supported options are:
@@ -499,6 +539,24 @@ this is used on a http(s) server, the PUT command will be used.
 Use the file name "-" (a single dash) to use stdin instead of a given file.
 If this option is used several times, the last one will be used.
 .IP "--trace <file>"
 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.
 If this option is used several times, the last one will be used. (Added in
 curl 7.9.7)
 .IP "--trace-ascii <file>"
 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.
 If this option is used several times, the last one will be used. (Added in
 curl 7.9.7)
 .IP "-u/--user <user:password>"
 Specify user and password to use when fetching. See README.curl for detailed
 examples of how to use this. If no password is specified, curl will
@@ -511,7 +569,7 @@ password is specified, curl will ask for it interactively.
 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 wanna specify
+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
@@ -539,7 +597,7 @@ write "@-".
 The variables present in the output format will be substituted by the value or
 text that curl thinks fit, as described below. All variables are specified
 like %{variable_name} and to output a normal % you just write them like
-%%. You can output a newline by using \\n, a carrige return with \\r and a tab
+%%. You can output a newline by using \\n, a carriage return with \\r and a tab
 space with \\t.
 .B NOTE:
@@ -595,6 +653,9 @@ The average download speed that curl measured for the complete download.
 .TP
 .B speed_upload
 The average upload speed that curl measured for the complete upload.
 .TP
 .B content_type
 The Content-Type of the requested document, if there was any. (Added in 7.9.5)
 .RE
 If this option is used several times, the last one will be used.
@@ -646,6 +707,12 @@ Start the date expression with a dash (-) to make it request for a document
 that is older than the given date/time, default is a document that is newer
 than the specified date/time.
 If this option is used several times, the last one will be used.
 .IP "-Z/--max-redirs <num>"
 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".
 If this option is used several times, the last one will be used.
 .IP "-3/--sslv3"
 (HTTPS)
@@ -661,23 +728,13 @@ Make curl display progress information as a progress bar instead of the
 default statistics.
 If this option is used twice, the second will again disable the progress bar.
 .IP "--crlf"
 (FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
 If this option is used twice, the second will again disable crlf converting.
 .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
 you're using a shell with decent redirecting capabilities.
 If this option is used several times, the last one will be used.
 .SH FILES
 .I ~/.curlrc
 .RS
 Default config file.
 .SH ENVIRONMENT
-.IP "HTTP_PROXY [protocol://]<host>[:port]"
+.IP "http_proxy [protocol://]<host>[:port]"
 Sets proxy server to use for HTTP.
 .IP "HTTPS_PROXY [protocol://]<host>[:port]"
 Sets proxy server to use for HTTPS.
@@ -688,11 +745,8 @@ Sets proxy server to use for GOPHER.
 .IP "ALL_PROXY [protocol://]<host>[:port]"
 Sets proxy server to use if no protocol-specific proxy is set.
 .IP "NO_PROXY <comma-separated list of hosts>"
-list of host names that shouldn't go through any proxy. If set to a
+list of host names that shouldn't go through any proxy. If set to a asterisk
-asterisk '*' only, it matches all hosts.
+'*' only, it matches all hosts.
 .IP "COLUMNS <integer>"
 The width of the terminal.  This variable only affects curl when the
 --progress-bar option is used.
 .SH EXIT CODES
 There exists a bunch of different error codes and their corresponding error
 messages that may appear during bad conditions. At the time of this writing,
@@ -792,7 +846,7 @@ Internal error. A function was called in a bad order.
 .IP 45
 Interface error. A specified outgoing interface could not be used.
 .IP 46
-Bad password entered. An error was signalled when the password was entered.
+Bad password entered. An error was signaled when the password was entered.
 .IP 47
 Too many redirects. When following redirects, curl hit the maximum amount.
 .IP 48
--- a/docs/curl_easy_cleanup.3
+++ b/docs/curl_easy_cleanup.3
@@ -1,29 +0,0 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_cleanup 3 "5 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_easy_cleanup - End a libcurl 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 a curl session. It is the
 opposite of the
 .I curl_easy_init
 function and must be called with the same
 .I handle
 as input as the curl_easy_init call returned.
 This will effectively close all connections libcurl has been used and possibly
 has kept open until now. Don't call this function if you intend to transfer
 more files (libcurl 7.7 or later).
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_init.3
+++ b/docs/curl_easy_init.3
@@ -1,34 +0,0 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_init 3 "14 August 2001" "libcurl 7.8.1" "libcurl Manual"
 .SH NAME
 curl_easy_init - Start a libcurl 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 handle
 that you shall use as input to the other easy-functions. The init calls
 intializes curl and this call MUST have a corresponding call to
 .I curl_easy_cleanup
 when the operation is complete.
 On win32 systems, if you want to init the winsock stuff manually, libcurl will
 not do that for you. WSAStartup() and WSACleanup() should then be called
 accordingly.  If you want libcurl to handle this, use the CURL_GLOBAL_WIN32
 flag in the initial curl_global_init() call.
 Using libcurl 7.7 and later, you should perform all your sequential file
 transfers using the same curl handle. This enables libcurl to use persistant
 connections where possible.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_easy_cleanup "(3), " curl_global_init "(3)
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_formparse.3
+++ b/docs/curl_formparse.3
@@ -1,87 +0,0 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_formparse 3 "21 May 2001" "libcurl 7.7.4" "libcurl Manual"
 .SH NAME
 curl_formparse - add a section to a multipart/formdata HTTP POST:
 deprecated (use curl_formadd instead)
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode curl_formparse(char * " string, " struct HttpPost ** " firstitem,
 .BI "struct HttpPost ** " lastitem ");"
 .ad
 .SH DESCRIPTION
 curl_formparse() is used to append sections when building a multipart/formdata
 HTTP POST (sometimes refered to as rfc1867-style posts). Append one section at
 a time until you've added all the sections you want included and then you pass
 the \fIfirstitem\fP pointer as parameter to \fBCURLOPT_HTTPPOST\fP.
 \fIlastitem\fP is set after each call and on repeated invokes it should be
 left as set to allow repeated invokes to find the end of the list in a faster
 way.  \fIstring\fP must be a zero terminated string abiding to the syntax
 described in a section below
 The pointers \fI*firstitem\fP and \fI*lastitem\fP should both be pointing to
 NULL in the first call to this function. All list-data will be allocated by
 the function itself. You must call \fIcurl_formfree\fP after the form post has
 been done to free the resources again.
 This function will copy all input data and keep its own version of it
 allocated until you call \fIcurl_formfree\fP. When you've passed the pointer
 to \fIcurl_easy_setopt\fP, you must not free the list until after you've
 called \fIcurl_easy_cleanup\fP for the curl handle.
 See example below.
 .SH "FORM PARSE STRINGS"
 The
 .I string 
 parameter must be using one of the following patterns. Note that the []
 letters should not be included in the real-life string.
 .TP 0.8i
 .B [name]=[contents]
 Add a form field named 'name' with the contents 'contents'. This is the
 typcial contents of the HTML tag <input type=text>.
 .TP
 .B [name]=@[filename]
 Add a form field named 'name' with the contents as read from the local file
 named 'filename'. This is the typcial contents of the HTML tag <input
 type=file>.
 .TP
 .B [name]=@[filename1,filename2,...]
 Add a form field named 'name' with the contents as read from the local files
 named 'filename1' and 'filename2'. This is identical to the upper, except that
 you get the contents of several files in one section.
 .TP
 .B [name]=@[filename];[type=<content-type>]
 Whenever you specify a file to read from, you can optionally specify the
 content-type as well. The content-type is passed to the server together with
 the contents of the file. curl_formparse() will guess content-type for a
 number of well-known extensions and otherwise it will set it to binary. You
 can override the internal decision by using this option.
 .TP
 .B [name]=@[filename1,filename2,...];[type=<content-type>]
 When you specify several files to read the contents from, you can set the
 content-type for all of them in the same way as with a single file.
 .PP
 .SH RETURN VALUE
 Returns non-zero if an error occurs.
 .SH EXAMPLE
 HttpPost* post = NULL;
 HttpPost* last = NULL;
 /* Add an image section */
 curl_formparse("picture=@my-face.jpg", &post, &last);
 /* Add a normal text section */
 curl_formparse("name=FooBar", &post, &last);
 /* Set the form info */
 curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3), "
 .BR curl_formadd "(3), "
 .BR curl_formfree "(3)
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -4,9 +4,12 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit.c postit2.c \
+EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c		\
-	     win32sockets.c persistant.c ftpget.c Makefile.example \
+	     persistant.c ftpget.c Makefile.example			\
-	     multithread.c getinmemory.c ftpupload.c httpput.c
+	     multithread.c getinmemory.c ftpupload.c httpput.c		\
 	     simplessl.c ftpgetresp.c http-post.c post-callback.c	\
 	     multi-app.c multi-double.c multi-single.c multi-post.c	\
 	     fopen.c
 all:
 	@echo "done"
--- a/docs/examples/README
+++ b/docs/examples/README
@@ -10,6 +10,10 @@ them for submission in future packages and on the web site.
 The Makefile.example is an example makefile that could be used to build these
 examples. Just edit the file according to your system and requirements first.
 Most examples should build fine using a command line like this:
  $ gcc `curl-config --cflags` `curl-config --libs` -o example example.c
 Try the php/examples/ directory for PHP programming snippets!
  *PLEASE* do not use the curl.haxx.se site as a test target for your libcurl
--- a/docs/examples/curlgtk.c
+++ b/docs/examples/curlgtk.c
@@ -26,7 +26,11 @@ size_t my_read_func(void *ptr, size_t size, size_t nmemb, FILE *stream)
  return fread(ptr, size, nmemb, stream);
 }
-int my_progress_func(GtkWidget *Bar, int t, int d)
+int my_progress_func(GtkWidget *Bar,
                     double t, /* dltotal */
                     double d, /* dlnow */
                     double ultotal,
                     double ulnow)
 {
 /*  printf("%d / %d (%g %%)\n", d, t, d*100.0/t);*/
  gdk_threads_enter();
@@ -50,6 +54,7 @@ void *curl_thread(void *ptr)
    curl_easy_setopt(curl, CURLOPT_URL, url);
    curl_easy_setopt(curl, CURLOPT_FILE, outfile);
    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);
--- a/docs/examples/fopen.c
+++ b/docs/examples/fopen.c
@@ -0,0 +1,222 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * This example source code introduces an fopen()/fread()/fclose() emulation
 * for URL reads. Using an approach similar to this, you could replace your
 * program's fopen() with this url_fopen() and fread() with url_fread() and
 * it should be possible to read remote streams instead of (only) local files.
 *
 * See the main() function at the bottom that shows a tiny app in action.
 *
 * This source code is a proof of concept. It will need further attention to
 * become production-use useful and solid.
 *
 * This example requires libcurl 7.9.7 or later.
 */
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 struct data {
  int type;
  union {
    CURL *curl;
    FILE *file;
  } handle;
  /* TODO: We should perhaps document the biggest possible buffer chunk we can
     get from libcurl in one single callback... */
  char buffer[CURL_MAX_WRITE_SIZE];
  char *readptr; /* read from here */
  int bytes;     /* bytes available from read pointer */
  CURLMcode m;   /* stored from a previous url_fread() */
 };
 typedef struct data URL_FILE;
 /* we use a global one for convenience */
 CURLM *multi_handle;
 static
 size_t write_callback(char *buffer,
                      size_t size,
                      size_t nitems,
                      void *userp)
 {
  URL_FILE *url = (URL_FILE *)userp;
  size *= nitems;
  memcpy(url->readptr, buffer, size);
  url->readptr += size;
  url->bytes += size;
  return size;
 }
 URL_FILE *url_fopen(char *url, char *operation)
 {
  /* this code could check for URLs or types in the 'url' and
     basicly use the real fopen() for standard files */
  URL_FILE *file;
  int still_running;
  file = (URL_FILE *)malloc(sizeof(URL_FILE));
  if(!file)
    return NULL;
  memset(file, 0, sizeof(URL_FILE));
  file->type = 1; /* marked as URL, use 0 for plain file */
  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_VERBOSE, FALSE);
  curl_easy_setopt(file->handle.curl, CURLOPT_WRITEFUNCTION, write_callback);
  if(!multi_handle)
    multi_handle = curl_multi_init();
  curl_multi_add_handle(multi_handle, file->handle.curl);
  while(CURLM_CALL_MULTI_PERFORM ==
        curl_multi_perform(multi_handle, &still_running));
  /* if still_running would be 0 now, we should return NULL */
  return file;
 }
 void url_fclose(URL_FILE *file)
 {
  /* make sure the easy handle is not in the multi handle anymore */
  curl_multi_remove_handle(multi_handle, file->handle.curl);
  /* cleanup */
  curl_easy_cleanup(file->handle.curl);
 }
 size_t url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file)
 {
  fd_set fdread;
  fd_set fdwrite;
  fd_set fdexcep;
  int maxfd;
  struct timeval timeout;
  int rc;
  int still_running = 0;
  if(!file->bytes) { /* no data available at this point */
    file->readptr = file->buffer; /* reset read pointer */
    if(CURLM_CALL_MULTI_PERFORM == file->m) {
      while(CURLM_CALL_MULTI_PERFORM ==
            curl_multi_perform(multi_handle, &still_running)) {
        if(file->bytes) {
          printf("(fread) WOAH! THis happened!\n");
          break;        
        }
      }
      if(!still_running) {
        printf("NO MORE RUNNING AROUND!\n");
        return 0;
      }
    }
    FD_ZERO(&fdread);
    FD_ZERO(&fdwrite);
    FD_ZERO(&fdexcep);
    /* set a suitable timeout to fail on */
    timeout.tv_sec = 500; /* 5 minutes */
    timeout.tv_usec = 0;
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
    switch(rc) {
    case -1:
      /* select error */
      break;
    case 0:
      break;
    default:
      /* timeout or readable/writable sockets */
      do {
        file->m = curl_multi_perform(multi_handle, &still_running);
        if(file->bytes)
          /* we have received data, return that now */
          break;
      } while(CURLM_CALL_MULTI_PERFORM == file->m);
      if(!still_running)
        printf("NO MORE RUNNING AROUND!\n");
      break;
    }
  }
  else
    printf("(fread) Skip network read\n");
  if(file->bytes) {
    /* data already available, return that */
    int want = size * nmemb;
    if(file->bytes < want)
      want = file->bytes;
    memcpy(ptr, file->readptr, want);
    file->readptr += want;
    file->bytes -= want;
    printf("(fread) return %d bytes\n", want);
    return want;
  }
  return 0; /* no data available to return */
 }
 int main(int argc, char *argv[])
 {
  URL_FILE *handle;
  int nread;
  char buffer[256];
  handle = url_fopen("http://www.haxx.se", "r");
  if(!handle) {
    printf("couldn't url_fopen()\n");
  }
  do {
    nread = url_fread(buffer, sizeof(buffer), 1, handle);
    printf("We got: %d bytes\n", nread);
  } while(nread);
  url_fclose(handle);
  return 0;
 }
--- a/docs/examples/ftpget.c
+++ b/docs/examples/ftpget.c
@@ -14,31 +14,70 @@
 #include <curl/types.h>
 #include <curl/easy.h>
-/* to make this work under windows, use the win32-functions from the
+/*
-   win32socket.c file as well */
+ * This is an example showing how to get a single file from an FTP server.
 * It delays the actual destination file creation until the first write
 * callback so that it won't create an empty file in case the remote file
 * doesn't exist or something else fails.
 */
-int main(int argc, char **argv)
+struct FtpFile {
  char *filename;
  FILE *stream;
 };
 int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  struct FtpFile *out=(struct FtpFile *)stream;
  if(out && !out->stream) {
    /* open file for writing */
    out->stream=fopen(out->filename, "wb");
    if(!out->stream)
      return -1; /* failure, can't open file to write */
  }
  return fwrite(buffer, size, nmemb, out->stream);
 }
 int main(void)
 {
  CURL *curl;
  CURLcode res;
-  FILE *ftpfile;
+  struct FtpFile ftpfile={
    "curl.tar.gz", /* name to store the file as if succesful */
    NULL
  };
-  /* local file name to store the file as */
+  curl_global_init(CURL_GLOBAL_DEFAULT);
  ftpfile = fopen("curl.tar.gz", "wb"); /* b is binary for win */
  curl = curl_easy_init();
  if(curl) {
-    /* Get curl 7.7 from sunet.se's FTP site: */
+    /* Get curl 7.9.2 from sunet.se's FTP site: */
    curl_easy_setopt(curl, CURLOPT_URL,
-                     "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.7.tar.gz");
+                     "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.9.2.tar.gz");
-    curl_easy_setopt(curl, CURLOPT_FILE, ftpfile);
+    /* 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);
    /* Switch on full protocol/debug output */
    curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
    if(CURLE_OK != res) {
      /* we failed */
      fprintf(stderr, "curl told us %d\n", res);
    }
  }
-  fclose(ftpfile); /* close the local file */
+  if(ftpfile.stream)
    fclose(ftpfile.stream); /* close the local file */
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/ftpgetresp.c
+++ b/docs/examples/ftpgetresp.c
@@ -0,0 +1,61 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 /*
 * Similar to ftpget.c but this also stores the received response-lines
 * in a separate file using our own callback!
 *
 * This functionality was introduced in libcurl 7.9.3.
 */
 size_t
 write_response(void *ptr, size_t size, size_t nmemb, void *data)
 {
  FILE *writehere = (FILE *)data;
  return fwrite(ptr, size, nmemb, writehere);
 }
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *ftpfile;
  FILE *respfile;
  /* local file name to store the file as */
  ftpfile = fopen("ftp-list", "wb"); /* b is binary, needed on win32 */
  /* local file name to store the FTP server's response lines in */
  respfile = fopen("ftp-responses", "wb"); /* b is binary, needed on win32 */
  curl = curl_easy_init();
  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_HEADERFUNCTION, write_response);
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, respfile);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  fclose(ftpfile); /* close the local file */
  fclose(respfile); /* close the response file */
  return 0;
 }
--- a/docs/examples/http-post.c
+++ b/docs/examples/http-post.c
@@ -0,0 +1,35 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 int main(void)
 {
  CURL *curl;
  CURLcode res;
  curl = curl_easy_init();
  if(curl) {
    /* First set the URL that is about to receive our POST. This URL can
       just as well be a https:// URL if that is what should receive the
       data. */
    curl_easy_setopt(curl, CURLOPT_URL, "http://postit.example.com/moo.cgi");
    /* Now specify the POST data */
    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "name=daniel&project=curl");
    /* Perform the request, res will get the return code */
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return 0;
 }
--- a/docs/examples/multi-app.c
+++ b/docs/examples/multi-app.c
@@ -0,0 +1,98 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * This is an example application source code using the multi interface.
 */
 #include <stdio.h>
 #include <string.h>
 /* somewhat unix-specific */
 #include <sys/time.h>
 #include <unistd.h>
 /* curl stuff */
 #include <curl/curl.h>
 /*
 * Download a HTTP file and upload an FTP file simultaneously.
 */
 int main(int argc, char **argv)
 {
  CURL *http_handle;
  CURL *ftp_handle;
  CURLM *multi_handle;
  int still_running; /* keep number of running handles */
  http_handle = curl_easy_init();
  ftp_handle  = curl_easy_init();
  /* set the options (I left out a few, you'll get the point anyway) */
  curl_easy_setopt(http_handle, CURLOPT_URL, "http://website.com");
  curl_easy_setopt(ftp_handle, CURLOPT_URL, "ftp://ftpsite.com");
  curl_easy_setopt(ftp_handle, CURLOPT_UPLOAD, TRUE);
  /* init a multi stack */
  multi_handle = curl_multi_init();
  /* add the individual transfers */
  curl_multi_add_handle(multi_handle, http_handle);
  curl_multi_add_handle(multi_handle, ftp_handle);
  /* we start some action by calling perform right away */
  while(CURLM_CALL_MULTI_PERFORM ==
        curl_multi_perform(multi_handle, &still_running));
  while(still_running) {
    struct timeval timeout;
    int rc; /* select() return code */
    fd_set fdread;
    fd_set fdwrite;
    fd_set fdexcep;
    int maxfd;
    FD_ZERO(&fdread);
    FD_ZERO(&fdwrite);
    FD_ZERO(&fdexcep);
    /* set a suitable timeout to play around with */
    timeout.tv_sec = 1;
    timeout.tv_usec = 0;
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
    switch(rc) {
    case -1:
      /* select error */
      break;
    case 0:
      /* timeout, do something else */
      break;
    default:
      /* one or more of curl's file descriptors say there's data to read
         or write */
      curl_multi_perform(multi_handle, &still_running);
      break;
    }
  }
  curl_multi_cleanup(multi_handle);
  curl_easy_cleanup(http_handle);
  curl_easy_cleanup(ftp_handle);
  return 0;
 }
--- a/docs/examples/multi-double.c
+++ b/docs/examples/multi-double.c
@@ -0,0 +1,94 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * This is a very simple example using the multi interface.
 */
 #include <stdio.h>
 #include <string.h>
 /* somewhat unix-specific */
 #include <sys/time.h>
 #include <unistd.h>
 /* curl stuff */
 #include <curl/curl.h>
 /*
 * Simply download two HTTP files!
 */
 int main(int argc, char **argv)
 {
  CURL *http_handle;
  CURL *http_handle2;
  CURLM *multi_handle;
  int still_running; /* keep number of running handles */
  http_handle = curl_easy_init();
  http_handle2 = curl_easy_init();
  /* set options */
  curl_easy_setopt(http_handle, CURLOPT_URL, "http://www.haxx.se/");
  /* set options */
  curl_easy_setopt(http_handle2, CURLOPT_URL, "http://localhost/");
  /* init a multi stack */
  multi_handle = curl_multi_init();
  /* add the individual transfers */
  curl_multi_add_handle(multi_handle, http_handle);
  curl_multi_add_handle(multi_handle, http_handle2);
  /* we start some action by calling perform right away */
  while(CURLM_CALL_MULTI_PERFORM ==
        curl_multi_perform(multi_handle, &still_running));
  while(still_running) {
    struct timeval timeout;
    int rc; /* select() return code */
    fd_set fdread;
    fd_set fdwrite;
    fd_set fdexcep;
    int maxfd;
    FD_ZERO(&fdread);
    FD_ZERO(&fdwrite);
    FD_ZERO(&fdexcep);
    /* set a suitable timeout to play around with */
    timeout.tv_sec = 1;
    timeout.tv_usec = 0;
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
    switch(rc) {
    case -1:
      /* select error */
      break;
    case 0:
    default:
      /* timeout or readable/writable sockets */
      curl_multi_perform(multi_handle, &still_running);
      break;
    }
  }
  curl_multi_cleanup(multi_handle);
  curl_easy_cleanup(http_handle);
  curl_easy_cleanup(http_handle2);
  return 0;
 }
--- a/docs/examples/multi-post.c
+++ b/docs/examples/multi-post.c
@@ -0,0 +1,126 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * This is an example application source code using the multi interface
 * to do a multipart formpost without "blocking".
 */
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <curl/curl.h>
 int main(int argc, char *argv[])
 {
  CURL *curl;
  CURLcode res;
  CURLM *multi_handle;
  int still_running;
  struct HttpPost *formpost=NULL;
  struct HttpPost *lastptr=NULL;
  struct curl_slist *headerlist=NULL;
  char buf[] = "Expect:";
  /* Fill in the file upload field */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "sendfile",
               CURLFORM_FILE, "postit2.c",
               CURLFORM_END);
  /* Fill in the filename field */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "filename",
               CURLFORM_COPYCONTENTS, "postit2.c",
               CURLFORM_END);
  /* Fill in the submit field too, even if this is rarely needed */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "submit",
               CURLFORM_COPYCONTENTS, "send",
               CURLFORM_END);
  curl = curl_easy_init();
  multi_handle = curl_multi_init();
  /* initalize custom header list (stating that Expect: 100-continue is not
     wanted */
  headerlist = curl_slist_append(headerlist, buf);
  if(curl && multi_handle) {
    int perform=0;
    /* what URL that receives this POST */
    curl_easy_setopt(curl, CURLOPT_URL,
                     "http://www.fillinyoururl.com/upload.cgi");
    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
    curl_multi_add_handle(multi_handle, curl);
    while(CURLM_CALL_MULTI_PERFORM ==
          curl_multi_perform(multi_handle, &still_running));
    while(still_running) {
      struct timeval timeout;
      int rc; /* select() return code */
      fd_set fdread;
      fd_set fdwrite;
      fd_set fdexcep;
      int maxfd;
      FD_ZERO(&fdread);
      FD_ZERO(&fdwrite);
      FD_ZERO(&fdexcep);
      /* set a suitable timeout to play around with */
      timeout.tv_sec = 1;
      timeout.tv_usec = 0;
      /* get file descriptors from the transfers */
      curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
      rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
      switch(rc) {
      case -1:
        /* select error */
        break;
      case 0:
        printf("timeout!\n");
      default:
        /* timeout or readable/writable sockets */
        printf("perform!\n");
        while(CURLM_CALL_MULTI_PERFORM ==
              curl_multi_perform(multi_handle, &still_running));
        printf("running: %d!\n", still_running);
        break;
      }
    }
    curl_multi_cleanup(multi_handle);
    /* always cleanup */
    curl_easy_cleanup(curl);
    /* then cleanup the formpost chain */
    curl_formfree(formpost);
    /* free slist */
    curl_slist_free_all (headerlist);
  }
  return 0;
 }
--- a/docs/examples/multi-single.c
+++ b/docs/examples/multi-single.c
@@ -0,0 +1,87 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * This is a very simple example using the multi interface.
 */
 #include <stdio.h>
 #include <string.h>
 /* somewhat unix-specific */
 #include <sys/time.h>
 #include <unistd.h>
 /* curl stuff */
 #include <curl/curl.h>
 /*
 * Simply download a HTTP file.
 */
 int main(int argc, char **argv)
 {
  CURL *http_handle;
  CURLM *multi_handle;
  int still_running; /* keep number of running handles */
  http_handle = curl_easy_init();
  /* set the options (I left out a few, you'll get the point anyway) */
  curl_easy_setopt(http_handle, CURLOPT_URL, "http://www.haxx.se/");
  /* init a multi stack */
  multi_handle = curl_multi_init();
  /* add the individual transfers */
  curl_multi_add_handle(multi_handle, http_handle);
  /* we start some action by calling perform right away */
  while(CURLM_CALL_MULTI_PERFORM ==
        curl_multi_perform(multi_handle, &still_running));
  while(still_running) {
    struct timeval timeout;
    int rc; /* select() return code */
    fd_set fdread;
    fd_set fdwrite;
    fd_set fdexcep;
    int maxfd;
    FD_ZERO(&fdread);
    FD_ZERO(&fdwrite);
    FD_ZERO(&fdexcep);
    /* set a suitable timeout to play around with */
    timeout.tv_sec = 1;
    timeout.tv_usec = 0;
    /* get file descriptors from the transfers */
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
    switch(rc) {
    case -1:
      /* select error */
      break;
    case 0:
    default:
      /* timeout or readable/writable sockets */
      curl_multi_perform(multi_handle, &still_running);
      break;
    }
  }
  curl_multi_cleanup(multi_handle);
  curl_easy_cleanup(http_handle);
  return 0;
 }
--- a/docs/examples/post-callback.c
+++ b/docs/examples/post-callback.c
@@ -0,0 +1,89 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * 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 {
  char *readptr;
  int sizeleft;
 };
 size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
 {
  struct WriteThis *pooh = (struct WriteThis *)userp;
  if(size*nmemb < 1)
    return 0;
  if(pooh->sizeleft) {
    *(char *)ptr = pooh->readptr[0]; /* copy one single byte */
    pooh->readptr++;                 /* advance pointer */
    pooh->sizeleft--;                /* less data left */
    return 1;                        /* we return 1 byte at a time! */
  }
  return -1;                         /* no more data left to deliver */
 }
 int main(void)
 {
  CURL *curl;
  CURLcode res;
  struct WriteThis pooh;
  pooh.readptr = data;
  pooh.sizeleft = strlen(data);
  curl = curl_easy_init();
  if(curl) {
    /* First set the URL that is about to receive our POST. */
    curl_easy_setopt(curl, CURLOPT_URL,
                     "http://receivingsite.com.pooh/index.cgi");
    /* Now specify we want to POST data */
    curl_easy_setopt(curl, CURLOPT_POST, TRUE);
    /* Set the expected POST size */
    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, pooh.sizeleft);
    /* we want to use our own read function */
    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
    /* pointer to pass to our read function */
    curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
    /* get verbose debug output please */
    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
    /* Perform the request, res will get the return code */
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return 0;
 }
--- a/docs/examples/postit.c
+++ b/docs/examples/postit.c
@@ -1,71 +0,0 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * Example code that uploads a file name 'foo' to a remote script that accepts
 * "HTML form based" (as described in RFC1738) uploads using HTTP POST.
 *
 * The imaginary form we'll fill in looks like:
 *
 * <form method="post" enctype="multipart/form-data" action="examplepost.cgi">
 * Enter file: <input type="file" name="sendfile" size="40">
 * Enter file name: <input type="text" name="filename" size="30">
 * <input type="submit" value="send" name="submit">
 * </form>
 *
 * 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>
 #include <curl/types.h>
 #include <curl/easy.h>
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  struct HttpPost *formpost=NULL;
  struct HttpPost *lastptr=NULL;
  /* Fill in the file upload field */
  curl_formparse("sendfile=@foo",
                 &formpost,
                 &lastptr);
  /* Fill in the filename field */
  curl_formparse("filename=foo",
                 &formpost,
                 &lastptr);
  /* Fill in the submit field too, even if this is rarely needed */
  curl_formparse("submit=send",
                 &formpost,
                 &lastptr);
  curl = curl_easy_init();
  if(curl) {
    /* what URL that receives this POST */
    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/examplepost.cgi");
    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
    /* then cleanup the formpost chain */
    curl_formfree(formpost);
  }
  return 0;
 }
--- a/docs/examples/simple.c
+++ b/docs/examples/simple.c
@@ -9,27 +9,16 @@
 */
 #include <stdio.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
-/* to make this work under windows, use the win32-functions from the
+int main(void)
   win32socket.c file as well */
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *headerfile;
  headerfile = fopen("dumpit", "w");
  curl = curl_easy_init();
  if(curl) {
    /* what call to write: */
    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, headerfile);
    res = curl_easy_perform(curl);
    /* always cleanup */
--- a/docs/examples/simplessl.c
+++ b/docs/examples/simplessl.c
@@ -0,0 +1,118 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 /* some requirements for this to work:
   1.   set pCertFile to the file with the client certificate
   2.   if the key is passphrase protected, set pPassphrase to the
        passphrase you use
   3.   if you are using a crypto engine:
   3.1. set a #define USE_ENGINE
   3.2. set pEngine to the name of the crypto engine you use
   3.3. set pKeyName to the key identifier you want to use
   4.   if you don't use a crypto engine:
   4.1. set pKeyName to the file name of your client key
   4.2. if the format of the key file is DER, set pKeyType to "DER"
   !! verify of the server certificate is not implemented here !!
   **** This example only works with libcurl 7.9.3 and later! ****
 */
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *headerfile;
  const char *pCertFile = "testcert.pem";
  const char *pCACertFile="cacert.pem"
  const char *pKeyName;
  const char *pKeyType;
  const char *pEngine;
 #if USE_ENGINE
  pKeyName  = "rsa_test";
  pKeyType  = "ENG";
  pEngine   = "chil";            /* for nChiper HSM... */
 #else
  pKeyName  = "testkey.pem";
  pKeyType  = "PEM";
  pEngine   = NULL;
 #endif
  const char *pPassphrase = NULL;
  headerfile = fopen("dumpit", "w");
  curl_global_init(CURL_GLOBAL_DEFAULT);
  curl = curl_easy_init();
  if(curl) {
    /* what call to write: */
    curl_easy_setopt(curl, CURLOPT_URL, "HTTPS://curl.haxx.se");
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, headerfile);
    while(1)                    /* do some ugly short cut... */
    {
       if (pEngine)             /* use crypto engine */
       {
          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE,pEngine) != CURLE_OK)
          {                     /* load the crypto engine */
             fprintf(stderr,"can't set crypto engine\n");
             break;
          }
          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE_DEFAULT,1) != CURLE_OK)
          {                     /* set the crypto engine as default */
                                /* only needed for the first time you load
                                   a engine in a curl object... */
             fprintf(stderr,"can't set crypto engine as default\n");
             break;
          }
       }
                                /* cert is stored PEM coded in file... */
                                /* since PEM is default, we needn't set it for PEM */
       curl_easy_setopt(curl,CURLOPT_SSLCERTTYPE,"PEM");
                                /* set the cert for client authentication */
       curl_easy_setopt(curl,CURLOPT_SSLCERT,pCertFile);
                                /* sorry, for engine we must set the passphrase
                                   (if the key has one...) */
       if (pPassphrase)
          curl_easy_setopt(curl,CURLOPT_SSLKEYPASSWD,pPassphrase);
                                /* if we use a key stored in a crypto engine,
                                   we must set the key type to "ENG" */
       curl_easy_setopt(curl,CURLOPT_SSLKEYTYPE,pKeyType);
                                /* set the private key (file or ID in engine) */
       curl_easy_setopt(curl,CURLOPT_SSLKEY,pKeyName);
                                /* set the file with the certs vaildating the server */
       curl_easy_setopt(curl,CURLOPT_CAINFO,pCACertFile);
                                /* disconnect if we can't validate server's cert */
       curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,1);
       res = curl_easy_perform(curl);
       break;                   /* we are done... */
    }
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/win32sockets.c
+++ b/docs/examples/win32sockets.c
@@ -1,49 +0,0 @@
 /*
 * Note: This is only required if you use curl 7.8 or lower, later 
 * versions provide an option to curl_global_init() that does the
 * win32 initialization for you.
 */
 /*
 * These are example functions doing socket init that Windows
 * require. If you don't use windows, you can safely ignore this crap.
 */
 #include <windows.h>
 void win32_cleanup(void)
 {
  WSACleanup();
 }
 int win32_init(void)
 {
  WORD wVersionRequested;  
  WSADATA wsaData; 
  int err; 
  wVersionRequested = MAKEWORD(1, 1); 
  err = WSAStartup(wVersionRequested, &wsaData); 
  if (err != 0) 
    /* Tell the user that we couldn't find a useable */ 
    /* winsock.dll.     */ 
    return 1;
  /* Confirm that the Windows Sockets DLL supports 1.1.*/ 
  /* Note that if the DLL supports versions greater */ 
  /* than 1.1 in addition to 1.1, it will still return */ 
  /* 1.1 in wVersion since that is the version we */ 
  /* requested. */ 
  if ( LOBYTE( wsaData.wVersion ) != 1 || 
       HIBYTE( wsaData.wVersion ) != 1 ) { 
    /* Tell the user that we couldn't find a useable */ 
    /* winsock.dll. */ 
    WSACleanup(); 
    return 1; 
  }
  return 0; /* 0 is ok */
 }
--- a/docs/libcurl-the-guide
+++ b/docs/libcurl-the-guide
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -0,0 +1,86 @@
 #
 # $Id$
 #
 AUTOMAKE_OPTIONS = foreign no-dependencies
 man_MANS = \
 	curl_easy_cleanup.3 \
 	curl_easy_getinfo.3 \
 	curl_easy_init.3 \
 	curl_easy_perform.3 \
 	curl_easy_setopt.3 \
 	curl_easy_duphandle.3 \
 	curl_formparse.3 \
 	curl_formadd.3 \
 	curl_formfree.3 \
 	curl_getdate.3 \
 	curl_getenv.3 \
 	curl_slist_append.3 \
 	curl_slist_free_all.3 \
 	curl_version.3 \
 	curl_escape.3 \
 	curl_unescape.3 \
 	curl_strequal.3 \
 	curl_strnequal.3 \
 	curl_mprintf.3 \
 	curl_global_init.3 \
 	curl_global_cleanup.3 \
 	libcurl.3 \
 	curl_multi_add_handle.3 \
 	curl_multi_cleanup.3 \
 	curl_multi_fdset.3 \
 	curl_multi_info_read.3 \
 	curl_multi_init.3 \
 	curl_multi_perform.3 \
 	curl_multi_remove_handle.3 \
 	libcurl-multi.3 \
 	libcurl-errors.3
 HTMLPAGES = \
 	curl_easy_cleanup.html \
 	curl_easy_getinfo.html \
 	curl_easy_init.html \
 	curl_easy_perform.html \
 	curl_easy_setopt.html \
 	curl_easy_duphandle.html \
 	curl_formadd.html \
 	curl_formparse.html \
 	curl_formfree.html \
 	curl_getdate.html \
 	curl_getenv.html \
 	curl_slist_append.html \
 	curl_slist_free_all.html \
 	curl_version.html \
 	curl_escape.html \
 	curl_unescape.html \
 	curl_strequal.html \
 	curl_strnequal.html \
 	curl_mprintf.html \
 	curl_global_init.html \
 	curl_global_cleanup.html \
 	libcurl.html \
 	curl_multi_add_handle.html \
 	curl_multi_cleanup.html \
 	curl_multi_fdset.html \
 	curl_multi_info_read.html \
 	curl_multi_init.html \
 	curl_multi_perform.html \
 	curl_multi_remove_handle.html \
 	libcurl-multi.html \
 	libcurl-errors.html \
 	index.html
 EXTRA_DIST = $(man_MANS) $(HTMLPAGES)
 MAN2HTML= gnroff -man $< | man2html >$@
 SUFFIXES = .1 .3 .html
 html: $(HTMLPAGES)
 .3.html:
 	$(MAN2HTML)
 .1.html:
 	$(MAN2HTML)
--- a/docs/libcurl/curl_easy_cleanup.3
+++ b/docs/libcurl/curl_easy_cleanup.3
@@ -0,0 +1,25 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_cleanup 3 "4 March 2002" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 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.
 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
 more files.
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), "
--- a/docs/libcurl/curl_easy_duphandle.3
+++ b/docs/libcurl/curl_easy_duphandle.3
--- a/docs/libcurl/curl_easy_getinfo.3
+++ b/docs/libcurl/curl_easy_getinfo.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_easy_init 3 "5 March 2001" "libcurl 7.6.1" "libcurl Manual"
+.TH curl_easy_init 3 "25 Apr 2002" "libcurl 7.9.7" "libcurl Manual"
 .SH NAME
 curl_easy_getinfo - Extract information from a curl session (added in 7.4)
 .SH SYNOPSIS
@@ -30,13 +30,17 @@ Pass a pointer to a long to receive the last received HTTP code.
 .TP
 .B CURLINFO_FILETIME
 Pass a pointer to a long to receive the remote time of the retrieved
-document. If you get 0, it can be because of many reasons (unknown, the server
+document. If you get -1, it can be because of many reasons (unknown, the
-hides it or the server doesn't support the command that tells document time
+server hides it or the server doesn't support the command that tells document
-etc) and the time of the document is unknown. (Added in 7.5)
+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
 Pass a pointer to a double to receive the total transaction time in seconds
-for the previous transfer.
+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
 Pass a pointer to a double to receive the time, in seconds, it took from the
@@ -58,6 +62,16 @@ 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
 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
 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
 Pass a pointer to a double to receive the total amount of bytes that were
 uploaded.
@@ -95,6 +109,12 @@ is the value read from the Content-Length: field.  (Added in 7.6.1)
 .B 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
 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)
 .PP
 .SH RETURN VALUE
--- a/docs/libcurl/curl_easy_init.3
+++ b/docs/libcurl/curl_easy_init.3
@@ -0,0 +1,25 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_init 3 "4 March 2002" "libcurl 7.8.1" "libcurl Manual"
 .SH NAME
 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.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_easy_cleanup "(3), " curl_global_init "(3)
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/libcurl/curl_easy_perform.3
+++ b/docs/libcurl/curl_easy_perform.3
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_easy_setopt 3 "30 Nov 2001" "libcurl 7.9.2" "libcurl Manual"
+.TH curl_easy_setopt 3 "28 May 2002" "libcurl 7.9.8" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - Set curl easy-session options
 .SH SYNOPSIS
@@ -35,8 +35,8 @@ The \fIhandle\fP is the return code from a \fIcurl_easy_init(3)\fP or
 \fIcurl_easy_duphandle(3)\fP call.
 .SH OPTIONS
 The options are listed in a sort of random order, but you'll figure it out!
-.TP 0.8i
+.TP 0.4i
-.B CURLOPT_FILE
+.B CURLOPT_WRITEDATA
 Data pointer to pass to the file write function. Note that if you specify the
 \fICURLOPT_WRITEFUNCTION\fP, this is the pointer you'll get as input. If you
 don't use a callback, you must pass a 'FILE *' as libcurl will pass this to
@@ -45,30 +45,35 @@ fwrite() when writing data.
 \fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use the
 \fICURLOPT_WRITEFUNCTION\fP if you set this option or you will experience
 crashes.
 This option is also known with the older name \fBCURLOPT_FILE\fP.
 .TP
 .B CURLOPT_WRITEFUNCTION
 Function pointer that should match the following prototype: \fBsize_t
 function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
-function gets called by libcurl as soon as there is data available to pass
+function gets called by libcurl as soon as there is data available that needs
-available that needs to be saved. The size of the data pointed to by \fIptr\fP
+to be saved. The size of the data pointed to by \fIptr\fP is \fIsize\fP
-is \fIsize\fP multiplied with \fInmemb\fP.  Return the number of bytes
+multiplied with \fInmemb\fP.  Return the number of bytes actually taken care
-actually taken care of. If that amount differs from the amount passed to your
+of. If that amount differs from the amount passed to your function, it'll
-function, it'll signal an error to the library and it will abort the transfer
+signal an error to the library and it will abort the transfer and return
-and return \fICURLE_WRITE_ERROR\fP.
+\fICURLE_WRITE_ERROR\fP.
 Set the \fIstream\fP argument with the \fBCURLOPT_FILE\fP option.
 \fBNOTE:\fP you will be passed as much data as possible in all invokes, but
 you cannot possibly make any assumptions. It may be one byte, it may be
-thousands.
+thousands. The maximum amount of data that can be passed to the write callback
 is defined in the curl.h header file: CURL_MAX_WRITE_SIZE.
 .TP
-.B CURLOPT_INFILE
+.B CURLOPT_READDATA
 Data pointer to pass to the file read function. Note that if you specify the
 \fICURLOPT_READFUNCTION\fP, this is the pointer you'll get as input. If you
 don't specify a read callback, this must be a valid FILE *.
 \fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use a
 \fICURLOPT_READFUNCTION\fP if you set this option.
 This option is also known with the older name \fBCURLOPT_INFILE\fP.
 .TP
 .B CURLOPT_READFUNCTION
 Function pointer that should match the following prototype: \fBsize_t
@@ -77,9 +82,8 @@ function gets called by libcurl as soon as it needs to read data in order to
 send it to the peer. The data area pointed at by the pointer \fIptr\fP may be
 filled with at most \fIsize\fP multiplied with \fInmemb\fP number of
 bytes. Your function must return the actual number of bytes that you stored in
-that memory area. Returning -1 will signal an error to the library and cause
+that memory area. Returning 0 will signal end-of-file to the library and cause
-it to abort the current transfer immediately (with a \fICURLE_READ_ERROR\fP
+it to stop the current transfer.
 return code).
 .TP
 .B CURLOPT_INFILESIZE
 When uploading a file to a remote site, this option should be used to tell
@@ -167,16 +171,49 @@ will imply this option.
 A non-zero parameter tells the library to just list the names of an ftp
 directory, instead of doing a full directory listing that would include file
 sizes, dates etc.
 This causes an FTP NLST command to be sent.  Beware that some FTP servers
 list only files in their response to NLST; they do not include
 subdirectories and symbolic links.
 .TP
 .B CURLOPT_FTPAPPEND
 A non-zero parameter tells the library to append to the remote file instead of
 overwrite it. This is only useful when uploading to a ftp site.
 .TP
 .B CURLOPT_NETRC
-A non-zero parameter tells the library to scan your \fI~/.netrc\fP file to
+This parameter controls the preference of libcurl between using user names and
-find user name and password for the remote site you are about to access. Only
+passwords from your \fI~/.netrc\fP file, relative to user names and passwords
-machine name, user name and password is taken into account (init macros and
+in the URL supplied with \fICURLOPT_URL\fP.
-similar things aren't supported).
+
 \fBNote:\fP libcurl uses a user name (and supplied or prompted password)
 supplied with \fICURLOPT_USERPWD\fP in preference to any of the options
 controlled by this parameter.
 Pass a long, set to one of the values described below.
 .RS
 .TP 5
 .B CURL_NETRC_OPTIONAL
 The use of your \fI~/.netrc\fP file is optional,
 and information in the URL is to be preferred.  The file will be scanned
 with the host and user name (to find the password only) or with the host only,
 to find the first user name and password after that \fImachine\fP,
 which ever information is not specified in the URL.
 Undefined values of the option will have this effect.
 .TP     
 .B CURL_NETRC_IGNORED
 The library will ignore the file and use only the information in the URL.
 This is the default.
 .TP
 .B CURL_NETRC_REQUIRED
 This value tells the library that use of the file is required,
 to ignore the information in the URL,
 and to search the file with the host only.
 .RE
 .TP
 Only machine name, user name and password are taken into account 
 (init macros and similar things aren't supported).
 \fBNote:\fP libcurl does not verify that the file has the correct properties
 set (as the standard Unix ftp client does). It should only be readable by
@@ -294,6 +331,13 @@ want the transfer to start from.
 Pass a pointer to a zero terminated string as parameter. It will be used to
 set a cookie in the http request. The format of the string should be
 [NAME]=[CONTENTS]; Where NAME is the cookie name.
 If you need to set mulitple cookies, you need to set them all using a single
 option and thus you need to concat them all in one single string. Set multiple
 cookies in one string like this: "name1=content1; name2=content2;" etc.
 Using this option multiple times will only make the latest string override the
 previously ones.
 .TP
 .B CURLOPT_HTTPHEADER
 Pass a pointer to a linked list of HTTP headers to pass to the server in your
@@ -320,13 +364,59 @@ with \fIcurl_easy_cleanup(3)\fP.
 .TP
 .B CURLOPT_SSLCERT
 Pass a pointer to a zero terminated string as parameter. The string should be
-the file name of your certificate in PEM format.
+the file name of your certificate. The default format is "PEM" and can be
 changed with \fICURLOPT_SSLCERTTYPE\fP.
 .TP
 .B CURLOPT_SSLCERTTYPE
 Pass a pointer to a zero terminated string as parameter. The string should be
 the format of your certificate. Supported formats are "PEM" and "DER".  (Added
 in 7.9.3)
 .TP
 .B CURLOPT_SSLCERTPASSWD
 Pass a pointer to a zero terminated string as parameter. It will be used as
 the password required to use the CURLOPT_SSLCERT certificate. If the password
 is not supplied, you will be prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can
 be used to set your own prompt function.
 \fBNOTE:\fPThis option is replaced by \fICURLOPT_SSLKEYPASSWD\fP and only
 cept for backward compatibility. You never needed a pass phrase to load
 a certificate but you need one to load your private key.
 .TP
 .B CURLOPT_SSLKEY
 Pass a pointer to a zero terminated string as parameter. The string should be
 the file name of your private key. The default format is "PEM" and can be
 changed with \fICURLOPT_SSLKEYTYPE\fP. (Added in 7.9.3)
 .TP
 .B CURLOPT_SSLKEYTYPE
 Pass a pointer to a zero terminated string as parameter. The string should be
 the format of your private key. Supported formats are "PEM", "DER" and "ENG".
 (Added in 7.9.3)
 \fBNOTE:\fPThe format "ENG" enables you to load the private key from a crypto
 engine. in this case \fICURLOPT_SSLKEY\fP is used as an identifier passed to
 the engine. You have to set the crypto engine with \fICURLOPT_SSL_ENGINE\fP.
 .TP
 .B CURLOPT_SSLKEYASSWD
 Pass a pointer to a zero terminated string as parameter. It will be used as
 the password required to use the \fICURLOPT_SSLKEY\fP private key. If the
 password is not supplied, you will be prompted for
 it. \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own prompt function.
 (Added in 7.9.3)
 .TP
 .B CURLOPT_SSL_ENGINE
 Pass a pointer to a zero terminated string as parameter. It will be used as
 the identifier for the crypto engine you want to use for your private
 key. (Added in 7.9.3)
 \fBNOTE:\fPIf the crypto device cannot be loaded,
 \fICURLE_SSL_ENGINE_NOTFOUND\fP is returned.
 .TP
 .B CURLOPT_SSL_ENGINEDEFAULT
 Sets the actual crypto engine as the default for (asymetric) crypto
 operations. (Added in 7.9.3)
 \fBNOTE:\fPIf the crypto device cannot be set,
 \fICURLE_SSL_ENGINE_SETFAILED\fP is returned.
 .TP
 .B CURLOPT_CRLF
 Convert Unix newlines to CRLF newlines on FTP uploads.
@@ -383,8 +473,8 @@ TIMECOND_IFUNMODSINCE. This is a HTTP-only feature. (TBD)
 .TP
 .B CURLOPT_TIMEVALUE
 Pass a long as parameter. This should be the time in seconds since 1 jan 1970,
-and the time will be used as specified in CURLOPT_TIMECONDITION or if that
+and the time will be used in a condition as specified with
-isn't used, it will be TIMECOND_IFMODSINCE by default.
+CURLOPT_TIMECONDITION.
 .TP
 .B CURLOPT_CUSTOMREQUEST
 Pass a pointer to a zero terminated string as parameter. It will be user
@@ -424,12 +514,20 @@ argument in the progress callback set with \fICURLOPT_PROGRESSFUNCTION\fP.
 .B CURLOPT_SSL_VERIFYPEER
 Pass a long that is set to a non-zero value to make curl verify the peer's
 certificate. The certificate to verify against must be specified with the
-CURLOPT_CAINFO option. (Added in 7.4.2)
+CURLOPT_CAINFO option (Added in 7.4.2) or a certificate directory must be specified
 with the CURLOPT_CAPATH option (Added in 7.9.8).
 .TP
 .B CURLOPT_CAINFO
-Pass a char * to a zero terminated file naming holding the certificate to
+Pass a char * to a zero terminated string naming a file holding one or more
-verify the peer with. This only makes sense when used in combination with the
+certificates to verify the peer with. This only makes sense when used in
-CURLOPT_SSL_VERIFYPEER option. (Added in 7.4.2)
+combination with the CURLOPT_SSL_VERIFYPEER option. (Added in 7.4.2)
 .TP
 .B CURLOPT_CAPATH
 Pass a char * to a zero terminated string naming a directory holding multiple CA
 certificates to verify the peer with. The certificate directory must be prepared using
 the openssl c_rehash utility. This only makes sense when used in combination with the
 CURLOPT_SSL_VERIFYPEER option. The CAPATH function apparently does not work in Windows
 due to some limitation in openssl. (Added in 7.9.8)
 .TP
 .B CURLOPT_PASSWDFUNCTION
 Pass a pointer to a \fIcurl_passwd_callback\fP function that will be called
@@ -570,10 +668,34 @@ Pass a long. If the value is non-zero, it tells curl to use the EPSV command
 when doing passive FTP downloads (which is always does by default). Using EPSV
 means that it will first attempt to use EPSV before using PASV, but if you
 pass FALSE (zero) to this option, it will not try using EPSV, only plain PASV.
 .TP
 .B CURLOPT_DNS_CACHE_TIMEOUT
 Pass a long, this sets the timeout in seconds. Name resolves will be kept in
 memory for this number of seconds. Set to zero (0) to completely disable
 caching, or set to -1 to make the cached entries remain forever. By default,
 libcurl caches info for 60 seconds. (Added in libcurl 7.9.3)
 .TP
 .B CURLOPT_DNS_USE_GLOBAL_CACHE
 Pass a long. If the value is non-zero, it tells curl to use a global DNS cache
 that will survive between easy handles creations and deletions. This is not
 thread-safe and this will use a global varible. (Added in libcurl 7.9.3)
 .TP
 .B CURLOPT_DEBUGFUNCTION
 Function pointer that should match the following prototype: \fIint
 curl_debug_callback (CURL *, curl_infotype, char *, size_t, void *);\fP
 This function will receive debug information if CURLOPT_VERBOSE is
 enabled. The curl_infotype argument specifies what kind of information it
 is. This funtion must return 0.
 .TP
 .B CURLOPT_DEBUGDATA
 Pass a pointer to whatever you want passed in to your CURLOPT_DEBUGFUNCTION in
 the last void * argument. This pointer is not used by libcurl, it is only
 passed to the callback.
 .PP
 .SH RETURN VALUE
 CURLE_OK (zero) means that the option was set properly, non-zero means an
-error occurred as \fI<curl/curl.h>\fP defines.
+error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP
 man page for the full list with descriptions.
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
 .SH BUGS
--- a/docs/libcurl/curl_escape.3
+++ b/docs/libcurl/curl_escape.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_escape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
+.TH curl_escape 3 "6 March 2002" "libcurl 7.9" "libcurl Manual"
 .SH NAME
 curl_escape - URL encodes the given string
 .SH SYNOPSIS
@@ -13,10 +13,8 @@ curl_escape - URL encodes the given string
 .SH DESCRIPTION
 This function will convert the given input string to an URL encoded string and
 return that as a new allocated string. All input characters that are not a-z,
-A-Z or 0-9 will be converted to their "URL escaped" version. If a sequence of
+A-Z or 0-9 will be converted to their "URL escaped" version (%NN where NN is a
-%NN (where NN is a two-digit hexadecimal number) is found in the string to
+two-digit hexadecimal number).
 encode, that 3-letter combination will be copied to the output unmodifed,
 assuming that it is an already encoded piece of data.
 If the 'length' argument is set to 0, curl_escape() will use strlen() on the
 input 'url' string to find out the size.
--- a/docs/libcurl/curl_formadd.3
+++ b/docs/libcurl/curl_formadd.3
@@ -2,13 +2,13 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_formadd 3 "29 October 2001" "libcurl 7.9.1" "libcurl Manual"
+.TH curl_formadd 3 "21 May 2002" "libcurl 7.9.8" "libcurl Manual"
 .SH NAME
 curl_formadd - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "int curl_formadd(struct HttpPost ** " firstitem,
+.BI "CURLFORMcode curl_formadd(struct HttpPost ** " firstitem,
 .BI "struct HttpPost ** " lastitem, " ...);"
 .ad
 .SH DESCRIPTION
@@ -58,6 +58,13 @@ are allowed. The effect of this parameter is the same as giving multiple
 \fBCURLFORM_FILE\fP options possibly with \fBCURLFORM_CONTENTTYPE\fP after or
 before each \fBCURLFORM_FILE\fP option.
 Should you need to specify extra headers for the form POST section, use
 \fBCURLFORM_CONTENTHEADER\fP. This takes a curl_slist prepared in the usual way
 using \fBcurl_slist_append\fP and appends the list of headers to those Curl
 automatically generates for \fBCURLFORM_CONTENTTYPE\fP and the content 
 disposition. The list must exist while the POST occurs, if you free it before
 the post completes you may experience problems.
 The last argument in such an array must always be \fBCURLFORM_END\fP.
 The pointers \fI*firstitem\fP and \fI*lastitem\fP should both be pointing to
@@ -76,12 +83,14 @@ you call \fIcurl_form_free\fP and \fIcurl_easy_cleanup\fP.
 See example below.
 .SH RETURN VALUE
-Returns non-zero if an error occurs.
+0 means everything was ok, non-zero means an error occurred as
 .I <curl/curl.h>
 defines.
 .SH EXAMPLE
 .nf
- HttpPost* post = NULL;
+ struct HttpPost* post = NULL;
- HttpPost* last = NULL;
+ struct HttpPost* last = NULL;
 char namebuffer[] = "name buffer";
 long namelength = strlen(namebuffer);
 char buffer[] = "test buffer";
--- a/docs/libcurl/curl_formfree.3
+++ b/docs/libcurl/curl_formfree.3
--- a/docs/libcurl/curl_formparse.3
+++ b/docs/libcurl/curl_formparse.3
@@ -0,0 +1,18 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_formparse 3 "17 Dec 2001" "libcurl 7.9.2" "libcurl Manual"
 .SH NAME
 curl_formparse - add a section to a multipart/formdata HTTP POST:
 deprecated (use curl_formadd instead)
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode curl_formparse(char * " string, " struct HttpPost ** " firstitem,
 .BI "struct HttpPost ** " lastitem ");"
 .ad
 .SH DESCRIPTION
 This has been removed deliberately. The \fBcurl_formadd\fP has been introduced
 to replace this function. Do not use this. Convert to the new function
 now. curl_formparse() will be removed from a future version of libcurl.
--- a/docs/libcurl/curl_getdate.3
+++ b/docs/libcurl/curl_getdate.3
--- a/docs/libcurl/curl_getenv.3
+++ b/docs/libcurl/curl_getenv.3
--- a/docs/libcurl/curl_global_cleanup.3
+++ b/docs/libcurl/curl_global_cleanup.3
--- a/docs/libcurl/curl_global_init.3
+++ b/docs/libcurl/curl_global_init.3
--- a/docs/libcurl/curl_mprintf.3
+++ b/docs/libcurl/curl_mprintf.3
--- a/docs/libcurl/curl_multi_add_handle.3
+++ b/docs/libcurl/curl_multi_add_handle.3
@@ -0,0 +1,20 @@
 .\" $Id$
 .\"
 .TH curl_multi_add_handle 3 "4 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_add_handle - add an easy handle to a multi session
 .SH SYNOPSIS
 #include <curl/curl.h>
 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.
 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!
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
--- a/docs/libcurl/curl_multi_cleanup.3
+++ b/docs/libcurl/curl_multi_cleanup.3
@@ -0,0 +1,18 @@
 .\" $Id$
 .\"
 .TH curl_multi_cleanup 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_cleanup - close down a multi session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLMcode curl_multi_cleanup( CURLM *multi_handle );"
 .ad
 .SH DESCRIPTION
 Cleans up and removes a whole multi stack. It does not free or touch any
 individual easy handles in any way - they still need to be closed
 individually, using the usual curl_easy_cleanup() way.
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code.
 .SH "SEE ALSO"
 .BR curl_multi_init "(3)," curl_easy_cleanup "(3)," curl_easy_init "(3)"
--- a/docs/libcurl/curl_multi_fdset.3
+++ b/docs/libcurl/curl_multi_fdset.3
@@ -0,0 +1,27 @@
 .\" $Id$
 .\"
 .TH curl_multi_fdset 3 "3 May 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_fdset - add an easy handle to a multi session
 .SH SYNOPSIS
 #include <curl/curl.h>
 CURLMcode curl_multi_fdset(CURLM *multi_handle,
                           fd_set *read_fd_set,
                           fd_set *write_fd_set,
                           fd_set *exc_fd_set,
                           int *max_fd);
 .ad
 .SH DESCRIPTION
 This function extracts file descriptor information from a given multi_handle.
 libcurl returns its fd_set sets. The application can use these to select() or
 poll() on. The curl_multi_perform() function should be called as soon as one
 of them are ready to be read from or written to.
 NOTE that once this call is made, you must not remove the sets you point to,
 as libcurl will need to be able to read them. It needs them after select()
 calls, to know if certain sockets are readable or writable.
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
--- a/docs/libcurl/curl_multi_info_read.3
+++ b/docs/libcurl/curl_multi_info_read.3
@@ -0,0 +1,35 @@
 .\" $Id$
 .\"
 .TH curl_multi_info_read 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_info_read - read multi stack informationals
 .SH SYNOPSIS
 #include <curl/curl.h>
 CURLMsg *curl_multi_info_read( CURLM *multi_handle,
                               int *msgs_in_queue);
 .ad
 .SH DESCRIPTION
 Ask the multi handle if there's any messages/informationals from the
 individual transfers. Messages include informationals such as an error code
 from the transfer or just the fact that a transfer is completed. More details
 on these should be written down as well.
 Repeated calls to this function will return a new struct each time, until a
 special "end of msgs" struct is returned as a signal that there is no more to
 get at this point. The integer pointed to with \fImsgs_in_queue\fP will
 contain the number of remaining messages after this function was called.
 The data the returned pointer points to will not survive calling
 curl_multi_cleanup().
 The 'CURLMsg' struct is very simple and only contain very basic informations.
 If more involved information is wanted, the particular "easy handle" in
 present in that struct and can thus be used in subsequent regular
 curl_easy_getinfo() calls (or similar).
 .SH "RETURN VALUE"
 A pointer to a filled-in struct, or NULL if it failed or ran out of
 structs. It also writes the number of messages left in the queue (after this
 read) in the integer the second argument points to.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_multi_init "(3)," curl_multi_perform "(3)"
--- a/docs/libcurl/curl_multi_init.3
+++ b/docs/libcurl/curl_multi_init.3
@@ -0,0 +1,22 @@
 .\" $Id$
 .\"
 .TH curl_multi_init 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_init - Start a multi session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLM *curl_multi_init( );"
 .ad
 .SH DESCRIPTION
 This function returns a CURLM handle to be used as input to all the other
 multi-functions, sometimes refered to as a multi handle on some places in the
 documentation. This init call MUST have a corresponding call to
 \fIcurl_multi_cleanup\fP when the operation is complete.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_global_init "(3)," curl_easy_init "(3)"
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/libcurl/curl_multi_perform.3
+++ b/docs/libcurl/curl_multi_perform.3
@@ -0,0 +1,30 @@
 .\" $Id$
 .\"
 .TH curl_multi_perform 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_perform - add an easy handle to a multi session
 .SH SYNOPSIS
 #include <curl/curl.h>
 CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles);
 .ad
 .SH DESCRIPTION
 When the app thinks there's data available for the multi_handle, it should
 call this function to read/write whatever there is to read or write right
 now. curl_multi_perform() returns as soon as the reads/writes are done. This
 function does not require that there actually is any data available for
 reading or that data can be written, it can be called just in case. It will
 write the number of handles that still transfer data in the second argument's
 integer-pointer.
 .SH "RETURN VALUE"
 CURLMcode type, general libcurl multi interface error code.
 NOTE that this only returns errors etc regarding the whole multi stack. There
 might still have occurred problems on invidual transfers even when this
 function returns OK.
 .SH "TYPICAL USAGE"
 Most application will use \fIcurl_multi_fdset\fP to get the multi_handle's
 file descriptors, then it'll wait for action on them using select() and as
 soon as one or more of them are ready, \fIcurl_multi_perform\fP gets called.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
--- a/docs/libcurl/curl_multi_remove_handle.3
+++ b/docs/libcurl/curl_multi_remove_handle.3
@@ -0,0 +1,20 @@
 .\" $Id$
 .\"
 .TH curl_multi_remove_handle 3 "6 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_remove_handle - add an easy handle to a multi session
 .SH SYNOPSIS
 #include <curl/curl.h>
 CURLMcode curl_multi_remove_handle(CURLM *multi_handle, CURL *easy_handle);
 .ad
 .SH DESCRIPTION
 Removes a given easy_handle from the multi_handle. This will make the
 specified easy handle be removed from this multi handle's control.
 When the easy handle has been removed from a multi stack, it is again
 perfectly legal to invoke \fIcurl_easy_perform()\fP on this easy handle.
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_multi_init "(3)"
--- a/docs/libcurl/curl_slist_append.3
+++ b/docs/libcurl/curl_slist_append.3
--- a/docs/libcurl/curl_slist_free_all.3
+++ b/docs/libcurl/curl_slist_free_all.3
--- a/docs/libcurl/curl_strequal.3
+++ b/docs/libcurl/curl_strequal.3
--- a/docs/libcurl/curl_strnequal.3
+++ b/docs/libcurl/curl_strnequal.3
--- a/docs/libcurl/curl_unescape.3
+++ b/docs/libcurl/curl_unescape.3
@@ -14,7 +14,7 @@ curl_unescape - URL decodes the given string
 This function will convert the given URL encoded input string to a "plain
 string" and return that as a new allocated string. All input characters that
 are URL encoded (%XX where XX is a two-digit hexadecimal number, or +) will be
-converted to their plain text versions (up to a ? letter, no letters to the
+converted to their plain text versions (up to a ? letter, no + letters to the
 right of a ? letter will be converted).
 If the 'length' argument is set to 0, curl_unescape() will use strlen() on the
--- a/docs/libcurl/curl_version.3
+++ b/docs/libcurl/curl_version.3
--- a/docs/libcurl/index.html
+++ b/docs/libcurl/index.html
@@ -34,5 +34,15 @@ HTML>
 <P><A HREF="curl_strnequal.html">curl_strnequal.html</A>
 <P><A HREF="curl_unescape.html">curl_unescape.html</A>
 <P><A HREF="curl_version.html">curl_version.html</A>
 <hr>
 <p><a href="curl_multi_add_handle.html">curl_multi_add_handle.html</a>
 <p><a href="curl_multi_cleanup.html">curl_multi_cleanup.html</a>
 <p><a href="curl_multi_fdset.html">curl_multi_fdset.html</a>
 <p><a href="curl_multi_info_read.html">curl_multi_info_read.html</a>
 <p><a href="curl_multi_init.html">curl_multi_init.html</a>
 <p><a href="curl_multi_perform.html">curl_multi_perform.html</a>
 <p><a href="curl_multi_remove_handle.html">curl_multi_remove_handle.html</a>
 <p><a href="libcurl-multi.html">libcurl-multi.html</a>
 </BODY>
 </HTML>
--- a/docs/libcurl/libcurl-errors.3
+++ b/docs/libcurl/libcurl-errors.3
@@ -0,0 +1,240 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH libcurl-errors 3 "10 April 2002" "libcurl 7.9.6" "libcurl errors"
 .SH NAME
 error codes in libcurl
 .SH DESCRIPTION
 This man page includes most, if not all, available error codes in libcurl.
 Why they occur and possibly what you can do to fix the problem.
 .SH "CURLcode"
 Almost all "easy" interface functions return a CURLcode error code. No matter
 what, using \fICURLOPT_ERRORBUFFER\fP is a good idea as it will give you a
 human readable error string that may offer more details about the error cause
 than just the error code does.
 This man page is meant to describe libcurl 7.9.6 and later. Earlier versions
 might have had quirks not mentioned here.
 CURLcode is one of the following:
 .RS 1
 .TP 5
 .B CURLE_OK (0)
 All fine. Proceed as usual.
 .TP
 .B CURLE_UNSUPPORTED_PROTOCOL (1)
 The URL you passed to libcurl used a protocol that this libcurl does not
 support. The support might be a compile-time option that you didn't use, it
 can be a misspelled protocol string or just a protocol libcurl has no code
 for.
 .TP
 .B CURLE_FAILED_INIT (2)
 Very early initialization code failed. This is likely to be an internal error
 or problem.
 .TP
 .B CURLE_URL_MALFORMAT (3)
 The URL was not properly formatted.
 .TP
 .B CURLE_URL_MALFORMAT_USER (4)
 URL user malformatted. The user-part of the URL syntax was not correct.
 .TP
 .B CURLE_COULDNT_RESOLVE_PROXY (5)
 Couldn't resolve proxy. The given proxy host could not be resolved.
 .TP
 .B CURLE_COULDNT_RESOLVE_HOST (6)
 Couldn't resolve host. The given remote host was not resolved.
 .TP
 .B CURLE_COULDNT_CONNECT (7)
 Failed to connect() to host or proxy.
 .TP
 .B CURLE_FTP_WEIRD_SERVER_REPLY (8)
 After connecting to a FTP server, libcurl expects to get a certain reply back.
 This error code implies that it god a strange or bad reply. The given remote
 server is probably not an OK FTP server.
 .TP
 .B CURLE_FTP_ACCESS_DENIED (9)
 We were denied access when trying to login to an FTP server or when trying to
 change working directory to the one given in the URL.
 .TP
 .B CURLE_FTP_USER_PASSWORD_INCORRECT (10)
 The username and/or the password were incorrect when trying to login to an FTP
 server.
 .TP
 .B CURLE_FTP_WEIRD_PASS_REPLY (11)
 After having sent the FTP password to the server, libcurl expects a proper
 reply. This error code indicates that an unexpected code was returned.
 .TP
 .B CURLE_FTP_WEIRD_USER_REPLY (12)
 After having sent user name to the FTP server, libcurl expects a proper
 reply. This error code indicates that an unexpected code was returned.
 .TP
 .B CURLE_FTP_WEIRD_PASV_REPLY (13)
 libcurl failed to get a sensible result back from the server as a response to
 either a PASV or a EPSV command. The server is flawed.
 .TP
 .B CURLE_FTP_WEIRD_227_FORMAT (14)
 FTP servers return a 227-line as a response to a PASV command. If libcurl
 fails to parse that line, this return code is passed back.
 .TP
 .B CURLE_FTP_CANT_GET_HOST (15)
 An internal failure to lookup the host used for the new connection.
 .TP
 .B CURLE_FTP_CANT_RECONNECT (16)
 A bad return code on either PASV or EPSV was sent by the FTP server,
 preventing libcurl from being able to continue.
 .TP
 .B CURLE_FTP_COULDNT_SET_BINARY (17)
 Received an error when trying to set the transfer mode to binary.
 .TP
 .B CURLE_PARTIAL_FILE (18)
 A file transfer was shorter or larger than expected. This happens when the
 server first reports an expected transfer size, and then delivers data that
 doesn't match the previously given size.
 .TP
 .B CURLE_FTP_COULDNT_RETR_FILE (19)
 This was either a weird reply to a 'RETR' command or a zero byte transfer
 complete.
 .TP
 .B CURLE_FTP_WRITE_ERROR (20)
 After a completed file transfer, the FTP server did not respond a proper
 \"transfer successful\" code.
 .TP
 .B CURLE_FTP_QUOTE_ERROR (21)
 When sending custom "QUOTE" commands to the remote server, one of the commands
 returned an error code that was 400 or higher.
 .TP
 .B CURLE_HTTP_NOT_FOUND (22)
 This is returned if CURLOPT_FAILONERROR is set TRUE and the HTTP server
 returns an error code that is >= 400.
 .TP
 .B CURLE_WRITE_ERROR (23)
 An error occurred when writing received data to a local file, or an error was
 returned to libcurl from a write callback.
 .TP
 .B CURLE_MALFORMAT_USER (24)
 Malformat user. User name badly specified. *Not currently used*
 .TP
 .B CURLE_FTP_COULDNT_STOR_FILE (25)
 FTP couldn't STOR file. The server denied the STOR operation. The error buffer
 usually contains the server's explanation to this.
 .TP
 .B CURLE_READ_ERROR (26)
 There was a problem reading a local file or an error returned by the read
 callback.
 .TP
 .B CURLE_OUT_OF_MEMORY (27)
 Out of memory. A memory allocation request failed. This is serious badness and
 things are severly screwed up if this ever occur.
 .TP
 .B CURLE_OPERATION_TIMEOUTED (28)
 Operation timeout. The specified time-out period was reached according to the
 conditions.
 .TP
 .B CURLE_FTP_COULDNT_SET_ASCII (29)
 libcurl failed to set ASCII transfer type (TYPE A).
 .TP
 .B CURLE_FTP_PORT_FAILED (30)
 The FTP PORT command returned error. This mostly happen when you haven't
 specified a good enough address for libcurl to use. See \fICURLOPT_FTPPORT\fP.
 .TP
 .B CURLE_FTP_COULDNT_USE_REST (31)
 The FTP REST command returned error. This should never happen if the server is
 sane.
 .TP
 .B CURLE_FTP_COULDNT_GET_SIZE (32)
 The FTP SIZE command returned errror. SIZE is not a kosher FTP command, it is
 an extension and not all servers support it. This is not a surprising error.
 .TP
 .B CURLE_HTTP_RANGE_ERROR (33)
 The HTTP server does not support or accept range requests.
 .TP
 .B CURLE_HTTP_POST_ERROR (34)
 This is an odd error that mainly occurs due to internal confusion.
 .TP
 .B CURLE_SSL_CONNECT_ERROR (35)
 A problem occured somewhere in the SSL/TLS handshake. You really want the
 error buffer and read the message there as it pinpoints the problem slightly
 more. Could be certificates (file formats, paths, permissions), passwords, and
 others.
 .TP
 .B CURLE_FTP_BAD_DOWNLOAD_RESUME (36)
 Attempting FTP resume beyond file size.
 .TP
 .B CURLE_FILE_COULDNT_READ_FILE (37)
 A file given with FILE:// couldn't be opened. Most likely because the file
 path doesn't identify an existing file. Did you check file permissions?
 .TP
 .B CURLE_LDAP_CANNOT_BIND (38)
 LDAP cannot bind. LDAP bind operation failed.
 .TP
 .B CURLE_LDAP_SEARCH_FAILED (39)
 LDAP search failed.
 .TP
 .B CURLE_LIBRARY_NOT_FOUND (40)
 Library not found. The LDAP library was not found.
 .TP
 .B CURLE_FUNCTION_NOT_FOUND (41)
 Function not found. A required LDAP function was not found.
 .TP
 .B CURLE_ABORTED_BY_CALLBACK (42)
 Aborted by callback. A callback returned "abort" to libcurl.
 .TP
 .B CURLE_BAD_FUNCTION_ARGUMENT (43)
 Internal error. A function was called with a bad parameter.
 .TP
 .B CURLE_BAD_CALLING_ORDER (44)
 Internal error. A function was called in a bad order.
 .TP
 .B CURLE_HTTP_PORT_FAILED (45)
 Interface error. A specified outgoing interface could not be used. Set which
 interface to use for outgoing connections' source IP address with
 CURLOPT_INTERFACE.
 .TP
 .B CURLE_BAD_PASSWORD_ENTERED (46)
 Bad password entered. An error was signaled when the password was
 entered. This can also be the result of a "bad password" returned from a
 specified password callback.
 .TP
 .B CURLE_TOO_MANY_REDIRECTS (47)
 Too many redirects. When following redirects, libcurl hit the maximum amount.
 Set your limit with CURLOPT_MAXREDIRS.
 .TP
 .B CURLE_UNKNOWN_TELNET_OPTION (48)
 An option set with CURLOPT_TELNETOPTIONS was not recognized/known. Refer to
 the appropriate documentation.
 .TP
 .B CURLE_TELNET_OPTION_SYNTAX (49)
 A telnet option string was Illegally formatted.
 .TP
 .B CURLE_OBSOLETE (50)
 This is not an error. This used to be another error code in an old libcurl
 version and is currently unused.
 .TP
 .B CURLE_SSL_PEER_CERTIFICATE (51)
 The remote server's SSL certificate was deemed not OK.
 .TP
 .B CURLE_GOT_NOTHING (52)
 Nothing was returned from the server, and under the circumstances, getting
 nothing is considered an error.
 .TP
 .B CURLE_SSL_ENGINE_NOTFOUND (53)
 The specified crypto engine wasn't found.
 .TP
 .B CURLE_SSL_ENGINE_SETFAILED (54)
 Failed setting the selected SSL crypto engine as default!
 .TP
 .B CURLE_SEND_ERROR (55)
 Failed sending network data.
 .TP
 .B CURLE_RECV_ERROR (56)
 Failure with receiving network data.
 .TP
 .B CURL_LAST
 This is not an error, but in the curl/curl.h file this can be used to know how
 many existing error codes there are.
 .RE
 .SH "CURLMcode"
 This is the generic return code used by functions in the libcurl multi
 interface.
--- a/docs/libcurl/libcurl-multi.3
+++ b/docs/libcurl/libcurl-multi.3
@@ -0,0 +1,85 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH libcurl-multi 5 "20 March 2001" "libcurl 7.9.5" "libcurl multi interface"
 .SH NAME
 libcurl-multi \- how to use the multi interface
 .SH DESCRIPTION
 This is an overview on how to use the libcurl multi interface in your C
 programs. There are specific man pages for each function mentioned in
 here. There's also the libcurl-the-guide document for a complete tutorial to
 programming with libcurl and the \fIlibcurl(3)\fP man page for an overview of
 the libcurl easy interface.
 All functions in the multi interface are prefixed with curl_multi.
 .SH "PLEASE NOTICE"
 The multi interface is a rather new member of the libcurl family. It has not
 yet been very widely used. It may still be a few more bugs lurking in there
 than we are used to. That said, it might also just work in every aspect you
 try it. Please report all bugs and oddities you see.
 .SH "OBJECTIVES"
 The multi interface introduces several new abilities that the easy interface
 refuses to offer. They are mainly:
 1. Enable a "pull" interface. The application that uses libcurl decides where
 and when to ask libcurl to get/send data.
 2. Enable multiple simultaneous transfers in the same thread without making it
 complicated for the application.
 3. Enable the application to select() on its own file descriptors and curl's
 file descriptors simultaneous easily.
 .SH "ONE MULTI HANDLE MANY EASY HANDLES"
 To use the multi interface, you must first create a 'multi handle' with
 \fIcurl_multi_init\fP. This handle is then used as input to all further
 curl_multi_* functions.
 Each single transfer is built up with an easy handle. You must create them,
 and setup the appropriate options for each easy handle, as outlined in the
 \fIlibcurl(3)\fP man page.
 When the easy handle is setup for a transfer, then instead of using
 \fIcurl_easy_perform\fP (as when using the easy interface for transfers), you
 should instead add the easy handle to the multi handle using
 \fIcurl_easy_add_handl\fP. The multi handle is sometimes referred to as a
 \'multi stack\' because of the fact that it may hold a large amount of easy
 handles.
 Should you change your mind, the easy handle is again removed from the multi
 stack using \fIcurl_multi_remove_handle\fP. Once removed from the multi
 handle, you can again use other easy interface functions like
 curl_easy_perform or whatever you think is necessary.
 Adding the easy handles to the multi handle does not start any
 transfer. Remember that one of the main ideas with this interface is to let
 your application drive. You drive the transfers by invoking
 \fIcurl_multi_perform\fP. libcurl will then transfer data if there is anything
 available to transfer. It'll use the callbacks and everything else you have
 setup in the individual easy handles. It'll transfer data on all current
 transfers in the multi stack that are ready to transfer anything. It may be
 all, it may be none.
 Your application can acquire knowledge from libcurl when it would like to get
 invoked to transfer data, so that you don't have to busy-loop and call that
 \fIcurl_multi_perform\fP like a mad man! \fIcurl_multi_fdset\fP offers an
 interface using which you can extract fd_sets from libcurl to use in select()
 or poll() calls in order to get to know when the transfers in the multi stack
 might need attention. This also makes it very easy for your program to wait
 for input on your own private file descriptors at the same time or perhaps
 timeout every now and then, should you want that.
 \fIcurl_multi_perform\fP stores the number of still running transfers in one
 of its input arguments, and by reading that you can figure out when all the
 transfers in the multi handles are done. 'done' does not mean successful. One
 or more of the transfers may have failed.
 To get information about completed transfers, to figure out success or not and
 similar, \fIcurl_multi_info_read\fP should be called. It can return a message
 about a current or previous transfer. Repeated invokes of the function get
 more messages until the message queue is empty.
 When all transfers in the multi stack are done, cleanup the multi handle with
 \fIcurl_multi_cleanup\fP. Be careful and please note that you \fBMUST\fP
 invoke separate \fIcurl_easy_cleanup\fP calls on every single easy handle to
 clean them up properly.
--- a/docs/libcurl/libcurl.3
+++ b/docs/libcurl/libcurl.3
@@ -2,24 +2,27 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH libcurl 5 "14 August 2001" "libcurl 7.8.1" "libcurl overview"
+.TH libcurl 3 "19 March 2002" "libcurl 7.9.6" "libcurl overview"
 .SH NAME
 libcurl \- client-side URL transfers
 .SH DESCRIPTION
-This is an overview on how to use libcurl in your c/c++ programs. There are
+This is an overview on how to use libcurl in your C programs. There are
-specific man pages for each function mentioned in here.
+specific man pages for each function mentioned in here. There's also the
 libcurl-the-guide document for a complete tutorial to programming with
 libcurl.
-libcurl can also be used directly from within your Java, PHP, Perl, Ruby or
+There are a dozen custom bindings that bring libcurl access to your favourite
-Tcl programs as well, look elsewhere for documentation on this!
+language. Look elsewhere for documentation on those.
 All applications that use libcurl should call \fIcurl_global_init()\fP exactly
 once before any libcurl function can be used. After all usage of libcurl is
 complete, it \fBmust\fP call \fIcurl_global_cleanup()\fP. In between those two
 calls, you can use libcurl as described below.
-When using libcurl you init your session and get a handle, which you use as
+When using libcurl's "easy" interface you init your session and get a handle,
-input to the following interface functions you use. Use \fIcurl_easy_init()\fP
+which you use as input to the easy interface functions you use. Use
-to get the handle.
+\fIcurl_easy_init()\fP to get the handle. There is also the so called "multi"
 interface, try the \fIlibcurl-multi(3)\fP man page for an overview of that.
 You continue by setting all the options you want in the upcoming transfer,
 most important among them is the URL itself (you can't transfer anything
@@ -56,9 +59,6 @@ get information about a performed transfer
 .B curl_formadd()
 helps building a HTTP form POST
 .TP
 .B curl_formparse()
 helps building a HTTP form POST (deprecated since 7.9 use curl_formadd()!)
 .TP
 .B curl_formfree()
 free a list built with curl_formparse()/curl_formadd()
 .TP
@@ -76,9 +76,8 @@ portable case insensitive string comparisons
 .RE
 .SH "LINKING WITH LIBCURL"
-Starting with 7.7.2 (on unix-like machines), there's a tool named curl-config
+On unix-like machines, there's a tool named curl-config that gets installed
-that gets installed with the rest of the curl stuff when 'make install' is
+with the rest of the curl stuff when 'make install' is performed.
 performed.
 curl-config is added to make it easier for applications to link with libcurl
 and developers to learn about libcurl and how to use it.
@@ -98,36 +97,24 @@ Only use documented functions and functionality!
 libcurl works
 .B exactly
 the same, on any of the platforms it compiles and builds on.
 There's only one caution, and that is the win32 platform that may(*) require
 you to init the winsock stuff before you use the libcurl functions. Details on
 this are noted on the curl_easy_init() man page.
 (*) = it appears as if users of the cygwin environment get this done
 automatically, also libcurl 7.8.1 and later can handle this for you.
 .SH "THREADS"
 Never ever call curl-functions simultaneously using the same handle from
 several threads. libcurl is thread-safe and can be used in any number of
 threads, but you must use separate curl handles if you want to use libcurl in
 more than one thread simultaneously.
 .SH "PERSISTANT CONNECTIONS"
-With libcurl 7.7, persistant connections were added. Persistant connections
+Persistent connections means that libcurl can re-use the same connection for
-means that libcurl can re-use the same connection for several transfers, if
+several transfers, if the conditions are right.
 the conditions are right.
-libcurl will *always* attempt to use persistant connections. Whenever you use
+libcurl will *always* attempt to use persistent connections. Whenever you use
 curl_easy_perform(), libcurl will attempt to use an existing connection to do
-the transfer, and if none exists it'll open a new one that will be subject
+the transfer, and if none exists it'll open a new one that will be subject for
-for re-use on a possible following call to curl_easy_perform().
+re-use on a possible following call to curl_easy_perform().
-To allow libcurl to take full advantage of persistant connections, you should
+To allow libcurl to take full advantage of persistent connections, you should
-do as many of your file transfers as possible using the same curl
+do as many of your file transfers as possible using the same curl handle. When
-handle. When you call curl_easy_cleanup(), all the possibly open connections
+you call curl_easy_cleanup(), all the possibly open connections held by
-held by libcurl will be closed and forgotten.
+libcurl will be closed and forgotten.
 Note that the options set with curl_easy_setopt() will be used in on every
 repeat curl_easy_perform() call
 .SH "COMPATIBILITY WITH OLDER LIBCURLS"
 Repeated curl_easy_perform() calls on the same handle were not supported in
 pre-7.7 versions, and caused confusion and undefined behaviour.
--- a/include/curl/Makefile.am
+++ b/include/curl/Makefile.am
@@ -3,5 +3,6 @@ pkginclude_HEADERS = \
 	easy.h \
 	mprintf.h \
 	stdcheaders.h \
-	types.h
+	types.h \
 	multi.h
 pkgincludedir= $(includedir)/curl
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
@@ -30,11 +30,11 @@
 # include <time.h>
 #else
 # include <sys/types.h>
-# if TIME_WITH_SYS_TIME
+# ifdef TIME_WITH_SYS_TIME
 #  include <sys/time.h>
 #  include <time.h>
 # else
-#  if HAVE_SYS_TIME_H
+#  ifdef HAVE_SYS_TIME_H
 #   include <sys/time.h>
 #  else
 #   include <time.h>
@@ -55,14 +55,24 @@
 extern "C" {
 #endif
-struct HttpPost {
+/* stupid #define trick to preserve functionality with older code, but
-  struct HttpPost *next; /* next entry in the list */
+   making it use our name space for the future */
 #define HttpPost curl_httppost
 struct curl_httppost {
  struct curl_httppost *next; /* next entry in the list */
  char *name;     /* pointer to allocated name */
  long namelength; /* length of name length */
  char *contents; /* pointer to allocated data contents */
  long contentslength; /* length of contents field */
 	/* CMC: Added support for buffer uploads */
 	char *buffer; /* pointer to allocated buffer contents */
 	long bufferlength; /* length of buffer field */
  char *contenttype; /* Content-Type */
-  struct HttpPost *more; /* if one field name has more than one file, this
+  struct curl_slist* contentheader; /* list of extra headers for this form */
  struct curl_httppost *more; /* if one field name has more than one file, this
                                 link should link to following files */
  long flags;     /* as defined below */
 #define HTTPPOST_FILENAME (1<<0) /* specified content is a file name */
@@ -71,13 +81,22 @@ struct HttpPost {
                                   do not free in formfree */
 #define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
                                       do not free in formfree */
 /* CMC: Added support for buffer uploads */
 #define HTTPPOST_BUFFER (1<<4) /* upload file from buffer */
 #define HTTPPOST_PTRBUFFER (1<<5) /* upload file from pointer contents */
  char *showfilename; /* The file name to show. If not set, the actual
                         file name will be used (if this is a file part) */
 };
 typedef int (*curl_progress_callback)(void *clientp,
-                                      size_t dltotal,
+                                      double dltotal,
-                                      size_t dlnow,
+                                      double dlnow,
-                                      size_t ultotal,
+                                      double ultotal,
-                                      size_t ulnow);
+                                      double ulnow);
 #define CURL_MAX_WRITE_SIZE 20480
 typedef size_t (*curl_write_callback)(char *buffer,
                                      size_t size,
@@ -94,6 +113,23 @@ typedef int (*curl_passwd_callback)(void *clientp,
                                    char *buffer,
                                    int buflen);
 /* the kind of data that is passed to information_callback*/
 typedef enum {
  CURLINFO_TEXT = 0,
  CURLINFO_HEADER_IN,    /* 1 */
  CURLINFO_HEADER_OUT,   /* 2 */
  CURLINFO_DATA_IN,      /* 3 */
  CURLINFO_DATA_OUT,     /* 4 */
  CURLINFO_END
 } curl_infotype;
 typedef int (*curl_debug_callback)
       (CURL *handle,      /* the handle/transfer this concerns */
        curl_infotype type, /* what kind of data */
        char *data,        /* points to the data */
        size_t size,       /* size of the data pointed to */
        void *userp);      /* whatever the user please */
 /* All possible error codes from all sorts of curl functions. Future versions
   may return other values, stay prepared.
@@ -155,6 +191,10 @@ typedef enum {
  CURLE_OBSOLETE,	         /* 50 - removed after 7.7.3 */
  CURLE_SSL_PEER_CERTIFICATE,    /* 51 - peer's certificate wasn't ok */
  CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */
  CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */
  CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as default */
  CURLE_SEND_ERROR,              /* 55 - failed sending network data */
  CURLE_RECV_ERROR,              /* 56 - failure in receiving network data */
  CURL_LAST /* never use! */
 } CURLcode;
@@ -169,19 +209,27 @@ typedef enum {
 #define CURL_ERROR_SIZE 256
 /* long may be 32 or 64 bits, but we should never depend on anything else
   but 32 */
 #define CURLOPTTYPE_LONG          0
 #define CURLOPTTYPE_OBJECTPOINT   10000
 #define CURLOPTTYPE_FUNCTIONPOINT 20000
 /* name is uppercase CURLOPT_<name>,
   type is one of the defined CURLOPTTYPE_<type>
   number is unique identifier */
 #ifdef CINIT
 #undef CINIT
 #endif
 #if defined(__STDC__) || defined(_MSC_VER)
 #define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
-
+#else
-/* long may be 32 or 64 bits, but we should never depend on anything else
+/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-   but 32 */
+#define LONG          CURLOPTTYPE_LONG
-#define CURLOPTTYPE_LONG          0
+#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define CURLOPTTYPE_OBJECTPOINT   10000
+#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define CURLOPTTYPE_FUNCTIONPOINT 20000
+#define CINIT(name,type,number) CURLOPT_/**/name = type + number
 #endif
 typedef enum {
  CINIT(NOTHING, LONG, 0), /********* the first one is unused ************/
@@ -269,7 +317,7 @@ typedef enum {
  /* Set cookie in request: */
  CINIT(COOKIE, OBJECTPOINT, 22),
-  /* This points to a linked list of headers, struct HttpHeader kind */
+  /* This points to a linked list of headers, struct curl_slist kind */
  CINIT(HTTPHEADER, OBJECTPOINT, 23),
  /* This points to a linked list of post entries, struct HttpPost */
@@ -278,8 +326,10 @@ typedef enum {
  /* name of the file keeping your private SSL-certificate */
  CINIT(SSLCERT, OBJECTPOINT, 25),
-  /* password for the SSL-certificate */
+  /* password for the SSL-private key, keep this for compatibility */
  CINIT(SSLCERTPASSWD, OBJECTPOINT, 26),
  /* password for the SSL private key */
  CINIT(SSLKEYPASSWD, OBJECTPOINT, 26),
  /* send TYPE parameter? */
  CINIT(CRLF, LONG, 27),
@@ -339,7 +389,11 @@ typedef enum {
  CINIT(FTPLISTONLY, LONG, 48),  /* Use NLST when listing ftp dir */
  CINIT(FTPAPPEND, LONG, 50),    /* Append instead of overwrite on upload! */
-  CINIT(NETRC, LONG, 51),        /* read user+password from .netrc */
+
  /* Specify whether to read the user+password from the .netrc or the URL.
   * This must be one of the CURL_NETRC_* enums below. */
  CINIT(NETRC, LONG, 51),
  CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
  /* This FTPASCII name is now obsolete, to be removed, use the TRANSFERTEXT
@@ -466,9 +520,53 @@ typedef enum {
     PASV command. */     
  CINIT(FTP_USE_EPSV, LONG, 85),
  /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
  CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
  /* name of the file keeping your private SSL-key */
  CINIT(SSLKEY, OBJECTPOINT, 87),
  /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
  CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
  /* crypto engine for the SSL-sub system */
  CINIT(SSLENGINE, OBJECTPOINT, 89),
  /* set the crypto engine for the SSL-sub system as default
     the param has no meaning...
   */
  CINIT(SSLENGINE_DEFAULT, LONG, 90),
  /* Non-zero value means to use the global dns cache */
  CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91),
  /* DNS cache timeout */
  CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
  /* send linked-list of pre-transfer QUOTE commands (Wesley Laxton)*/
  CINIT(PREQUOTE, OBJECTPOINT, 93),
  /* set the debug function */
  CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
  /* set the data for the debug function */
  CINIT(DEBUGDATA, OBJECTPOINT, 95),
  /* mark this as start of a cookie session */
  CINIT(COOKIESESSION, LONG, 96),
  /* The CApath directory used to validate the peer certificate
     this option is used only if SSL_VERIFYPEER is true */
  CINIT(CAPATH, OBJECTPOINT, 97),
  CURLOPT_LASTENTRY /* the last unusued */
 } CURLoption;
  /* two convenient "aliases" that follow the name scheme better */
 #define CURLOPT_WRITEDATA CURLOPT_FILE
 #define CURLOPT_READDATA  CURLOPT_INFILE 
  /* These enums are for use with the CURLOPT_HTTP_VERSION option. */
 enum {
  CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd
@@ -480,6 +578,18 @@ enum {
  CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
 };
  /* These enums are for use with the CURLOPT_NETRC option. */
 enum CURL_NETRC_OPTION {
  CURL_NETRC_IGNORED,     /* The .netrc will never be read.
                           * This is the default. */
  CURL_NETRC_OPTIONAL,    /* A user:password in the URL will be preferred
                           * to one in the .netrc. */
  CURL_NETRC_REQUIRED,    /* A user:password in the URL will be ignored.
                           * Unless one is set programmatically, the .netrc
                           * will be queried. */
  CURL_NETRC_LAST
 };
 enum {
  CURL_SSLVERSION_DEFAULT,
  CURL_SSLVERSION_TLSv1,
@@ -491,15 +601,26 @@ enum {
 typedef enum {
-  TIMECOND_NONE,
+  CURL_TIMECOND_NONE,
-  TIMECOND_IFMODSINCE,
+  CURL_TIMECOND_IFMODSINCE,
-  TIMECOND_IFUNMODSINCE,
+  CURL_TIMECOND_IFUNMODSINCE,
-  TIMECOND_LASTMOD,
+  CURL_TIMECOND_LASTMOD,
-  TIMECOND_LAST
+  CURL_TIMECOND_LAST
 } curl_TimeCond;
 /* for backwards compatibility */
 #ifndef TIMECOND_IFMODSINCE
 #define TIMECOND_IFMODSINCE CURL_TIMECOND_IFMODSINCE
 #endif
 #ifndef TIMECOND_IFUNMODSINCE
 #define TIMECOND_IFUNMODSINCE CURL_TIMECOND_IFUNMODSINCE
 #endif
 #ifndef TIMECOND_LASTMOD
 #define TIMECOND_LASTMOD CURL_TIMECOND_LASTMOD
 #endif
 #ifdef __BEOS__
 #include <support/SupportDefs.h>
 #endif
@@ -517,16 +638,21 @@ extern int (curl_strnequal)(const char *s1, const char *s2, size_t n);
 #define strequal(a,b) curl_strequal(a,b)
 #define strnequal(a,b,c) curl_strnequal(a,b,c)
-/* external form function */
+/* DEPRECATED function to build formdata */
-int curl_formparse(char *string,
+int curl_formparse(char *, struct curl_httppost **,
-                   struct HttpPost **httppost,
+                   struct curl_httppost **_post);
                   struct HttpPost **last_post);
 /* name is uppercase CURLFORM_<name> */
 #ifdef CFINIT
 #undef CFINIT
 #endif
 #if defined(__STDC__) || defined(_MSC_VER)
 #define CFINIT(name) CURLFORM_ ## name
 #else
 /* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
 #define CFINIT(name) CURLFORM_/**/name
 #endif
 typedef enum {
  CFINIT(NOTHING),        /********* the first one is unused ************/
@@ -540,28 +666,65 @@ typedef enum {
  CFINIT(CONTENTSLENGTH),
  CFINIT(FILECONTENT),
  CFINIT(ARRAY),
-  CFINIT(ARRAY_START), /* below are the options allowed within a array */
+  CFINIT(OBSOLETE),
  CFINIT(FILE),
  CFINIT(BUFFER),
  CFINIT(BUFFERPTR),
  CFINIT(BUFFERLENGTH),
  CFINIT(CONTENTTYPE),
  CFINIT(CONTENTHEADER),
  CFINIT(FILENAME),
  CFINIT(END),
-  CFINIT(ARRAY_END),   /* up are the options allowed within a array */
+  CFINIT(OBSOLETE2),
  CURLFORM_LASTENTRY /* the last unusued */
 } CURLformoption;
 #undef CFINIT /* done */
 /* structure to be used as parameter for CURLFORM_ARRAY */
 struct curl_forms {
 	CURLformoption		option;
 	const char		*value;
 };
-/* new external form function */
+/* use this for multipart formpost building */
-int curl_formadd(struct HttpPost **httppost,
+/* Returns code for curl_formadd()
-                 struct HttpPost **last_post,
+ * 
 * Returns:
 * CURL_FORMADD_OK             on success
 * CURL_FORMADD_MEMORY         if the FormInfo allocation fails
 * CURL_FORMADD_OPTION_TWICE   if one option is given twice for one Form
 * CURL_FORMADD_NULL           if a null pointer was given for a char
 * CURL_FORMADD_MEMORY         if the allocation of a FormInfo struct failed
 * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used
 * CURL_FORMADD_INCOMPLETE     if the some FormInfo is not complete (or error)
 * CURL_FORMADD_MEMORY         if a HttpPost struct cannot be allocated
 * CURL_FORMADD_MEMORY         if some allocation for string copying failed.
 * CURL_FORMADD_ILLEGAL_ARRAY  if an illegal option is used in an array
 *
 ***************************************************************************/
 typedef enum {
  CURL_FORMADD_OK, /* first, no error */
  CURL_FORMADD_MEMORY,
  CURL_FORMADD_OPTION_TWICE,
  CURL_FORMADD_NULL,
  CURL_FORMADD_UNKNOWN_OPTION,
  CURL_FORMADD_INCOMPLETE,
  CURL_FORMADD_ILLEGAL_ARRAY,
  CURL_FORMADD_LAST /* last */
 } CURLFORMcode;
 CURLFORMcode curl_formadd(struct curl_httppost **httppost,
                 struct curl_httppost **last_post,
                 ...);
 /* cleanup a form: */
-void curl_formfree(struct HttpPost *form);
+void curl_formfree(struct curl_httppost *form);
 /* Unix and Win32 getenv function call, this returns a malloc()'ed string that
   MUST be free()ed after usage is complete. */
@@ -584,8 +747,8 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 /* This is the version number */
-#define LIBCURL_VERSION "7.9.2"
+#define LIBCURL_VERSION "7.9.8"
-#define LIBCURL_VERSION_NUM 0x070902
+#define LIBCURL_VERSION_NUM 0x070908
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
@@ -637,12 +800,20 @@ typedef enum {
  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
-  CURLINFO_LASTONE          = 18
+  CURLINFO_CONTENT_TYPE = CURLINFO_STRING + 18,
  CURLINFO_REDIRECT_TIME   = CURLINFO_DOUBLE + 19,
  CURLINFO_REDIRECT_COUNT  = CURLINFO_LONG + 20,
  /* Fill in new entries here! */
  CURLINFO_LASTONE          = 21
 } CURLINFO;
-/* unfortunately, the easy.h include file needs the options and info stuff
+/* unfortunately, the easy.h and multi.h include files need options and info
-   before it can be included! */
+  stuff before they can be included! */
 #include <curl/easy.h> /* nothing in curl is fun without the easy stuff */
 #include <curl/multi.h>
 typedef enum {
  CURLCLOSEPOLICY_NONE, /* first, never use this */
--- a/include/curl/easy.h
+++ b/include/curl/easy.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
--- a/include/curl/multi.h
+++ b/include/curl/multi.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
@@ -44,21 +44,27 @@
  o Enable the application to select() on its own file descriptors and curl's
    file descriptors simultaneous easily.
-  Example source using this interface: http://curl.haxx.se/dev/multi-app.c
+  Example sources using this interface is here: ../multi/
 */
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include <curl/types.h>
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #endif
 #include <curl/curl.h>
 typedef void CURLM;
 typedef enum {
  CURLM_CALL_MULTI_PERFORM=-1, /* please call curl_multi_perform() soon */
  CURLM_OK,
  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
  CURLM_LAST
 } CURLMcode;
--- a/include/curl/stdcheaders.h
+++ b/include/curl/stdcheaders.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
--- a/include/curl/types.h
+++ b/include/curl/types.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,16 +2,19 @@
 # $Id$
 #
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign nostdinc
-EXTRA_DIST = getdate.y \
+EXTRA_DIST = getdate.y Makefile.b32 Makefile.b32.resp Makefile.m32	    \
-       Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \
+       Makefile.vc6 Makefile.riscos libcurl.def dllinit.c curllib.dsp	    \
-       libcurl.def dllinit.c curllib.dsp curllib.dsw
+       curllib.dsw config-vms.h config-win32.h config-riscos.h config-mac.h \
       config.h.in
 lib_LTLIBRARIES = libcurl.la
-INCLUDES = -I$(top_srcdir)/include
+# we use srcdir/include for the static global include files
-
+# we use builddir/lib for the generated lib/config.h file to get found
 # we use srcdir/lib for the lib-private header files
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
 libcurl_la_LDFLAGS = -no-undefined -version-info 2:2:0
 # This flag accepts an argument of the form current[:revision[:age]]. So,
@@ -56,7 +59,9 @@ escape.c       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
 getinfo.c getinfo.h transfer.c strequal.c strequal.h easy.c \
 security.h security.c krb4.c krb4.h memdebug.c memdebug.h inet_ntoa_r.h \
-http_chunks.c http_chunks.h strtok.c strtok.h connect.c connect.h
+http_chunks.c http_chunks.h strtok.c strtok.h connect.c connect.h \
 llist.c llist.h hash.c hash.h multi.c
 noinst_HEADERS = setup.h transfer.h
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -35,14 +35,14 @@ libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
 	ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c	\
 	telnet.h getinfo.c strequal.c strequal.h easy.c security.h		\
 	security.c krb4.h krb4.c memdebug.h memdebug.c inet_ntoa_r.h http_chunks.h http_chunks.c \
-	strtok.c connect.c
+	strtok.c connect.c hash.c llist.c
 libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
 	formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
 	speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \
 	getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
 	strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \
-	strtok.o connect.o
+	strtok.o connect.o hash.o llist.o
 LIBRARIES =  $(libcurl_a_LIBRARIES)
 SOURCES = $(libcurl_a_SOURCES)
@@ -61,7 +61,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
 libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
 	-@erase $@
-	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32 -lws2_32
+	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32 -lws2_32 -lwinmm
 	$(STRIP) $@
 # remove the last line above to keep debug info
--- a/lib/Makefile.riscos
+++ b/lib/Makefile.riscos
@@ -0,0 +1,128 @@
 # Makefile for project libcurl
 # Generated on Sun,13 Jan 2002.16:57:00 by EasyGCC (0.1.3 [beta 2] (3 Jan 2002))
 # Contact: easygcc@melotech.co.uk
 # Project objects:
 objs =	o.base64 o.connect o.cookie o.dict \
 	o.dllinit o.easy o.escape o.file \
 	o.formdata o.ftp o.getdate o.getenv \
 	o.getinfo o.getpass o.hostip o.http \
 	o.http_chunks o.if2ip o.krb4 o.ldap \
 	o.memdebug o.mprintf o.netrc o.progress \
 	o.security o.sendf o.speedcheck o.ssluse \
 	o.strequal o.strtok o.telnet o.timeval \
 	o.transfer o.url o.version 
 # Compile options:
 linkopts	= -o libcurl
 compileropts	= -mpoke-function-name -IUtilLib: -mthrowback 
 # Project target:
 libcurl:		$(objs)
 		makealf $(linkopts) $(objs)
 # Static dependancies:
 o.base64:	c.base64
 		gcc $(compileropts) -c -o base64.o c.base64
 o.connect:	c.connect
 		gcc $(compileropts) -c -o connect.o c.connect
 o.cookie:	c.cookie
 		gcc $(compileropts) -c -o cookie.o c.cookie
 o.dict:	c.dict
 		gcc $(compileropts) -c -o dict.o c.dict
 o.dllinit:	c.dllinit
 		gcc $(compileropts) -c -o dllinit.o c.dllinit
 o.easy:	c.easy
 		gcc $(compileropts) -c -o easy.o c.easy
 o.escape:	c.escape
 		gcc $(compileropts) -c -o escape.o c.escape
 o.file:	c.file
 		gcc $(compileropts) -c -o file.o c.file
 o.formdata:	c.formdata
 		gcc $(compileropts) -c -o formdata.o c.formdata
 o.ftp:	c.ftp
 		gcc $(compileropts) -c -o ftp.o c.ftp
 o.getdate:	c.getdate
 		gcc $(compileropts) -c -o getdate.o c.getdate
 o.getenv:	c.getenv
 		gcc $(compileropts) -c -o getenv.o c.getenv
 o.getinfo:	c.getinfo
 		gcc $(compileropts) -c -o getinfo.o c.getinfo
 o.getpass:	c.getpass
 		gcc $(compileropts) -c -o getpass.o c.getpass
 o.hostip:	c.hostip
 		gcc $(compileropts) -c -o hostip.o c.hostip
 o.http:	c.http
 		gcc $(compileropts) -c -o http.o c.http
 o.http_chunks:	c.http_chunks
 		gcc $(compileropts) -c -o http_chunks.o c.http_chunks
 o.if2ip:	c.if2ip
 		gcc $(compileropts) -c -o if2ip.o c.if2ip
 o.krb4:	c.krb4
 		gcc $(compileropts) -c -o krb4.o c.krb4
 o.ldap:	c.ldap
 		gcc $(compileropts) -IOpenLDAP: -c -o ldap.o c.ldap
 o.memdebug:	c.memdebug
 		gcc $(compileropts) -c -o memdebug.o c.memdebug
 o.mprintf:	c.mprintf
 		gcc $(compileropts) -c -o mprintf.o c.mprintf
 o.netrc:	c.netrc
 		gcc $(compileropts) -c -o netrc.o c.netrc
 o.progress:	c.progress
 		gcc $(compileropts) -c -o progress.o c.progress
 o.security:	c.security
 		gcc $(compileropts) -c -o security.o c.security
 o.sendf:	c.sendf
 		gcc $(compileropts) -c -o sendf.o c.sendf
 o.speedcheck:	c.speedcheck
 		gcc $(compileropts) -c -o speedcheck.o c.speedcheck
 o.ssluse:	c.ssluse
 		gcc $(compileropts) -c -o ssluse.o c.ssluse
 o.strequal:	c.strequal
 		gcc $(compileropts) -c -o strequal.o c.strequal
 o.strtok:	c.strtok
 		gcc $(compileropts) -c -o strtok.o c.strtok
 o.telnet:	c.telnet
 		gcc $(compileropts) -c -o telnet.o c.telnet
 o.timeval:	c.timeval
 		gcc $(compileropts) -c -o timeval.o c.timeval
 o.transfer:	c.transfer
 		gcc $(compileropts) -c -o transfer.o c.transfer
 o.url:	c.url
 		gcc $(compileropts) -c -o url.o c.url
 o.version:	c.version
 		gcc $(compileropts) -c -o version.o c.version
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -23,13 +23,18 @@
 # CHANGE LOG
 # ------------------------------------------------------------
 # 05.11.2001   John Lask   Initial Release
 # 02.05.2002   Miklos Nemeth OPENSSL_PATH environment; no need
 #              for OpenSSL libraries when creating a 
 #              static libcurl.lib
 #
 #
 ##############################################################
 LIB_NAME       = libcurl
 LIB_NAME_DEBUG = libcurld
 !IFNDEF OPENSSL_PATH
 OPENSSL_PATH   = ../../openssl-0.9.6
 !ENDIF
 #############################################################
 ## Nothing more to do below this line!
@@ -42,7 +47,6 @@ CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB
 LNKDLL    = link.exe /DLL  /def:libcurl.def
 LNKLIB    = link.exe -lib
 LFLAGS    = /nologo
 LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
 LINKLIBS  = ws2_32.lib
 SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib
 CFGSET    = FALSE
@@ -75,8 +79,9 @@ CFGSET = TRUE
 !IF "$(CFG)" == "release-ssl"
 TARGET   =$(LIB_NAME).lib
 DIROBJ   =.\$(CFG)
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)
+LINKLIBS = $(LINKLIBS)
 CC       = $(CCNODBG) $(CFLAGSSSL)
 CFGSET   = TRUE
 !ENDIF
@@ -87,15 +92,13 @@ CFGSET   = TRUE
 !IF "$(CFG)" == "release-ssl-dll"
 TARGET   =$(LIB_NAME).dll
 DIROBJ   =.\$(CFG)
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
 LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC       = $(CCNODBG)  $(CFLAGSSSL)
 CFGSET   = TRUE
 !ENDIF
 ######################
 # debug
@@ -125,7 +128,7 @@ CFGSET = TRUE
 TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   =.\$(CFG)
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)
+LINKLIBS = $(LINKLIBS)
 CC       = $(CCDEBUG) $(CFLAGSSSL)
 CFGSET   = TRUE
 !ENDIF
@@ -193,8 +196,10 @@ X_OBJS= \
 	$(DIROBJ)\easy.obj \
 	$(DIROBJ)\strequal.obj \
 	$(DIROBJ)\strtok.obj \
-	$(DIROBJ)\connect.obj
+	$(DIROBJ)\connect.obj \
-
+	$(DIROBJ)\hash.obj \
 	$(DIROBJ)\llist.obj \
 	$(DIROBJ)\multi.obj
 all : $(TARGET)
--- a/lib/arpa_telnet.h
+++ b/lib/arpa_telnet.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
@@ -22,7 +22,7 @@
 *
 * $Id$
 *****************************************************************************/
-
+#ifndef CURL_DISABLE_TELNET
 /*
 * Telnet option defines. Add more here if in need.
 */
@@ -97,5 +97,5 @@ static const char *telnetcmds[]=
 #define TELCMD_OK(x) ( ((unsigned int)(x) >= TELCMD_MINIMUM) && \
                       ((unsigned int)(x) <= TELCMD_MAXIMUM) )
 #define TELCMD(x)    telnetcmds[(x)-TELCMD_MINIMUM]
-
+#endif
 #endif
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -5,7 +5,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2001, Andrew Francis and Daniel Stenberg
+ * Copyright (C) 1998 - 2002, 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.
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -0,0 +1,390 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* Name of this package! */
 #undef PACKAGE
 /* Version number of this archive. */
 #undef VERSION
 /* Define if you have the getpass function.  */
 #undef HAVE_GETPASS
 /* Define cpu-machine-OS */
 #define OS "ARM-RISC OS"
 /* Define if you have the gethostbyaddr_r() function with 5 arguments */
 #undef HAVE_GETHOSTBYADDR_R_5
 /* Define if you have the gethostbyaddr_r() function with 7 arguments */
 #undef HAVE_GETHOSTBYADDR_R_7
 /* Define if you have the gethostbyaddr_r() function with 8 arguments */
 #undef HAVE_GETHOSTBYADDR_R_8
 /* Define if you have the gethostbyname_r() function with 3 arguments */
 #undef HAVE_GETHOSTBYNAME_R_3
 /* Define if you have the gethostbyname_r() function with 5 arguments */
 #undef HAVE_GETHOSTBYNAME_R_5
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 /* Define if you have the inet_ntoa_r function declared. */
 #undef HAVE_INET_NTOA_R_DECL
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 /* Define if you have the Kerberos4 libraries (including -ldes) */
 #undef KRB4
 /* Define if you want to enable IPv6 support */
 #undef ENABLE_IPV6
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 /* Define this to 'int' if socklen_t is not an available typedefed type */
 #undef socklen_t
 /* Define this as a suitable file to read random data from */
 #undef RANDOM_FILE
 /* Define this to your Entropy Gathering Daemon socket pathname */
 #undef EGD_SOCKET
 /* Define if you have a working OpenSSL installation */
 #undef OPENSSL_ENABLED
 /* Set to explicitly specify we don't want to use thread-safe functions */
 #define DISABLED_THREADSAFE
 /* Define if you want to enable IPv6 support */
 #undef ENABLE_IPV6
 /* Define if you have the <alloca.h> header file. */
 #define HAVE_ALLOCA_H
 /* Define if you have the <arpa/inet.h> header file. */
 #define HAVE_ARPA_INET_H
 /* Define if you have the `closesocket' function. */
 #undef HAVE_CLOSESOCKET
 /* Define if you have the <crypto.h> header file. */
 #undef HAVE_CRYPTO_H
 /* Define if you have the <des.h> header file. */
 #undef HAVE_DES_H
 /* Define if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 /* Define if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
 /* Define if you have the <err.h> header file. */
 #undef HAVE_ERR_H
 /* Define if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H
 /* Define if getaddrinfo exists and works */
 #define HAVE_GETADDRINFO
 /* Define if you have the `geteuid' function. */
 #undef HAVE_GETEUID
 /* Define if you have the `gethostbyaddr' function. */
 #define HAVE_GETHOSTBYADDR
 /* Define if you have the `gethostbyaddr_r' function. */
 #undef HAVE_GETHOSTBYADDR_R
 /* Define if you have the `gethostbyname_r' function. */
 #undef HAVE_GETHOSTBYNAME_R
 /* Define if you have the `gethostname' function. */
 #define HAVE_GETHOSTNAME
 /* Define if you have the <getopt.h> header file. */
 #define HAVE_GETOPT_H
 /* Define if you have the `getpass_r' function. */
 #undef HAVE_GETPASS_R
 /* Define if you have the `getpwuid' function. */
 #undef HAVE_GETPWUID
 /* Define if you have the `getservbyname' function. */
 #undef HAVE_GETSERVBYNAME
 /* Define if you have the `gettimeofday' function. */
 #define HAVE_GETTIMEOFDAY
 /* Define if you have the `inet_addr' function. */
 #undef HAVE_INET_ADDR
 /* Define if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 /* Define if you have the `inet_ntoa_r' function. */
 #undef HAVE_INET_NTOA_R
 /* Define if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H
 /* Define if you have the <io.h> header file. */
 #define HAVE_IO_H
 /* Define if you have the `krb_get_our_ip_for_realm' function. */
 #undef HAVE_KRB_GET_OUR_IP_FOR_REALM
 /* Define if you have the <krb.h> header file. */
 #undef HAVE_KRB_H
 /* Define if you have the `crypto' library (-lcrypto). */
 #undef HAVE_LIBCRYPTO
 /* Define if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 /* Define if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 /* Define if you have the `resolv' library (-lresolv). */
 #undef HAVE_LIBRESOLV
 /* Define if you have the `resolve' library (-lresolve). */
 #undef HAVE_LIBRESOLVE
 /* Define if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 /* Define if you have the `ssl' library (-lssl). */
 #undef HAVE_LIBSSL
 /* Define if you have the `ucb' library (-lucb). */
 #undef HAVE_LIBUCB
 /* Define if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 /* Define if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H
 /* Define if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 /* Define if you have the <netdb.h> header file. */
 #define HAVE_NETDB_H
 /* Define if you have the <netinet/if_ether.h> header file. */
 #undef HAVE_NETINET_IF_ETHER_H
 /* Define if you have the <netinet/in.h> header file. */
 #define HAVE_NETINET_IN_H
 /* Define if you have the <net/if.h> header file. */
 #define HAVE_NET_IF_H
 /* Define if you have the <openssl/crypto.h> header file. */
 #undef HAVE_OPENSSL_CRYPTO_H
 /* Define if you have the <openssl/err.h> header file. */
 #undef HAVE_OPENSSL_ERR_H
 /* Define if you have the <openssl/pem.h> header file. */
 #undef HAVE_OPENSSL_PEM_H
 /* Define if you have the <openssl/rsa.h> header file. */
 #undef HAVE_OPENSSL_RSA_H
 /* Define if you have the <openssl/ssl.h> header file. */
 #undef HAVE_OPENSSL_SSL_H
 /* Define if you have the <openssl/x509.h> header file. */
 #undef HAVE_OPENSSL_X509_H
 /* Define if you have the <pem.h> header file. */
 #undef HAVE_PEM_H
 /* Define if you have the `perror' function. */
 #undef HAVE_PERROR
 /* Define if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 /* Define if you have the `RAND_egd' function. */
 #undef HAVE_RAND_EGD
 /* Define if you have the `RAND_screen' function. */
 #undef HAVE_RAND_SCREEN
 /* Define if you have the `RAND_status' function. */
 #undef HAVE_RAND_STATUS
 /* Define if you have the <rsa.h> header file. */
 #undef HAVE_RSA_H
 /* Define if you have the `select' function. */
 #define HAVE_SELECT
 /* Define if you have the `setvbuf' function. */
 #undef HAVE_SETVBUF
 /* Define if you have the <sgtty.h> header file. */
 #define HAVE_SGTTY_H
 /* Define if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 /* Define if you have the `signal' function. */
 #define HAVE_SIGNAL
 /* Define if you have the `socket' function. */
 #define HAVE_SOCKET
 /* Define if you have the <ssl.h> header file. */
 #undef HAVE_SSL_H
 /* Define if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 /* Define if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H
 /* Define if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 /* Define if you have the `strcmpi' function. */
 #undef HAVE_STRCMPI
 /* Define if you have the `strdup' function. */
 #define HAVE_STRDUP
 /* Define if you have the `strftime' function. */
 #define HAVE_STRFTIME
 /* Define if you have the `stricmp' function. */
 #define HAVE_STRICMP
 /* Define if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 /* Define if you have the <string.h> header file. */
 #define HAVE_STRING_H
 /* Define if you have the `strlcat' function. */
 #undef HAVE_STRLCAT
 /* Define if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 /* Define if you have the `strstr' function. */
 #define HAVE_STRSTR
 /* Define if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 /* Define if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 /* Define if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 /* Define if you have the <sys/socket.h> header file. */
 #define HAVE_SYS_SOCKET_H
 /* Define if you have the <sys/sockio.h> header file. */
 #undef HAVE_SYS_SOCKIO_H
 /* Define if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 /* Define if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H
 /* Define if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H
 /* Define if you have the `tcgetattr' function. */
 #define HAVE_TCGETATTR
 /* Define if you have the `tcsetattr' function. */
 #define HAVE_TCSETATTR
 /* Define if you have the <termios.h> header file. */
 #define HAVE_TERMIOS_H
 /* Define if you have the <termio.h> header file. */
 #undef HAVE_TERMIO_H
 /* Define if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 /* Define if you have the `uname' function. */
 #define HAVE_UNAME
 /* Define if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H
 /* Define if you have the <winsock.h> header file. */
 #undef HAVE_WINSOCK_H
 /* Define if you have the <x509.h> header file. */
 #undef HAVE_X509_H
 /* Name of package */
 #undef PACKAGE
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 /* The size of a `long double', as computed by sizeof. */
 #undef SIZEOF_LONG_DOUBLE
 /* The size of a `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 /* Define if you have the ANSI C header files. */
 #undef STDC_HEADERS
 /* Define if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 /* Version number of package */
 #undef VERSION
 /* Define if on AIX 3.
   System headers sometimes define this.
   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 /* type to use in place of socklen_t if not defined */
 #undef socklen_t
 /* Define to `int' if <sys/types.h> does not define. */
 #undef ssize_t
 /* this is a quick hack.  I hope it's correct. */
 #define ifr_dstaddr ifr_addr
 #define IOCTL_3_ARGS
 #define HAVE_FIONBIO
--- a/lib/config-vms.h
+++ b/lib/config-vms.h
@@ -221,22 +221,22 @@
 #define HAVE_NETINET_IN_H 1
 /* Define if you have the <openssl/crypto.h> header file.  */
-#undef HAVE_OPENSSL_CRYPTO_H
+#define HAVE_OPENSSL_CRYPTO_H 1
 /* Define if you have the <openssl/err.h> header file.  */
-#undef HAVE_OPENSSL_ERR_H
+#define HAVE_OPENSSL_ERR_H	1
 /* Define if you have the <openssl/pem.h> header file.  */
-#undef HAVE_OPENSSL_PEM_H
+#define HAVE_OPENSSL_PEM_H	1
 /* Define if you have the <openssl/rsa.h> header file.  */
-#undef HAVE_OPENSSL_RSA_H
+#define HAVE_OPENSSL_RSA_H 1
 /* Define if you have the <openssl/ssl.h> header file.  */
-#undef HAVE_OPENSSL_SSL_H
+#define HAVE_OPENSSL_SSL_H	1
 /* Define if you have the <openssl/x509.h> header file.  */
-#undef HAVE_OPENSSL_X509_H
+#define HAVE_OPENSSL_X509_H	1
 /* Define if you have the <pem.h> header file.  */
 #undef HAVE_PEM_H
@@ -296,7 +296,7 @@
 #undef HAVE_X509_H
 /* Define if you have the crypto library (-lcrypto).  */
-#undef HAVE_LIBCRYPTO
+#define HAVE_LIBCRYPTO 1
 /* Define if you have the dl library (-ldl).  */
 #undef HAVE_LIBDL
@@ -314,7 +314,7 @@
 #define HAVE_LIBSOCKET 1
 /* Define if you have the ssl library (-lssl).  */
-#undef HAVE_LIBSSL
+#define HAVE_LIBSSL	1
 /* Define if you have the ucb library (-lucb).  */
 #undef HAVE_LIBUCB
@@ -346,7 +346,7 @@
 #undef HAVE_GETPASS
 /* Define if you have a working OpenSSL installation */
-#undef OPENSSL_ENABLED
+#define OPENSSL_ENABLED	1
 /* Define if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
@@ -365,3 +365,7 @@
 #define HAVE_MEMORY_H   1
 #define HAVE_FIONBIO	1
 /* Define if you have the `sigsetjmp' function. */
 #define HAVE_SIGSETJMP 1
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -179,6 +179,9 @@
 /* Define if you have the RAND_screen function when using SSL  */
 #define HAVE_RAND_SCREEN 1
 /* Define if you have the `RAND_status' function. */
 #define HAVE_RAND_STATUS 1
 /* Define this to if in_addr_t is not an available typedefed type */
 #define in_addr_t unsigned long
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -5,7 +5,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
@@ -48,6 +48,10 @@
 #include <stdlib.h> /* required for free() prototype, without it, this crashes
                       on macos 68K */
 #endif
 #ifdef	VMS
 #include <in.h>
 #include <inet.h>
 #endif
 #endif
 #include <stdio.h>
@@ -181,7 +185,6 @@ int waitconnect(int sockfd, /* socket */
  return 0;
 }
 #ifndef ENABLE_IPV6
 static CURLcode bindlocal(struct connectdata *conn,
                          int sockfd)
 {
@@ -193,7 +196,7 @@ static CURLcode bindlocal(struct connectdata *conn,
 #ifdef HAVE_INET_NTOA
 #ifndef INADDR_NONE
-#define INADDR_NONE (unsigned long) ~0
+#define INADDR_NONE (in_addr_t) ~0
 #endif
  struct SessionHandle *data = conn->data;
@@ -203,24 +206,30 @@ static CURLcode bindlocal(struct connectdata *conn,
   *************************************************************/
  if (strlen(data->set.device)<255) {
    struct sockaddr_in sa;
-    struct hostent *h=NULL;
+    Curl_addrinfo *h=NULL;
    char *hostdataptr=NULL;
    size_t size;
    char myhost[256] = "";
-    unsigned long in;
+    in_addr_t in;
    if(Curl_if2ip(data->set.device, myhost, sizeof(myhost))) {
-      h = Curl_getaddrinfo(data, myhost, 0, &hostdataptr);
+      /*
       * We now have the numerical IPv4-style x.y.z.w in the 'myhost' buffer
       */
      h = Curl_resolv(data, myhost, 0);
    }
    else {
      if(strlen(data->set.device)>1) {
-        h = Curl_getaddrinfo(data, data->set.device, 0, &hostdataptr);
+        /*
-      }
+         * This was not an interface, resolve the name as a host name
         * or IP number
         */
        h = Curl_resolv(data, data->set.device, 0);
        if(h) {
          /* we know data->set.device is shorter than the myhost array */
          strcpy(myhost, data->set.device);
        }
      }
    }
    if(! *myhost) {
      /* need to fix this
@@ -229,21 +238,23 @@ static CURLcode bindlocal(struct connectdata *conn,
         hostent_buf,
         sizeof(hostent_buf));
      */
      if(hostdataptr)
        free(hostdataptr); /* allocated by Curl_getaddrinfo() */
      return CURLE_HTTP_PORT_FAILED;
    }
    infof(data, "We bind local end to %s\n", myhost);
-    if ( (in=inet_addr(myhost)) != INADDR_NONE ) {
+    in=inet_addr(myhost);
    if (INADDR_NONE != in) {
      if ( h ) {
        memset((char *)&sa, 0, sizeof(sa));
-        memcpy((char *)&sa.sin_addr,
+#ifdef ENABLE_IPV6
-               h->h_addr,
+        memcpy((char *)&sa.sin_addr, h->ai_addr, h->ai_addrlen);        
-               h->h_length);
+        sa.sin_family = h->ai_family;
 #else
        memcpy((char *)&sa.sin_addr, h->h_addr, h->h_length);
        sa.sin_family = AF_INET;
 #endif
        sa.sin_addr.s_addr = in;
        sa.sin_port = 0; /* get any port */
@@ -284,7 +295,7 @@ static CURLcode bindlocal(struct connectdata *conn,
            failf(data, "Insufficient kernel memory was available: %d", errno);
            break;
          default:
-            failf(data, "errno %d\n", errno);
+            failf(data, "errno %d", errno);
            break;
          } /* end of switch(errno) */
@@ -303,9 +314,6 @@ static CURLcode bindlocal(struct connectdata *conn,
      return CURLE_HTTP_PORT_FAILED;
    }
    if(hostdataptr)
      free(hostdataptr); /* allocated by Curl_getaddrinfo() */
    return CURLE_OK;
  } /* end of device selection support */
@@ -314,7 +322,7 @@ static CURLcode bindlocal(struct connectdata *conn,
  return CURLE_HTTP_PORT_FAILED;
 }
-#endif /* end of ipv4-specific section */
+
 static
 int socketerror(int sockfd)
@@ -345,6 +353,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
  int rc;
  int sockfd=-1;
  int aliasindex=0;
  char *hostname;
  struct timeval after;
  struct timeval before = Curl_tvnow();
@@ -364,8 +373,13 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
 #endif
    /* get the most strict timeout of the ones converted to milliseconds */
-    if(data->set.timeout &&
+    if(data->set.timeout && data->set.connecttimeout) {
-       (data->set.timeout>data->set.connecttimeout))
+      if (data->set.timeout < data->set.connecttimeout)
        timeout_ms = data->set.timeout*1000;
      else 
        timeout_ms = data->set.connecttimeout*1000;
    }
    else if(data->set.timeout)
      timeout_ms = data->set.timeout*1000;
    else
      timeout_ms = data->set.connecttimeout*1000;
@@ -373,10 +387,15 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
    /* subtract the passed time */
    timeout_ms -= (long)has_passed;
-    if(timeout_ms < 0)
+    if(timeout_ms < 0) {
      /* a precaution, no need to continue if time already is up */
      failf(data, "Connection time-out");
      return CURLE_OPERATION_TIMEOUTED;
    }
  }
  hostname = data->change.proxy?conn->proxyhost:conn->hostname;
  infof(data, "About to connect() to %s:%d\n", hostname, port);
 #ifdef ENABLE_IPV6
  /*
@@ -391,6 +410,14 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
      if (sockfd < 0)
        continue;
      if(conn->data->set.device) {
        /* user selected to bind the outgoing socket to a specified "device"
           before doing connect */
        CURLcode res = bindlocal(conn, sockfd);
        if(res)
          return res;
      }
      /* set socket non-blocking */
      Curl_nonblock(sockfd, TRUE);
@@ -417,7 +444,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
        case ECONNREFUSED: /* no one listening */
        default:
          /* unknown error, fallthrough and try another address! */
-          failf(data, "Failed to connect");
+          failf(data, "Failed connect to %s: %d", hostname, error);
          break;
        }
      }
@@ -430,6 +457,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
          /* we are connected, awesome! */
          break;
 	}
        failf(data, "socket error: %d", err);
        /* we are _not_ connected, it was a false alert, continue please */
      }
@@ -447,13 +475,10 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
      before = after;
      continue;
    }
-    if (sockfd < 0) {
+    if (sockfd < 0)
      failf(data, "connect() failed");
      return CURLE_COULDNT_CONNECT;
    }
-    /* now disable the non-blocking mode again */
+    /* leave the socket in non-blocking mode */
    Curl_nonblock(sockfd, FALSE);
    if(addr)
      *addr = ai; /* the address we ended up connected to */
@@ -523,7 +548,8 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
        break;
      default:
        /* unknown error, fallthrough and try another address! */
-        failf(data, "Failed to connect to IP number %d", aliasindex+1);
+        failf(data, "Failed to connect to %s IP number %d: %d",
              hostname, aliasindex+1, error);
        break;
      }
    }
@@ -555,12 +581,11 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
    /* no good connect was made */
    sclose(sockfd);
    *sockconn = -1;
-    failf(data, "Couldn't connect to host");
+    failf(data, "Connect failed");
    return CURLE_COULDNT_CONNECT;
  }
-  /* now disable the non-blocking mode again */
+  /* leave the socket in non-blocking mode */
  Curl_nonblock(sockfd, FALSE);
  if(addr)
    /* this is the address we've connected to */
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2002, 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.
--- a/Show More
+++ b/Show More