7.9.5 commit

added the "known bugs" file
new VMS messages from Nico Baggus
2002-03-07 08:50:18 +00:00 · 2002-03-07 08:29:24 +00:00 · 2002-03-06 23:18:22 +00:00 · 2002-03-06 22:52:00 +00:00 · 2002-03-06 22:19:16 +00:00 · 2002-03-06 22:08:11 +00:00
150 changed files with 9873 additions and 5058 deletions
--- a/2078
+++ b/2078
--- 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/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          || die "The command 'automake $MAKEFILES' failed"
--- 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`
@@ -69,7 +69,7 @@ AC_ARG_ENABLE(debug,
  *)   AC_MSG_RESULT(yes)
    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
-    CFLAGS="-W -Wall -Wwrite-strings -pedantic -g" 
+    CFLAGS="-W -Wall -Wwrite-strings -pedantic -Wundef -Wpointer-arith -Wcast-align -Wnested-externs -g" 
       ;;
  esac ],
       AC_MSG_RESULT(no)
@@ -392,6 +392,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 +473,8 @@ else
  dnl is there a localtime_r()
  CURL_CHECK_LOCALTIME_R()
  AC_CHECK_FUNCS( gmtime_r )
 fi
 dnl **********************************************************************
@@ -518,9 +524,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)
@@ -588,12 +594,14 @@ dnl AC_SUBST(RANLIB)
 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 +610,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
 	;;
--- a/docs/BUGS
+++ b/docs/BUGS
@@ -23,11 +23,16 @@ BUGS
  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
-  bad behaviour. You therefore need to supply your operating system's name and
+  bad behavior. You therefore need to supply your operating system's name and
  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
  you think matters.
  Since curl deals with networks, it often helps us a lot 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
  setup as you, we can't do much with it. What we instead ask of you is to get
@@ -36,8 +41,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: January 22, 2002 (http://curl.haxx.se/docs/faq.shtml)
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -33,7 +33,7 @@ FAQ
  3.6 Does curl support javascript, 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 favourite 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?
@@ -49,6 +49,7 @@ 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!
@@ -162,9 +163,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
@@ -334,11 +334,12 @@ 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 favourite 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
@@ -349,16 +350,9 @@ FAQ
        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?
@@ -386,7 +380,7 @@ FAQ
  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).
 4. Running Problems
@@ -478,6 +472,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 outpt 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
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -203,15 +203,32 @@ Win32
      ----------------------------
        Please read the OpenSSL documentation on how to compile and install
        the OpenSSL library.  This generates the libeay32.dll and ssleay32.dll
-        files.
+        files in the out32dll subdirectory in the OpenSSL home directory.  If
        you compiled OpenSSL static libraries (libeay32.lib, ssleay32.lib,
        RSAglue.lib) they are created in the out32 subdirectory.
        Run the 'vcvars32.bat' file to get the proper environment variables
-        set. Edit the makefile.vc6 in the lib directory and define
+        set. The vcvars32.bat file is part of the Microsoft development
-        OPENSSL_PATH.  Set the location of the OpenSSL library and run 'nmake
+        environment and you may find it in 'C:\Program Files\Microsoft Visual
-        vc-ssl' in the root directory.
+        Studio\vc98\bin' if 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 the 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 scr subdirectory.  This statically linked
        version is a standalone executable not requiring any DLL at
        runtime. This making method requires that you have build the static
        libraries of OpenSSL 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 executables 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,7 +395,8 @@ 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 one system curl compiles and
   runs on, that isn't listed, please let us know!
        - Alpha DEC OSF 4
        - Alpha Digital UNIX v3.2
@@ -376,6 +408,7 @@ PORTS
        - HP-PA Linux
        - MIPS IRIX 6.2, 6.5
        - MIPS Linux
        - Pocket PC/Win CE 3.0
        - Power AIX 4.2, 4.3.1, 4.3.2
        - PowerPC Darwin 1.0
        - PowerPC Linux
@@ -391,6 +424,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
--- 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,14 @@
 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!
 * curl_formadd() fails on OSF1. Why? Fix! Need help from OSF1 dudes.
  https://sourceforge.net/tracker/index.php?func=detail&aid=524433&group_id=976&atid=100976
 * 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
--- 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:
--- 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 $(man_MANS) $(HTMLPAGES)
 MAN2HTML= gnroff -man $< | man2html >$@
 SUFFIXES = .1 .3 .html
 html: $(HTMLPAGES)
 	cd libcurl; make html
 .3.html:
 	$(MAN2HTML)
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -76,3 +76,6 @@ 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>
--- a/docs/TODO
+++ b/docs/TODO
@@ -19,10 +19,7 @@ TODO
 * The new 'multi' interface is being designed. Work out the details, start
   implementing and write test applications!
-   [http://curl.haxx.se/dev/multi.h]
+   [http://curl.haxx.se/lxr/source/lib/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.
@@ -33,11 +30,36 @@ TODO
   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.
 * 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.
 * 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 indicate that it doesn't currently work
   properly.
 DOCUMENTATION
 * Document all CURLcode error codes, why they happen and what most likely
-   will make them not happen again.
+   will make them not happen again. In a libcurl point of view.
 FTP
@@ -52,19 +74,24 @@ 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.
 * Always use the FTP SIZE command before downloading, as that makes it more
   likely that we know the size when downloading. Some sites support SIZE but
   don't show the size in the RETR response!
 HTTP
 * Make it possible to supply normal POST data through the ordinary read data
   callback.
 * HTTP PUT for files passed on stdin *OR* when the --crlf option is
   used. Requires libcurl to send the file with chunked content
   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 +108,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 +176,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 "25 Feb 2002" "Curl 7.9.5" "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...]
@@ -511,7 +510,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 +538,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 +594,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.
@@ -677,7 +679,7 @@ If this option is used several times, the last one will be used.
 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 +690,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 +791,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,10 @@
 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 \
-	     multithread.c getinmemory.c ftpupload.c httpput.c
+	     multithread.c getinmemory.c ftpupload.c httpput.c \
 	     simplessl.c ftpgetresp.c http-post.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/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,92 @@
 /*
 * 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>
 /* To start with, we include the header from the lib directory. This should
   later of course be moved to the proper include dir. */
 #include "../lib/multi.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,87 @@
 /*
 * This is a simple example using the multi interface.
 */
 #include <stdio.h>
 #include <string.h>
 /* somewhat unix-specific */
 #include <sys/time.h>
 #include <unistd.h>
 /* To start with, we include the header from the lib directory. This should
   later of course be moved to the proper include dir. */
 #include "../lib/multi.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-single.c
+++ b/docs/examples/multi-single.c
@@ -0,0 +1,80 @@
 /*
 * 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>
 /* To start with, we include the header from the lib directory. This should
   later of course be moved to the proper include dir. */
 #include "../lib/multi.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/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/libcurl-the-guide
+++ b/docs/libcurl-the-guide
@@ -0,0 +1,911 @@
 $Id$
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 PROGRAMMING WITH LIBCURL
 About this Document
 This document will attempt to describe the general principle and some basic
 approaches to consider when programming with libcurl. The text will focus
 mainly on the C interface but might apply fairly well on other interfaces as
 well as they usually follow the C one pretty closely.
 This document will refer to 'the user' as the person writing the source code
 that uses libcurl. That would probably be you or someone in your position.
 What will be generally refered to as 'the program' will be the collected
 source code that you write that is using libcurl for transfers. The program
 is outside libcurl and libcurl is outside of the program.
 To get the more details on all options and functions described herein, please
 refer to their respective man pages.
 Building
 There are many different ways to build C programs. This chapter will assume a
 unix-style build process. If you use a different build system, you can still
 read this to get general information that may apply to your environment as
 well.
  Compiling the Program
    Your compiler needs to know where the libcurl headers are
    located. Therefore you must set your compiler's include path to point to
    the directory where you installed them. The 'curl-config'[3] tool can be
    used to get this information:
        $ curl-config --cflags
  Linking the Program with libcurl
    When having compiled the program, you need to link your object files to
    create a single executable. For that to succeed, you need to link with
    libcurl and possibly also with other libraries that libcurl itself depends
    on. Like OpenSSL librararies, but even some standard OS libraries may be
    needed on the command line. To figure out which flags to use, once again
    the 'curl-config' tool comes to the rescue:
        $ curl-config --libs
  SSL or Not
    libcurl can be built and customized in many ways. One of the things that
    varies from different libraries and builds is the support for SSL-based
    transfers, like HTTPS and FTPS. If OpenSSL was detected properly at
    build-time, libcurl will be built with SSL support. To figure out if an
    installed libcurl has been built with SSL support enabled, use
    'curl-config' like this:
        $ curl-config --feature
    And if SSL is supported, the keyword 'SSL' will be written to stdout,
    possibly together with a few other features that can be on and off on
    different libcurls.
 Portable Code in a Portable World
 The people behind libcurl have put a considerable effort to make libcurl work
 on a large amount of different operating systems and environments.
 You program libcurl the same way on all platforms that libcurl runs on. There
 are only very few minor considerations that differs. If you just make sure to
 write your code portable enough, you may very well create yourself a very
 portable program. libcurl shouldn't stop you from that.
 Global Preparation
 The program must initialize some of the libcurl functionality globally. That
 means it should be done exactly once, no matter how many times you intend to
 use the library. Once for your program's entire life time. This is done using
    curl_global_init()
 and it takes one parameter which is a bit pattern that tells libcurl what to
 intialize. Using CURL_GLOBAL_ALL will make it initialize all known internal
 sub modules, and might be a good default option. The current two bits that
 are specified are:
  CURL_GLOBAL_WIN32 which only does anything on Windows machines. When used on
  a Windows machine, it'll make libcurl intialize the win32 socket
  stuff. Without having that initialized properly, your program cannot use
  sockets properly. You should only do this once for each application, so if
  your program already does this or of another library in use does it, you
  should not tell libcurl to do this as well.
  CURL_GLOBAL_SSL which only does anything on libcurls compiled and built
  SSL-enabled. On these systems, this will make libcurl init OpenSSL properly
  for this application. This is only needed to do once for each application so
  if your program or another library already does this, this bit should not be
  needed.
 libcurl has a default protection mechanism that detects if curl_global_init()
 hasn't been called by the time curl_easy_perform() is called and if that is
 the case, libcurl runs the function itself with a guessed bit pattern. Please
 note that depending solely on this is not considered nice nor very good.
 When the program no longer uses libcurl, it should call
 curl_global_cleanup(), which is the opposite of the init call. It will then
 do the reversed operations to cleanup the resources the curl_global_init()
 call initialized.
 Repeated calls to curl_global_init() and curl_global_cleanup() should be
 avoided. They should only be called once each.
 Handle the Easy libcurl
 libcurl version 7 is oriented around the so called easy interface. All
 operations in the easy interface are prefixed with 'curl_easy'.
 Future libcurls will also offer the multi interface. More about that
 interface, what it is targeted for and how to use it is still only debated on
 the libcurl mailing list and developer web pages. Join up to discuss and
 figure out!
 To use the easy interface, you must first create yourself an easy handle. You
 need one handle for each easy session you want to perform. Basicly, you
 should use one handle for every thread you plan to use for transferring. You
 must never share the same handle in multiple threads.
 Get an easy handle with
    easyhandle = curl_easy_init();
 It returns an easy handle. Using that you proceed to the next step: setting
 up your preferred actions. A handle is just a logic entity for the upcoming
 transfer or series of transfers.
 You set properties and options for this handle using curl_easy_setopt(). They
 control how the subsequent transfer or transfers will be made. Options remain
 set in the handle until set again to something different. Alas, multiple
 requests using the same handle will use the same options.
 Many of the informationals you set in libcurl are "strings", pointers to data
 terminated with a zero byte. Keep in mind that when you set strings with
 curl_easy_setopt(), libcurl will not copy the data. It will merely point to
 the data. You MUST make sure that the data remains available for libcurl to
 use until finished or until you use the same option again to point to
 something else.
 One of the most basic properties to set in the handle is the URL. You set
 your preferred URL to transfer with CURLOPT_URL in a manner similar to:
    curl_easy_setopt(easyhandle, CURLOPT_URL, "http://curl.haxx.se/");
 Let's assume for a while that you want to receive data as the URL indentifies
 a remote resource you want to get here. Since you write a sort of application
 that needs this transfer, I assume that you would like to get the data passed
 to you directly instead of simply getting it passed to stdout. So, you write
 your own function that matches this prototype:
    size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
 You tell libcurl to pass all data to this function by issuing a function
 similar to this:
    curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, write_data);
 You can control what data your function get in the forth argument by setting
 another property:
    curl_easy_setopt(easyhandle, CURLOPT_FILE, &internal_struct);
 Using that property, you can easily pass local data between your application
 and the function that gets invoked by libcurl. libcurl itself won't touch the
 data you pass with CURLOPT_FILE.
 libcurl offers its own default internal callback that'll take care of the
 data if you don't set the callback with CURLOPT_WRITEFUNCTION. It will then
 simply output the received data to stdout. You can have the default callback
 write the data to a different file handle by passing a 'FILE *' to a file
 opened for writing with the CURLOPT_FILE option.
 Now, we need to take a step back and have a deep breath. Here's one of those
 rare platform-dependent nitpicks. Did you spot it? On some platforms[2],
 libcurl won't be able to operate on files opened by the program. Thus, if you
 use the default callback and pass in a an open file with CURLOPT_FILE, it
 will crash. You should therefore avoid this to make your program run fine
 virtually everywhere.
 There are of course many more options you can set, and we'll get back to a
 few of them later. Let's instead continue to the actual transfer:
    success = curl_easy_perform(easyhandle);
 The curl_easy_perform() will connect to the remote site, do the necessary
 commands and receive the transfer. Whenever it receives data, it calls the
 callback function we previously set. The function may get one byte at a time,
 or it may get many kilobytes at once. libcurl delivers as much as possible as
 often as possible. Your callback function should return the number of bytes
 it "took care of". If that is not the exact same amount of bytes that was
 passed to it, libcurl will abort the operation and return with an error code.
 When the transfer is complete, the function returns a return code that
 informs you if it succeeded in its mission or not. If a return code isn't
 enough for you, you can use the CURLOPT_ERRORBUFFER to point libcurl to a
 buffer of yours where it'll store a human readable error message as well.
 If you then want to transfer another file, the handle is ready to be used
 again. Mind you, it is even preferred that you re-use an existing handle if
 you intend to make another transfer. libcurl will then attempt to re-use the
 previous
 When It Doesn't Work
 There will always be times when the transfer fails for some reason. You might
 have set the wrong libcurl option or misunderstood what the libcurl option
 actually does, or the remote server might return non-standard replies that
 confuse the library which then confuses your program.
 There's one golden rule when these things occur: set the CURLOPT_VERBOSE
 option to TRUE. It'll cause the library to spew out the entire protocol
 details it sends, some internal info and some received protcol data as well
 (especially when using FTP). If you're using HTTP, adding the headers in the
 received output to study is also a clever way to get a better understanding
 wht the server behaves the way it does. Include headers in the normal body
 output with CURLOPT_HEADER set TRUE.
 Of course there are bugs left. We need to get to know about them to be able
 to fix them, so we're quite dependent on your bug reports! When you do report
 suspected bugs in libcurl, please include as much details you possibly can: a
 protocol dump that CURLOPT_VERBOSE produces, library version, as much as
 possible of your code that uses libcurl, operating system name and version,
 compiler name and version etc.
 Getting some in-depth knowledge about the protocols involved is never wrong,
 and if you're trying to do funny things, you might very well understand
 libcurl and how to use it better if you study the appropriate RFC documents
 at least briefly.
 Upload Data to a Remote Site
 libcurl tries to keep a protocol independent approach to most transfers, thus
 uploading to a remote FTP site is very similar to uploading data to a HTTP
 server with a PUT request.
 Of course, first you either create an easy handle or you re-use one existing
 one. Then you set the URL to operate on just like before. This is the remote
 URL, that we now will upload.
 Since we write an application, we most likely want libcurl to get the upload
 data by asking us for it. To make it do that, we set the read callback and
 the custom pointer libcurl will pass to our read callback. The read callback
 should have a prototype similar to:
    size_t function(char *bufptr, size_t size, size_t nitems, void *userp);
 Where bufptr is the pointer to a buffer we fill in with data to upload and
 size*nitems is the size of the buffer and therefore also the maximum amount
 of data we can return to libcurl in this call. The 'userp' pointer is the
 custom pointer we set to point to a struct of ours to pass private data
 between the application and the callback.
    curl_easy_setopt(easyhandle, CURLOPT_READFUNCTION, read_function);
    curl_easy_setopt(easyhandle, CURLOPT_INFILE, &filedata);
 Tell libcurl that we want to upload:
    curl_easy_setopt(easyhandle, CURLOPT_UPLOAD, TRUE);
 A few protocols won't behave properly when uploads are done without any prior
 knowledge of the expected file size. HTTP PUT is one example [1]. So, set the
 upload file size using the CURLOPT_INFILESIZE like this:
    curl_easy_setopt(easyhandle, CURLOPT_INFILESIZE, file_size);
 When you call curl_easy_perform() this time, it'll perform all the necessary
 operations and when it has invoked the upload it'll call your supplied
 callback to get the data to upload. The program should return as much data as
 possible in every invoke, as that is likely to make the upload perform as
 fast as possible. The callback should return the number of bytes it wrote in
 the buffer. Returning 0 will signal the end of the upload.
 Passwords
 Many protocols use or even require that user name and password are provided
 to be able to download or upload the data of your choice. libcurl offers
 several ways to specify them.
 Most protocols support that you specify the name and password in the URL
 itself. libcurl will detect this and use them accordingly. This is written
 like this:
        protocol://user:password@example.com/path/
 If you need any odd letters in your user name or password, you should enter
 them URL encoded, as %XX where XX is a two-digit hexadecimal number.
 libcurl also provides options to set various passwords. The user name and
 password as shown embedded in the URL can instead get set with the
 CURLOPT_USERPWD option. The argument passed to libcurl should be a char * to
 a string in the format "user:password:". In a manner like this:
        curl_easy_setopt(easyhandle, CURLOPT_USERPWD, "myname:thesecret");
 Another case where name and password might be needed at times, is for those
 users who need to athenticate themselves to a proxy they use. libcurl offers
 another option for this, the CURLOPT_PROXYUSERPWD. It is used quite similar
 to the CURLOPT_USERPWD option like this:
        curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "myname:thesecret");
 There's a long time unix "standard" way of storing ftp user names and
 passwords, namely in the $HOME/.netrc file. The file should be made private
 so that only the user may read it (see also the "Security Considerations"
 chapter), as it might contain the password in plain text. libcurl has the
 ability to use this file to figure out what set of user name and password to
 use for a particular host. As an extension to the normal functionality,
 libcurl also supports this file for non-FTP protocols such as HTTP. To make
 curl use this file, use the CURLOPT_NETRC option:
    curl_easy_setopt(easyhandle, CURLOPT_NETRC, TRUE);
 And a very basic example of how such a .netrc file may look like:
    machine myhost.mydomain.com
    login userlogin
    password secretword
 All these examples have been cases where the password has been optional, or
 at least you could leave it out and have libcurl attempt to do its job
 without it. There are times when the password isn't optional, like when
 you're using an SSL private key for secure transfers.
 You can in this situation either pass a password to libcurl to use to unlock
 the private key, or you can let libcurl prompt the user for it. If you prefer
 to ask the user, then you can provide your own callback function that will be
 called when libcurl wants the password. That way, you can control how the
 question will appear to the user.
 To pass the known private key password to libcurl:
    curl_easy_setopt(easyhandle, CURLOPT_SSLKEYPASSWD, "keypassword");
 To make a password callback:
    int enter_passwd(void *ourp, const char *prompt, char *buffer, int len);
    curl_easy_setopt(easyhandle, CURLOPT_PASSWDFUNCTION, enter_passwd);
 HTTP POSTing
 We get many questions regarding how to issue HTTP POSTs with libcurl the
 proper way. This chapter will thus include examples using both different
 versions of HTTP POST that libcurl supports.
 The first version is the simple POST, the most common version, that most HTML
 pages using the <form> tag uses. We provide a pointer to the data and tell
 libcurl to post it all to the remote site:
    char *data="name=daniel&project=curl";
    curl_easy_setopt(easyhandle, CURLOPT_POSTFIELDS, data);
    curl_easy_setopt(easyhandle, CURLOPT_URL, "http://posthere.com/");
    curl_easy_perform(easyhandle); /* post away! */
 Simple enough, huh? Since you set the POST options with the
 CURLOPT_POSTFIELDS, this automaticly switches the handle to use POST in the
 upcoming request.
 Ok, so what if you want to post binary data that also requires you to set the
 Content-Type: header of the post? Well, binary posts prevents libcurl from
 being able to do strlen() on the data to figure out the size, so therefore we
 must tell libcurl the size of the post data. Setting headers in libcurl
 requests are done in a generic way, by building a list of our own headers and
 then passing that list to libcurl.
    struct curl_slist *headers=NULL;
    headers = curl_slist_append(headers, "Content-Type: text/xml");
    /* post binary data */
    curl_easy_setopt(easyhandle, CURLOPT_POSTFIELD, binaryptr);
    /* set the size of the postfields data */
    curl_easy_setopt(easyhandle, CURLOPT_POSTFIELDSIZE, 23);
    /* pass our list of custom made headers */
    curl_easy_setopt(easyhandle, CURLOPT_HTTPHEADER, headers);
    curl_easy_perform(easyhandle); /* post away! */
    curl_slist_free_all(headers); /* free the header list */
 While the simple examples above cover the majority of all cases where HTTP
 POST operations are required, they don't do multipart formposts. Multipart
 formposts were introduced as a better way to post (possibly large) binary
 data and was first documented in the RFC1867. They're called multipart
 because they're built by a chain of parts, each being a single unit. Each
 part has its own name and contents. You can in fact create and post a
 multipart formpost with the regular libcurl POST support described above, but
 that would require that you build a formpost yourself and provide to
 libcurl. To make that easier, libcurl provides curl_formadd(). Using this
 function, you add parts to the form. When you're done adding parts, you post
 the whole form.
 The following example sets two simple text parts with plain textual contents,
 and then a file with binary contents and upload the whole thing.
    struct HttpPost *post=NULL;
    struct HttpPost *last=NULL;
    curl_formadd(&post, &last,
                 CURLFORM_COPYNAME, "name",
                 CURLFORM_COPYCONTENTS, "daniel", CURLFORM_END);
    curl_formadd(&post, &last,
                 CURLFORM_COPYNAME, "project",
                 CURLFORM_COPYCONTENTS, "curl", CURLFORM_END);
    curl_formadd(&post, &last,
                 CURLFORM_COPYNAME, "logotype-image",
                 CURLFORM_FILECONTENT, "curl.png", CURLFORM_END);
    /* Set the form info */
    curl_easy_setopt(easyhandle, CURLOPT_HTTPPOST, post);
    curl_easy_perform(easyhandle); /* post away! */
    /* free the post data again */
    curl_formfree(post);
 Multipart formposts are chains of parts using MIME-style separators and
 headers. It means that each one of these separate parts get a few headers set
 that describe the individual content-type, size etc. To enable your
 application to handicraft this formpost even more, libcurl allows you to
 supply your own set of custom headers to such an individual form part. You
 can of course supply headers to as many parts you like, but this little
 example will show how you set headers to one specific part when you add that
 to the post handle:
    struct curl_slist *headers=NULL;
    headers = curl_slist_append(headers, "Content-Type: text/xml");
    curl_formadd(&post, &last,
                 CURLFORM_COPYNAME, "logotype-image",
                 CURLFORM_FILECONTENT, "curl.xml",
                 CURLFORM_CONTENTHEADER, headers,
                 CURLFORM_END);
    curl_easy_perform(easyhandle); /* post away! */
    curl_formfree(post); /* free post */
    curl_slist_free_all(post); /* free custom header list */
 Since all options on an easyhandle are "sticky", they remain the same until
 changed even if you do call curl_easy_perform(), you may need to tell curl to
 go back to a plain GET request if you intend to do such a one as your next
 request. You force an easyhandle to back to GET by using the CURLOPT_HTTPGET
 option:
    curl_easy_setopt(easyhandle, CURLOPT_HTTPGET, TRUE);
 Just setting CURLOPT_POSTFIELDS to "" or NULL will *not* stop libcurl from
 doing a POST. It will just make it POST without any data to send!
 Showing Progress
 For historical and traditional reasons, libcurl has a built-in progress meter
 that can be switched on and then makes it presents a progress meter in your
 terminal.
 Switch on the progress meter by, oddly enough, set CURLOPT_NOPROGRESS to
 FALSE. This option is set to TRUE by default.
 For most applications however, the built-in progress meter is useless and
 what instead is interesting is the ability to specify a progress
 callback. The function pointer you pass to libcurl will then be called on
 irregular intervals with information about the current transfer.
 Set the progress callback by using CURLOPT_PROGRESSFUNCTION. And pass a
 pointer to a function that matches this prototype:
        int progress_callback(void *clientp,
                              double dltotal,
                              double dlnow,
                              double ultotal,
                              double ulnow);
 If any of the input arguments is unknown, a 0 will be passed. The first
 argument, the 'clientp' is the pointer you pass to libcurl with
 CURLOPT_PROGRESSDATA. libcurl won't touch it.
 libcurl with C++
 There's basicly only one thing to keep in mind when using C++ instead of C
 when interfacing libcurl:
    "The Callbacks Must Be Plain C"
 So if you want a write callback set in libcurl, you should put it within
 'extern'. Similar to this:
     extern "C" {
       size_t write_data(void *ptr, size_t size, size_t nmemb,
                         void *ourpointer)
       {
         /* do what you want with the data */
       }
    }
 This will of course effectively turn the callback code into C. There won't be
 any "this" pointer available etc.
 Proxies
 What "proxy" means according to Merriam-Webster: "a person authorized to act
 for another" but also "the agency, function, or office of a deputy who acts
 as a substitute for another".
 Proxies are exceedingly common these days. Companies often only offer
 internet access to employees through their HTTP proxies. Network clients or
 user-agents ask the proxy for docuements, the proxy does the actual request
 and then it returns them.
 libcurl has full support for HTTP proxies, so when a given URL is wanted,
 libcurl will ask the proxy for it instead of trying to connect to the actual
 host identified in the URL.
 The fact that the proxy is a HTTP proxy puts certain restrictions on what can
 actually happen. A requested URL that might not be a HTTP URL will be still
 be passed to the HTTP proxy to deliver back to libcurl. This happens
 transparantly, and an application may not need to know. I say "may", because
 at times it is very important to understand that all operations over a HTTP
 proxy is using the HTTP protocol. For example, you can't invoke your own
 custom FTP commands or even proper FTP directory listings.
  Proxy Options
    To tell libcurl to use a proxy at a given port number:
       curl_easy_setopt(easyhandle, CURLOPT_PROXY, "proxy-host.com:8080");
    Some proxies require user authentication before allowing a request, and
    you pass that information similar to this:
       curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "user:password");
    If you want to, you can specify the host name only in the CURLOPT_PROXY
    option, and set the port number separately with CURLOPT_PROXYPORT.
  Environment Variables
    libcurl automaticly checks and uses a set of environment variables to know
    what proxies to use for certain protocols. The names of the variables are
    following an ancient de facto standard and are built up as
    "[protocol]_proxy" (note the lower casing). Which makes the variable
    'http_proxy' checked for a name of a proxy to use when the input URL is
    HTTP. Following the same rule, the variable named 'ftp_proxy' is checked
    for FTP URLs. Again, the proxies are always HTTP proxies, the different
    names of the variables simply allows different HTTP proxies to be used.
    The proxy environment variable contents should be in the format
    "[protocol://]machine[:port]". Where the protocol:// part is simply
    ignored if present (so http://proxy and bluerk://proxy will do the same)
    and the optional port number specifies on which port the proxy operates on
    the host. If not specified, the internal default port number will be used
    and that is most likely *not* the one you would like it to be.
    There are two special environment variables. 'all_proxy' is what sets
    proxy for any URL in case the protocol specific variable wasn't set, and
    'no_proxy' defines a list of hosts that should not use a proxy even though
    a variable may say so. If 'no_proxy' is a plain asterisk ("*") it matches
    all hosts.
  SSL and Proxies
    SSL is for secure point-to-point connections. This involves strong
    encryption and similar things, which effectivly makes it impossible for a
    proxy to operate as a "man in between" which the proxy's task is, as
    previously discussed. Instead, the only way to have SSL work over a HTTP
    proxy is to ask the proxy to tunnel trough everything without being able
    to check or fiddle with the traffic.
    Opening an SSL connection over a HTTP proxy is therefor a matter of asking
    the proxy for a straight connection to the target host on a specified
    port. This is made with the HTTP request CONNECT. ("please mr proxy,
    connect me to that remote host").
    Because of the nature of this operation, where the proxy has no idea what
    kind of data that is passed in and out through this tunnel, this breaks
    some of the very few advantages that come from using a proxy, such as
    caching.  Many organizations prevent this kind of tunneling to other
    destination port numbers than 443 (which is the default HTTPS port
    number).
  Tunneling Through Proxy
    As explained above, tunneling is required for SSL to work and often even
    restricted to the operation intended for SSL; HTTPS.
    This is however not the only time proxy-tunneling might offer benefits to
    you or your application.
    As tunneling opens a direct connection from your application to the remote
    machine, it suddenly also re-introduces the ability to do non-HTTP
    operations over a HTTP proxy. You can in fact use things such as FTP
    upload or FTP custom commands this way.
    Again, this is often prevented by the adminstrators of proxies and is
    rarely allowed.
    Tell libcurl to use proxy tunneling like this:
       curl_easy_setopt(easyhandle, CURLOPT_HTTPPROXYTUNNEL, TRUE);
    In fact, there might even be times when you want to do plain HTTP
    operations using a tunnel like this, as it then enables you to operate on
    the remote server instead of asking the proxy to do so. libcurl will not
    stand in the way for such innovative actions either!
  Proxy Auto-Config
    Netscape first came up with this. It is basicly a web page (usually using
    a .pac extension) with a javascript that when executed by the browser with
    the requested URL as input, returns information to the browser on how to
    connect to the URL. The returned information might be "DIRECT" (which
    means no proxy should be used), "PROXY host:port" (to tell the browser
    where the proxy for this particular URL is) or "SOCKS host:port" (to
    direct the brower to a SOCKS proxy).
    libcurl has no means to interpret or evaluate javascript and thus it
    doesn't support this. If you get yourself in a position where you face
    this nasty invention, the following advice have been mentioned and used in
    the past:
    - 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.
 Persistancy Is The Way to Happiness
 Re-cycling the same easy handle several times when doing multiple requests is
 the way to go.
 After each single curl_easy_perform() operation, libcurl will keep the
 connection alive and open. A subsequent request using the same easy handle to
 the same host might just be able to use the already open connection! This
 reduces network impact a lot.
 Even if the connection is dropped, all connections involving SSL to the same
 host again, will benefit from libcurl's session ID cache that drasticly
 reduces re-connection time.
 FTP connections that are kept alive saves a lot of time, as the command-
 response roundtrips are skipped, and also you don't risk getting blocked
 without permission to login again like on many FTP servers only allowing N
 persons to be logged in at the same time.
 libcurl caches DNS name resolving results, to make lookups of a previously
 looked up name a lot faster.
 Other interesting details that improve performance for subsequent requests
 may also be added in the future.
 Each easy handle will attempt to keep the last few connections alive for a
 while in case they are to be used again. You can set the size of this "cache"
 with the CURLOPT_MAXCONNECTS option. Default is 5. It is very seldom any
 point in changing this value, and if you think of changing this it is often
 just a matter of thinking again.
 When the connection cache gets filled, libcurl must close an existing
 connection in order to get room for the new one. To know which connection to
 close, libcurl uses a "close policy" that you can affect with the
 CURLOPT_CLOSEPOLICY option. There's only two polices implemented as of this
 writing (libcurl 7.9.4) and they are:
  CURLCLOSEPOLICY_LEAST_RECENTLY_USED simply close the one that hasn't been
  used for the longest time. This is the default behavior.
  CURLCLOSEPOLICY_OLDEST closes the oldest connection, the one that was
  createst the longest time ago.
 There are, or at least were, plans to support a close policy that would call
 a user-specified callback to let the user be able to decide which connection
 to dump when this is necessary and therefor is the CURLOPT_CLOSEFUNCTION an
 existing option still today. Nothing ever uses this though and this will not
 be used within the forseeable future either.
 To force your upcoming request to not use an already existing connection (it
 will even close one first if there happens to be one alive to the same host
 you're about to operate on), you can do that by setting CURLOPT_FRESH_CONNECT
 to TRUE. In a similar spirit, you can also forbid the upcoming request to be
 "lying" around and possibly get re-used after the request by setting
 CURLOPT_FORBID_REUSE to TRUE.
 Customizing Operations
 There is an ongoing development today where more and more protocols are built
 upon HTTP for transport. This has obvious benefits as HTTP is a tested and
 reliable protocol that is widely deployed and have excellent proxy-support.
 When you use one of these protocols, and even when doing other kinds of
 programming you may need to change the traditional HTTP (or FTP or...)
 manners. You may need to change words, headers or various data.
 libcurl is your friend here too.
 If just changing the actual HTTP request keyword is what you want, like when
 GET, HEAD or POST is not good enough for you, CURLOPT_CUSTOMREQUEST is there
 for you. It is very simple to use:
    curl_easy_setopt(easyhandle, CURLOPT_CUSTOMREQUEST, "MYOWNRUQUEST");
 When using the custom request, you change the request keyword of the actual
 request you are performing. Thus, by default you make GET request but you can
 also make a POST operation (as described before) and then replace the POST
 keyword if you want to. You're the boss.
 HTTP-like protocols pass a series of headers to the server when doing the
 request, and you're free to pass any amount of extra headers that you think
 fit. Adding headers are this easy:
    struct curl_slist *headers;
    headers = curl_slist_append(headers, "Hey-server-hey: how are you?");
    headers = curl_slist_append(headers, "X-silly-content: yes");
    /* pass our list of custom made headers */
    curl_easy_setopt(easyhandle, CURLOPT_HTTPHEADER, headers);
    curl_easy_perform(easyhandle); /* transfer http */
    curl_slist_free_all(headers); /* free the header list */
 ... and if you think some of the internally generated headers, such as
 User-Agent:, Accept: or Host: don't contain the data you want them to
 contain, you can replace them by simply setting them too:
    headers = curl_slist_append(headers, "User-Agent: 007");
    headers = curl_slist_append(headers, "Host: munged.host.line");
 If you replace an existing header with one with no contents, you will prevent
 the header from being sent. Like if you want to completely prevent the
 "Accept:" header to be sent, you can disable it with code similar to this:
    headers = curl_slist_append(headers, "Accept:");
 Both replacing and cancelling internal headers should be done with careful
 consideration and you should be aware that you may violate the HTTP protocol
 when doing so.
 There's only one aspect left in the HTTP requests that we haven't yet
 mentioned how to modify: the version field. All HTTP requests includes the
 version number to tell the server which version we support. libcurl speak
 HTTP 1.1 by default. Some very old servers don't like getting 1.1-requests
 and when dealing with stubborn old things like that, you can tell libcurl to
 use 1.0 instead by doing something like this:
    curl_easy_setopt(easyhandle, CURLOPT_HTTP_VERSION, CURLHTTP_VERSION_1_0);
 Not all protocols are HTTP-like, and thus the above may not help you when you
 want to make for example your FTP transfers to behave differently.
 Sending custom commands to a FTP server means that you need to send the
 comands exactly as the FTP server expects them (RFC959 is a good guide here),
 and you can only use commands that work on the control-connection alone. All
 kinds of commands that requires data interchange and thus needs a
 data-connection must be left to libcurl's own judgement. Also be aware that
 libcurl will do its very best to change directory to the target directory
 before doing any transfer, so if you change directory (with CWD or similar)
 you might confuse libcurl and then it might not attempt to transfer the file
 in the correct remote directory.
 A little example that deletes a given file before an operation:
    headers = curl_slist_append(headers, "DELE file-to-remove");
    /* pass the list of custom commands to the handle */
    curl_easy_setopt(easyhandle, CURLOPT_QUOTE, headers);
    curl_easy_perform(easyhandle); /* transfer ftp data! */
    curl_slist_free_all(headers); /* free the header list */
 If you would instead want this operation (or chain of operations) to happen
 _after_ the data transfer took place the option to curl_easy_setopt() would
 instead be called CURLOPT_POSTQUOTE and used the exact same way.
 The custom FTP command will be issued to the server in the same order they
 are added to the list, and if a command gets an error code returned back from
 the server, no more commands will be issued and libcurl will bail out with an
 error code (CURLE_FTP_QUOTE_ERROR). Note that if you use CURLOPT_QUOTE to
 send commands before a transfer, no transfer will actually take place when a
 quote command has failed.
 If you set the CURLOPT_HEADER to true, you will tell libcurl to get
 information about the target file and output "headers" about it. The headers
 will be in "HTTP-style", looking like they do in HTTP.
 The option to enable headers or to run custom FTP commands may be useful to
 combine with CURLOPT_NOBODY. If this option is set, no actual file content
 transfer will be performed.
 Cookies Without Chocolate Chips
 In the HTTP sense, a cookie is a name with an associated value. A server
 sends the name and value to the client, and expects it to get sent back on
 every subsequent request to the server that matches the particular conditions
 set. The conditions include that the domain name and path match and that the
 cookie hasn't become too old.
 In real-world cases, servers send new cookies to replace existing one to
 update them. Server use cookies to "track" users and to keep "sessions".
 Cookies are sent from server to clients with the header Set-Cookie: and
 they're sent from clients to servers with the Cookie: header.
 To just send whatever cookie you want to a server, you can use CURLOPT_COOKIE
 to set a cookie string like this:
    curl_easy_setopt(easyhandle, CURLOPT_COOKIE, "name1=var1; name2=var2;");
 In many cases, that is not enough. You might want to dynamicly save whatever
 cookies the remote server passes to you, and make sure those cookies are then
 use accordingly on later requests.
 One way to do this, is to save all headers you receive in a plain file and
 when you make a request, you tell libcurl to read the previous headers to
 figure out which cookies to use. Set header file to read cookies from with
 CURLOPT_COOKIEFILE.
 The CURLOPT_COOKIEFILE option also automaticly enables the cookie parser in
 libcurl. Until the cookie parser is enabled, libcurl will not parse or
 understand incoming cookies and they will just be ignored. However, when the
 parser is enabled the cookies will be understood and the cookies will be kept
 in memory and used properly in subsequent requests when the same handle is
 used. Many times this is enough, and you may not have to save the cookies to
 disk at all. Note that the file you specify to CURLOPT_COOKIEFILE doesn't
 have to exist to enable the parser, so a common way to just enable the parser
 and not read able might be to use a file name you know doesn't exist.
 If you rather use existing cookies that you've previously received with your
 Netscape or Mozilla browsers, you can make libcurl use that cookie file as
 input. The CURLOPT_COOKIEFILE is used for that too, as libcurl will
 automaticly find out what kind of file it is and act accordingly.
 The perhaps most advanced cookie operation libcurl offers, is saving the
 entire internal cookie state back into a Netscape/Mozilla formatted cookie
 file. We call that the cookie-jar. When you set a file name with
 CURLOPT_COOKIEJAR, that file name will be created and all received cookies
 will be stored in it when curl_easy_cleanup() is called. This enabled cookies
 to get passed on properly between multiple handles without any information
 getting lost.
 Headers Equal Fun
 [ use the header callback for HTTP, FTP etc ]
 Post Transfer Information
 [ curl_easy_getinfo ]
 Security Considerations
 [ ps output, netrc plain text, plain text protocols / base64 ]
 SSL, Certificates and Other Tricks
 [ seeding, passwords, keys, certificates, ENGINE, ca certs ]
 Future
 [ multi interface, sharing between handles, mutexes, pipelining ]
 -----
 Footnotes:
 [1] = HTTP PUT without knowing the size prior to transfer is indeed possible,
      but libcurl does not support the chunked transfers on uploading that is
      necessary for this feature to work. We'd gratefully appreciate patches
      that bring this functionality...
 [2] = This happens on Windows machines when libcurl is built and used as a
      DLL. However, you can still do this on Windows if you link with a static
      library.
 [3] = The curl-config tool is generated at build-time (on unix-like systems)
      and should be installed with the 'make install' or similar instruction
      that installs the library, header files, man pages etc.
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -0,0 +1,68 @@
 #
 # $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
 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 \
 	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 "31 Jan 2001" "libcurl 7.9.4" "libcurl Manual"
 .SH NAME
 curl_easy_getinfo - Extract information from a curl session (added in 7.4)
 .SH SYNOPSIS
@@ -30,9 +30,11 @@ 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
@@ -95,6 +97,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 "10 Dec 2001" "libcurl 7.9.2" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - Set curl easy-session options
 .SH SYNOPSIS
@@ -77,9 +77,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
@@ -320,13 +319,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.
--- 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,7 +2,7 @@
 .\" nroff -man [file]
 .\" $Id$
 .\"
-.TH curl_formadd 3 "29 October 2001" "libcurl 7.9.1" "libcurl Manual"
+.TH curl_formadd 3 "1 Match 2002" "libcurl 7.9.1" "libcurl Manual"
 .SH NAME
 curl_formadd - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
@@ -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
@@ -80,8 +87,8 @@ Returns non-zero if an error occurs.
 .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,23 @@
 .\" $Id$
 .\"
 .TH curl_multi_fdset 3 "1 March 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.
 .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
--- a/docs/libcurl/curl_version.3
+++ b/docs/libcurl/curl_version.3
--- a/docs/libcurl/index.html
+++ b/docs/libcurl/index.html
--- a/docs/libcurl/libcurl.3
+++ b/docs/libcurl/libcurl.3
@@ -6,8 +6,10 @@
 .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
 Tcl programs as well, look elsewhere for documentation on this!
@@ -56,9 +58,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
--- 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) 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>
@@ -62,6 +62,7 @@ struct HttpPost {
  char *contents; /* pointer to allocated data contents */
  long contentslength; /* length of contents field */
  char *contenttype; /* Content-Type */
  struct curl_slist* contentheader; /* list of extra headers for this form */
  struct HttpPost *more; /* if one field name has more than one file, this
 			    link should link to following files */
  long flags;     /* as defined below */
@@ -74,10 +75,10 @@ struct HttpPost {
 };
 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);
 typedef size_t (*curl_write_callback)(char *buffer,
                                      size_t size,
@@ -155,6 +156,8 @@ 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 */
  CURL_LAST /* never use! */
 } CURLcode;
@@ -269,7 +272,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 +281,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),
@@ -466,6 +471,32 @@ 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),
  CURLOPT_LASTENTRY /* the last unusued */
 } CURLoption;
@@ -543,6 +574,7 @@ typedef enum {
  CFINIT(ARRAY_START), /* below are the options allowed within a array */
  CFINIT(FILE),
  CFINIT(CONTENTTYPE),
  CFINIT(CONTENTHEADER),
  CFINIT(END),
  CFINIT(ARRAY_END),   /* up are the options allowed within a array */
@@ -584,8 +616,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.5"
-#define LIBCURL_VERSION_NUM 0x070902
+#define LIBCURL_VERSION_NUM 0x070905
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
@@ -637,7 +669,11 @@ typedef enum {
  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
-  CURLINFO_LASTONE          = 18
+  CURLINFO_CONTENT_TYPE = CURLINFO_STRING + 18,
  /* Fill in new entries here! */
  CURLINFO_LASTONE          = 19
 } CURLINFO;
 /* unfortunately, the easy.h include file needs the options and info stuff
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,16 +2,20 @@
 # $Id$
 #
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign nostdinc
 EXTRA_DIST = getdate.y \
       Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \
-       libcurl.def dllinit.c curllib.dsp curllib.dsw
+       libcurl.def dllinit.c curllib.dsp 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 +60,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 multi.h
 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)
--- 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!
@@ -46,6 +51,8 @@ LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
 LINKLIBS  = ws2_32.lib
 SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib
 CFGSET    = FALSE
 LFLAGSSSL=
 SSLLIBS  =
 ######################
 # release
@@ -193,8 +200,9 @@ X_OBJS= \
 	$(DIROBJ)\easy.obj \
 	$(DIROBJ)\strequal.obj \
 	$(DIROBJ)\strtok.obj \
-	$(DIROBJ)\connect.obj
+	$(DIROBJ)\connect.obj \
-
+	$(DIROBJ)\hash.obj \
 	$(DIROBJ)\llist.obj
 all : $(TARGET)
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
--- 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,4 @@
 #define HAVE_MEMORY_H   1
 #define HAVE_FIONBIO	1
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -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>
@@ -193,7 +197,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;
@@ -207,14 +211,14 @@ static CURLcode bindlocal(struct connectdata *conn,
    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);
+      h = Curl_resolv(data, myhost, 0, &hostdataptr);
    }
    else {
      if(strlen(data->set.device)>1) {
-        h = Curl_getaddrinfo(data, data->set.device, 0, &hostdataptr);
+        h = Curl_resolv(data, data->set.device, 0, &hostdataptr);
      }
      if(h) {
        /* we know data->set.device is shorter than the myhost array */
@@ -229,14 +233,13 @@ 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));
@@ -284,7 +287,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 +306,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 */
@@ -364,8 +364,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 +378,12 @@ 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;
    }
  }
 #ifdef ENABLE_IPV6
  /*
@@ -452,8 +459,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
      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 */
@@ -559,8 +565,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
    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/cookie.c
+++ b/lib/cookie.c
@@ -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.
@@ -127,22 +127,37 @@ Curl_cookie_add(struct CookieInfo *c,
  if(httpheader) {
    /* This line was read off a HTTP-header */
-
+    char *sep;
    semiptr=strchr(lineptr, ';'); /* first, find a semicolon */
    ptr = lineptr;
    do {
      /* we have a <what>=<this> pair or a 'secure' word here */
-      if(strchr(ptr, '=')) {
+      sep = strchr(ptr, '=');
      if(sep && (!semiptr || (semiptr>sep)) ) {
        /*
         * There is a = sign and if there was a semicolon too, which make sure
         * that the semicolon comes _after_ the equal sign.
         */
        name[0]=what[0]=0; /* init the buffers */
-        if(1 <= sscanf(ptr, "%" MAX_NAME_TXT "[^=]=%"
+        if(1 <= sscanf(ptr, "%" MAX_NAME_TXT "[^;=]=%"
                       MAX_COOKIE_LINE_TXT "[^;\r\n]",
                       name, what)) {
-          /* this is a legal <what>=<this> pair */
+          /* this is a <name>=<what> pair */
          /* Strip off trailing whitespace from the 'what' */
          int len=strlen(what);
          while(len && isspace((int)what[len-1])) {
            what[len-1]=0;
            len--;
          }
          if(strequal("path", name)) {
            co->path=strdup(what);
          }
          else if(strequal("domain", name)) {
            co->domain=strdup(what);
            co->field1= (what[0]=='.')?2:1;
          }
          else if(strequal("version", name)) {
            co->version=strdup(what);
@@ -159,7 +174,7 @@ Curl_cookie_add(struct CookieInfo *c,
             */
            co->maxage = strdup(what);
            co->expires =
-              atoi((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0]);
+              atoi((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0]) + now;
          }
          else if(strequal("expires", name)) {
            co->expirestr=strdup(what);
@@ -187,15 +202,37 @@ Curl_cookie_add(struct CookieInfo *c,
        }
      }
-      if(!semiptr)
+      if(!semiptr || !*semiptr) {
-        continue; /* we already know there are no more cookies */
+        /* we already know there are no more cookies */
        semiptr = NULL;
        continue;
      }
      ptr=semiptr+1;
      while(ptr && *ptr && isspace((int)*ptr))
        ptr++;
      semiptr=strchr(ptr, ';'); /* now, find the next semicolon */
      if(!semiptr && *ptr)
        /* There are no more semicolons, but there's a final name=value pair
           coming up */
        semiptr=strchr(ptr, '\0');
    } while(semiptr);
    if(NULL == co->name) {
      /* we didn't get a cookie name, this is an illegal line, bail out */
      if(co->domain)
        free(co->domain);
      if(co->path)
        free(co->path);
      if(co->name)
        free(co->name);
      if(co->value)
        free(co->value);
      free(co);
      return NULL;
    }
    if(NULL == co->domain)
      /* no domain given in the header line, set the default now */
      co->domain=domain?strdup(domain):NULL;
@@ -377,8 +414,15 @@ Curl_cookie_add(struct CookieInfo *c,
        free(co);   /* free the newly alloced memory */
        co = clist; /* point to the previous struct instead */
      }
        /* We have replaced a cookie, now skip the rest of the list but
           make sure the 'lastc' pointer is properly set */
        do {
          lastc = clist;
          clist = clist->next;
        } while(clist);
        break;
      }
    }
    lastc = clist;
    clist = clist->next;
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -38,7 +38,7 @@ struct Cookie {
  char *value;       /* name = <this> */
  char *path;	      /* path = <this> */
  char *domain;      /* domain = <this> */
-  time_t expires;    /* expires = <this> */
+  long expires;    /* expires = <this> */
  char *expirestr;   /* the plain text version */
  char field1;       /* read from a cookie file, 1 => FALSE, 2=> TRUE */
--- a/lib/curllib.dsp
+++ b/lib/curllib.dsp
@@ -151,6 +151,10 @@ SOURCE=.\getpass.c
 # End Source File
 # Begin Source File
 SOURCE=.\hash.c
 # End Source File
 # Begin Source File
 SOURCE=.\hostip.c
 # End Source File
 # Begin Source File
@@ -179,6 +183,10 @@ SOURCE=.\libcurl.def
 # End Source File
 # Begin Source File
 SOURCE=.\llist.c
 # End Source File
 # Begin Source File
 SOURCE=.\memdebug.c
 # End Source File
 # Begin Source File
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -121,7 +121,7 @@ CURLcode Curl_dict(struct connectdata *conn)
    }
    if ((word == NULL) || (*word == (char)0)) {
-      failf(data, "lookup word is missing\n");
+      failf(data, "lookup word is missing");
    }
    if ((database == NULL) || (*database == (char)0)) {
      database = (char *)"!";
@@ -174,7 +174,7 @@ CURLcode Curl_dict(struct connectdata *conn)
    }
    if ((word == NULL) || (*word == (char)0)) {
-      failf(data, "lookup word is missing\n");
+      failf(data, "lookup word is missing");
    }
    if ((database == NULL) || (*database == (char)0)) {
      database = (char *)"!";
--- a/lib/dllinit.c
+++ b/lib/dllinit.c
@@ -81,6 +81,10 @@ DllMain (
    }
  return TRUE;
 }
 #else
 #ifdef VMS
 int VOID_VAR_DLLINIT;	
 #endif
 #endif
 /*
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -76,6 +76,7 @@
 #include "ssluse.h"
 #include "url.h"
 #include "getinfo.h"
 #include "hostip.h"
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -162,6 +163,8 @@ void curl_global_cleanup(void)
  if (!initialized)
    return;
  Curl_global_host_cache_dtor();
  if (init_flags & CURL_GLOBAL_SSL)
    Curl_SSL_cleanup();
@@ -230,12 +233,24 @@ CURLcode curl_easy_perform(CURL *curl)
 {
  struct SessionHandle *data = (struct SessionHandle *)curl;
  if (!data->hostcache) {
    if (Curl_global_host_cache_use(data)) {
      data->hostcache = Curl_global_host_cache_get();
    }
    else {
      data->hostcache = curl_hash_alloc(7, Curl_freeaddrinfo);
    }
  }
  return Curl_perform(data);
 }
 void curl_easy_cleanup(CURL *curl)
 {
  struct SessionHandle *data = (struct SessionHandle *)curl;
  if (!Curl_global_host_cache_use(data)) {
    curl_hash_destroy(data->hostcache);
  }
  Curl_close(data);
 }
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -235,7 +235,6 @@ int FormParse(char *input,
 	    if(2 != sscanf(type, "%127[^/]/%127[^,\n]",
 			   major, minor)) {
 	      fprintf(stderr, "Illegally formatted content-type field!\n");
              free(contents);
 	      return 2; /* illegal content-type syntax! */
 	    }
@@ -371,7 +370,6 @@ int FormParse(char *input,
  }
  else {
    fprintf(stderr, "Illegally formatted input field!\n");
    free(contents);
    return 1;
  }
@@ -402,6 +400,7 @@ static struct HttpPost * AddHttpPost (char * name,
                                     long contentslength,
                                     char *contenttype,
                                     long flags,
                                     struct curl_slist* contentHeader,
                                     struct HttpPost *parent_post,
                                     struct HttpPost **httppost,
                                     struct HttpPost **last_post)
@@ -415,6 +414,7 @@ static struct HttpPost * AddHttpPost (char * name,
    post->contents = value;
    post->contentslength = contentslength;
    post->contenttype = contenttype;
    post->contentheader = contentHeader;
    post->flags = flags;
  }
  else
@@ -823,8 +823,22 @@ FORMcode FormAdd(struct HttpPost **httppost,
 	}
        break;
      }
    case CURLFORM_CONTENTHEADER:
      {
        struct curl_slist* list = NULL;
        if( array_state )
          list = (struct curl_slist*)array_value;
        else
          list = va_arg(params,struct curl_slist*);
        if( current_form->contentheader )
          return_value = FORMADD_OPTION_TWICE;
        else
          current_form->contentheader = list;
        break;
      }
    default:
      fprintf (stderr, "got unknown CURLFORM_OPTION: %d\n", option);
      return_value = FORMADD_UNKNOWN_OPTION;
    }
  }
@@ -872,13 +886,16 @@ FORMcode FormAdd(struct HttpPost **httppost,
            break;
          }
        }
-        if ( (post = AddHttpPost(form->name, form->namelength,
+        post = AddHttpPost(form->name, form->namelength,
                           form->value, form->contentslength,
                           form->contenttype, form->flags,
                           form->contentheader,
                           post, httppost,
-                                 last_post)) == NULL) {
+                           last_post);
        if(!post)
          return_value = FORMADD_MEMORY;
-        }
+
        if (form->contenttype)
          prevtype = form->contenttype;
      }
@@ -1029,6 +1046,8 @@ struct FormData *Curl_getFormData(struct HttpPost *post,
  int size =0;
  char *boundary;
  char *fileboundary=NULL;
  struct curl_slist* curList;
  if(!post)
    return NULL; /* no input => no output! */
@@ -1046,8 +1065,11 @@ struct FormData *Curl_getFormData(struct HttpPost *post,
  do {
    if(size)
      size += AddFormDataf(&form, "\r\n");
    /* boundary */
-    size += AddFormDataf(&form, "\r\n--%s\r\n", boundary);
+    size += AddFormDataf(&form, "--%s\r\n", boundary);
    size += AddFormData(&form,
                        "Content-Disposition: form-data; name=\"", 0);
@@ -1090,6 +1112,13 @@ struct FormData *Curl_getFormData(struct HttpPost *post,
 			     file->contenttype);
      }
      curList = file->contentheader;
      while( curList ) {
        /* Process the additional headers specified for this form */
        size += AddFormDataf( &form, "\r\n%s", curList->data );
        curList = curList->next;
      }
 #if 0
      /* The header Content-Transfer-Encoding: seems to confuse some receivers
       * (like the built-in PHP engine). While I can't see any reason why it
@@ -1126,10 +1155,13 @@ struct FormData *Curl_getFormData(struct HttpPost *post,
 	  }
          if(fileread != stdin)
            fclose(fileread);
 	} else {
 	  size += AddFormData(&form, "[File wasn't found by client]", 0);
 	}
-      } else {
+        else {
          /* File wasn't found, add a nothing field! */
 	  size += AddFormData(&form, "", 0);
 	}
      }
 else {
 	/* include the contents we got */
 	size += AddFormData(&form, post->contents, post->contentslength);
      }
--- a/lib/formdata.h
+++ b/lib/formdata.h
@@ -44,6 +44,7 @@ typedef struct FormInfo {
  long contentslength;
  char *contenttype;
  long flags;
  struct curl_slist* contentheader;
  struct FormInfo *more;
 } FormInfo;
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -55,6 +55,7 @@
 #include <netdb.h>
 #endif
 #ifdef	VMS
 #include <in.h>
 #include <inet.h>
 #endif
 #endif
@@ -84,6 +85,10 @@
 #include "ssluse.h"
 #include "connect.h"
 #if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
 #include "inet_ntoa_r.h"
 #endif
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -193,8 +198,11 @@ int Curl_GetFTPResponse(char *buf,
  int code=0; /* default "error code" to return */
 #define SELECT_OK       0
-#define SELECT_ERROR   1
+#define SELECT_ERROR    1 /* select() problems */
-#define SELECT_TIMEOUT 2
+#define SELECT_TIMEOUT  2 /* took too long */
 #define SELECT_MEMORY   3 /* no available memory */
 #define SELECT_CALLBACK 4 /* aborted by callback */
  int error = SELECT_OK;
  struct FTP *ftp = conn->proto.ftp;
@@ -260,9 +268,16 @@ int Curl_GetFTPResponse(char *buf,
        ftp->cache = NULL;   /* clear the pointer */
        ftp->cache_size = 0; /* zero the size just in case */
      }
-      else if(CURLE_OK != Curl_read(conn, sockfd, ptr,
+      else {
-                                    BUFSIZE-nread, &gotbytes))
+        int res = Curl_read(conn, sockfd, ptr,
                            BUFSIZE-nread, &gotbytes);
        if(res < 0)
          /* EWOULDBLOCK */
          continue; /* go looping again */
        if(CURLE_OK != res)
          keepon = FALSE;
      }
      if(!keepon)
        ;
@@ -283,6 +298,7 @@ int Curl_GetFTPResponse(char *buf,
          if(*ptr=='\n') {
            /* a newline is CRLF in ftp-talk, so the CR is ignored as
               the line isn't really terminated until the LF comes */
            CURLcode result;
            /* output debug output if that is requested */
            if(data->set.verbose) {
@@ -291,6 +307,16 @@ int Curl_GetFTPResponse(char *buf,
              /* no need to output LF here, it is part of the data */
            }
            /*
             * We pass all response-lines to the callback function registered
             * for "headers". The response lines can be seen as a kind of
             * headers.
             */
            result = Curl_client_write(data, CLIENTWRITE_HEADER,
                                       line_start, perline);
            if(result)
              return -SELECT_CALLBACK;
 #define lastline(line) (isdigit((int)line[0]) && isdigit((int)line[1]) && \
 			isdigit((int)line[2]) && (' ' == line[3]))
@@ -324,7 +350,7 @@ int Curl_GetFTPResponse(char *buf,
          if(ftp->cache)
            memcpy(ftp->cache, line_start, ftp->cache_size);
          else
-            return CURLE_OUT_OF_MEMORY; /**BANG**/
+            return -SELECT_MEMORY; /**BANG**/
        }
      } /* there was data */
    } /* if(no error) */
@@ -333,7 +359,7 @@ int Curl_GetFTPResponse(char *buf,
  if(!error)
    code = atoi(buf);
-#if KRB4
+#ifdef KRB4
  /* handle the security-oriented responses 6xx ***/
  /* FIXME: some errorchecking perhaps... ***/
  switch(code) {
@@ -847,13 +873,17 @@ ftp_pasv_verbose(struct connectdata *conn,
 #ifdef HAVE_INET_NTOA_R
  char ntoa_buf[64];
 #endif
-  char hostent_buf[9000];
+  /* The array size trick below is to make this a large chunk of memory
     suitably 8-byte aligned on 64-bit platforms. This was thoughtfully
     suggested by Philip Gladstone. */
  long bigbuf[9000 / sizeof(long)];
 #if defined(HAVE_INET_ADDR)
  in_addr_t address;
 # if defined(HAVE_GETHOSTBYADDR_R)
  int h_errnop;
 # endif
  char *hostent_buf = (char *)bigbuf; /* get a char * to the buffer */
  address = inet_addr(newhost);
 # ifdef HAVE_GETHOSTBYADDR_R
@@ -882,7 +912,7 @@ ftp_pasv_verbose(struct connectdata *conn,
 #  ifdef HAVE_GETHOSTBYADDR_R_7
  /* Solaris and IRIX */
  answer = gethostbyaddr_r((char *) &address, sizeof(address), AF_INET,
-                           (struct hostent *)hostent_buf,
+                           (struct hostent *)bigbuf,
                           hostent_buf + sizeof(*answer),
                           sizeof(hostent_buf) - sizeof(*answer),
                           &h_errnop);
@@ -1169,30 +1199,30 @@ CURLcode ftp_use_port(struct connectdata *conn)
  struct sockaddr_in sa;
  struct hostent *h=NULL;
  char *hostdataptr=NULL;
  size_t size;
  unsigned short porttouse;
  char myhost[256] = "";
  if(data->set.ftpport) {
    if(Curl_if2ip(data->set.ftpport, myhost, sizeof(myhost))) {
-      h = Curl_getaddrinfo(data, myhost, 0, &hostdataptr);
+      h = Curl_resolv(data, myhost, 0, &hostdataptr);
    }
    else {
-      if(strlen(data->set.ftpport)>1)
+      int len = strlen(data->set.ftpport);
-        h = Curl_getaddrinfo(data, data->set.ftpport, 0, &hostdataptr);
+      if(len>1)
        h = Curl_resolv(data, data->set.ftpport, 0, &hostdataptr);
      if(h)
        strcpy(myhost, data->set.ftpport); /* buffer overflow risk */
    }
  }
  if(! *myhost) {
-    h=Curl_getaddrinfo(data,
+    char *tmp_host = getmyhost(myhost, sizeof(myhost));
-                       getmyhost(myhost, sizeof(myhost)),
+    h=Curl_resolv(data, tmp_host, 0, &hostdataptr);
                       0, &hostdataptr);
  }
  infof(data, "We connect from %s\n", myhost);
  if ( h ) {
    if( (portsock = socket(AF_INET, SOCK_STREAM, 0)) >= 0 ) {
      int size;
      /* we set the secondary socket variable to this for now, it
         is only so that the cleanup function will close it in case
@@ -1211,10 +1241,10 @@ CURLcode ftp_use_port(struct connectdata *conn)
      if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) {
        /* we succeeded to bind */
        struct sockaddr_in add;
-        size = sizeof(add);
+        socklen_t socksize = sizeof(add);
        if(getsockname(portsock, (struct sockaddr *) &add,
-                       (socklen_t *)&size)<0) {
+                       &socksize)<0) {
          failf(data, "getsockname() failed");
          return CURLE_FTP_PORT_FAILED;
        }
@@ -1237,9 +1267,6 @@ CURLcode ftp_use_port(struct connectdata *conn)
      free(hostdataptr);
      return CURLE_FTP_PORT_FAILED;
    }
    if(hostdataptr)
      /* free the memory used for name lookup */
      Curl_freeaddrinfo(hostdataptr);
  }
  else {
    failf(data, "could't find my own IP address (%s)", myhost);
@@ -1431,7 +1458,7 @@ CURLcode ftp_use_pasv(struct connectdata *conn)
  }
  else {
    /* normal, direct, ftp connection */
-    addr = Curl_getaddrinfo(data, newhostp, newport, &hostdataptr);
+    addr = Curl_resolv(data, newhostp, newport, &hostdataptr);
    if(!addr) {
      failf(data, "Can't resolve new host %s", newhost);
      return CURLE_FTP_CANT_GET_HOST;
@@ -1450,9 +1477,6 @@ CURLcode ftp_use_pasv(struct connectdata *conn)
    /* this just dumps information about this second connection */
    ftp_pasv_verbose(conn, conninfo, newhost, connectport);
  if(hostdataptr)
    Curl_freeaddrinfo(hostdataptr);
  if(CURLE_OK != result)
    return result;
@@ -1517,9 +1541,10 @@ CURLcode ftp_perform(struct connectdata *conn)
      return result;
  }
-  /* If we have selected NOBODY, it means that we only want file information.
+  /* If we have selected NOBODY and HEADER, it means that we only want file
-     Which in FTP can't be much more than the file size! */
+     information. Which in FTP can't be much more than the file size and
-  if(data->set.no_body) {
+     date. */
  if(data->set.no_body && data->set.include_header) {
    /* The SIZE command is _not_ RFC 959 specified, and therefor many servers
       may not support it! It is however the only way we have to get a file's
       size! */
@@ -1551,7 +1576,7 @@ CURLcode ftp_perform(struct connectdata *conn)
      struct tm buffer;
      tm = (struct tm *)localtime_r(&data->info.filetime, &buffer);
 #else
-      tm = localtime(&data->info.filetime);
+      tm = localtime((unsigned long *)&data->info.filetime);
 #endif
      /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
      strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S %Z\r\n",
@@ -1565,20 +1590,27 @@ CURLcode ftp_perform(struct connectdata *conn)
    return CURLE_OK;
  }
  if(data->set.no_body)
    /* don't transfer the data */
    ;
  /* Get us a second connection up and connected */
-  if(data->set.ftp_use_port)
+  else if(data->set.ftp_use_port) {
    /* We have chosen to use the PORT command */
    result = ftp_use_port(conn);
-  else
+    if(CURLE_OK == result)
      /* we have the data connection ready */
      infof(data, "Connected the data stream with PORT!\n");
  }
  else {
    /* We have chosen (this is default) to use the PASV command */
    result = ftp_use_pasv(conn);
    if(CURLE_OK == result)
      infof(data, "Connected the data stream with PASV!\n");
  }
  if(result)
    return result;
  /* we have the data connection ready */
  infof(data, "Connected the data stream!\n");
  if(data->set.upload) {
    /* Set type to binary (unless specified ASCII) */
@@ -1586,6 +1618,12 @@ CURLcode ftp_perform(struct connectdata *conn)
    if(result)
      return result;
    /* Send any PREQUOTE strings after transfer type is set? (Wesley Laxton)*/
    if(data->set.prequote) {
      if ((result = ftp_sendquote(conn, data->set.prequote)) != CURLE_OK)
        return result;
    }
    if(conn->resume_from) {
      /* we're about to continue the uploading of a file */
      /* 1. get already existing file's size. We use the SIZE
@@ -1634,7 +1672,7 @@ CURLcode ftp_perform(struct connectdata *conn)
          passed += actuallyread;
          if(actuallyread != readthisamountnow) {
-            failf(data, "Could only read %d bytes from the input\n", passed);
+            failf(data, "Could only read %d bytes from the input", passed);
            return CURLE_FTP_COULDNT_USE_REST;
          }
        }
@@ -1701,7 +1739,7 @@ CURLcode ftp_perform(struct connectdata *conn)
      return result;
  }
-  else {
+  else if(!data->set.no_body) {
    /* Retrieve file or directory */
    bool dirlist=FALSE;
    long downloadsize=-1;
@@ -1771,6 +1809,12 @@ CURLcode ftp_perform(struct connectdata *conn)
      if(result)
        return result;
      /* Send any PREQUOTE strings after transfer type is set? (Wesley Laxton)*/
      if(data->set.prequote) {
        if ((result = ftp_sendquote(conn, data->set.prequote)) != CURLE_OK)
          return result;
      }
      /* Attempt to get the size, it'll be useful in some cases: for resumed
         downloads and when talking to servers that don't give away the size
         in the RETR response line. */
@@ -2027,9 +2071,11 @@ CURLcode Curl_ftp(struct connectdata *conn)
 CURLcode Curl_ftpsendf(struct connectdata *conn,
                       const char *fmt, ...)
 {
-  size_t bytes_written;
+  ssize_t bytes_written;
  char s[256];
-  size_t write_len;
+  ssize_t write_len;
  char *sptr=s;
  CURLcode res = CURLE_OK;
  va_list ap;
  va_start(ap, fmt);
@@ -2043,9 +2089,23 @@ CURLcode Curl_ftpsendf(struct connectdata *conn,
  bytes_written=0;
  write_len = strlen(s);
  Curl_write(conn, conn->firstsocket, s, write_len, &bytes_written);
-  return (bytes_written==write_len)?CURLE_OK:CURLE_WRITE_ERROR;
+  do {
    res = Curl_write(conn, conn->firstsocket, sptr, write_len,
                     &bytes_written);
    if(CURLE_OK != res)
      break;
    if(bytes_written != write_len) {
      write_len -= bytes_written;
      sptr += bytes_written;
    }
    else
      break;
  } while(1);
  return res;
 }
 /***********************************************************************
--- a/lib/getdate.c
+++ b/lib/getdate.c
@@ -34,8 +34,6 @@
 #include "setup.h"
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
@@ -43,6 +41,10 @@
 # ifdef HAVE_TIME_H
 #  include <time.h>
 # endif
 #ifndef YYDEBUG
  /* to satisfy gcc -Wundef, we set this to 0 */
 #define YYDEBUG 0
 #endif
 /* Since the code of getdate.y is not included in the Emacs executable
@@ -192,38 +194,40 @@ typedef enum _MERIDIAN {
    MERam, MERpm, MER24
 } MERIDIAN;
 /* parse results and input string */
 typedef struct _CONTEXT {
    const char	*yyInput;
    int		yyDayOrdinal;
    int		yyDayNumber;
    int		yyHaveDate;
    int		yyHaveDay;
    int		yyHaveRel;
    int		yyHaveTime;
    int		yyHaveZone;
    int		yyTimezone;
    int		yyDay;
    int		yyHour;
    int		yyMinutes;
    int		yyMonth;
    int		yySeconds;
    int		yyYear;
    MERIDIAN	yyMeridian;
    int		yyRelDay;
    int		yyRelHour;
    int		yyRelMinutes;
    int		yyRelMonth;
    int		yyRelSeconds;
    int		yyRelYear;
 } CONTEXT;
-/*
+/* enable use of extra argument to yyparse and yylex which can be used to pass
-**  Global variables.  We could get rid of most of these by using a good
+**  in a user defined value (CONTEXT struct in our case)
 **  union as the yacc stack.  (This routine was originally written before
 **  yacc had the %union construct.)  Maybe someday; right now we only use
 **  the %union very rarely.
 */
-static const char	*yyInput;
+#define YYPARSE_PARAM cookie
-static int	yyDayOrdinal;
+#define YYLEX_PARAM cookie
-static int	yyDayNumber;
+#define context ((CONTEXT *) cookie)
 static int	yyHaveDate;
 static int	yyHaveDay;
 static int	yyHaveRel;
 static int	yyHaveTime;
 static int	yyHaveZone;
 static int	yyTimezone;
 static int	yyDay;
 static int	yyHour;
 static int	yyMinutes;
 static int	yyMonth;
 static int	yySeconds;
 static int	yyYear;
 static MERIDIAN	yyMeridian;
 static int	yyRelDay;
 static int	yyRelHour;
 static int	yyRelMinutes;
 static int	yyRelMonth;
 static int	yyRelSeconds;
 static int	yyRelYear;
-
+#line 215 "getdate.y"
 #line 206 "getdate.y"
 typedef union {
    int			Number;
    enum _MERIDIAN	Meridian;
@@ -306,11 +310,11 @@ static const short yyrhs[] = {    -1,
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   222,   223,   226,   229,   232,   235,   238,   241,   244,   250,
+   231,   232,   235,   238,   241,   244,   247,   250,   253,   259,
-   256,   265,   271,   283,   286,   289,   295,   299,   303,   309,
+   265,   274,   280,   292,   295,   298,   304,   308,   312,   318,
-   313,   331,   337,   343,   347,   352,   356,   363,   371,   374,
+   322,   340,   346,   352,   356,   361,   365,   372,   380,   383,
-   377,   380,   383,   386,   389,   392,   395,   398,   401,   404,
+   386,   389,   392,   395,   398,   401,   404,   407,   410,   413,
-   407,   410,   413,   416,   419,   422,   425,   430,   463,   467
+   416,   419,   422,   425,   428,   431,   434,   439,   473,   477
 };
 #endif
@@ -390,6 +394,8 @@ static const short yycheck[] = {     0,
    11,    15,    13,    14,    16,    19,    17,    16,    21,     0,
    56
 };
 #define YYPURE 1
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/local/share/bison.simple"
 /* This file comes from bison-1.28.  */
@@ -934,135 +940,135 @@ yyreduce:
  switch (yyn) {
 case 3:
-#line 226 "getdate.y"
+#line 235 "getdate.y"
 {
-	    yyHaveTime++;
+	    context->yyHaveTime++;
 	;
    break;}
 case 4:
-#line 229 "getdate.y"
+#line 238 "getdate.y"
 {
-	    yyHaveZone++;
+	    context->yyHaveZone++;
 	;
    break;}
 case 5:
-#line 232 "getdate.y"
+#line 241 "getdate.y"
 {
-	    yyHaveDate++;
+	    context->yyHaveDate++;
 	;
    break;}
 case 6:
-#line 235 "getdate.y"
+#line 244 "getdate.y"
 {
-	    yyHaveDay++;
+	    context->yyHaveDay++;
 	;
    break;}
 case 7:
-#line 238 "getdate.y"
+#line 247 "getdate.y"
 {
-	    yyHaveRel++;
+	    context->yyHaveRel++;
 	;
    break;}
 case 9:
-#line 244 "getdate.y"
+#line 253 "getdate.y"
 {
-	    yyHour = yyvsp[-1].Number;
+	    context->yyHour = yyvsp[-1].Number;
-	    yyMinutes = 0;
+	    context->yyMinutes = 0;
-	    yySeconds = 0;
+	    context->yySeconds = 0;
-	    yyMeridian = yyvsp[0].Meridian;
+	    context->yyMeridian = yyvsp[0].Meridian;
 	;
    break;}
 case 10:
-#line 250 "getdate.y"
+#line 259 "getdate.y"
 {
-	    yyHour = yyvsp[-3].Number;
+	    context->yyHour = yyvsp[-3].Number;
-	    yyMinutes = yyvsp[-1].Number;
+	    context->yyMinutes = yyvsp[-1].Number;
-	    yySeconds = 0;
+	    context->yySeconds = 0;
-	    yyMeridian = yyvsp[0].Meridian;
+	    context->yyMeridian = yyvsp[0].Meridian;
 	;
    break;}
 case 11:
-#line 256 "getdate.y"
+#line 265 "getdate.y"
 {
-	    yyHour = yyvsp[-3].Number;
+	    context->yyHour = yyvsp[-3].Number;
-	    yyMinutes = yyvsp[-1].Number;
+	    context->yyMinutes = yyvsp[-1].Number;
-	    yyMeridian = MER24;
+	    context->yyMeridian = MER24;
-	    yyHaveZone++;
+	    context->yyHaveZone++;
-	    yyTimezone = (yyvsp[0].Number < 0
+	    context->yyTimezone = (yyvsp[0].Number < 0
 				   ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60
 				   : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60));
 	;
    break;}
 case 12:
-#line 265 "getdate.y"
+#line 274 "getdate.y"
 {
-	    yyHour = yyvsp[-5].Number;
+	    context->yyHour = yyvsp[-5].Number;
-	    yyMinutes = yyvsp[-3].Number;
+	    context->yyMinutes = yyvsp[-3].Number;
-	    yySeconds = yyvsp[-1].Number;
+	    context->yySeconds = yyvsp[-1].Number;
-	    yyMeridian = yyvsp[0].Meridian;
+	    context->yyMeridian = yyvsp[0].Meridian;
 	;
    break;}
 case 13:
-#line 271 "getdate.y"
+#line 280 "getdate.y"
 {
-	    yyHour = yyvsp[-5].Number;
+	    context->yyHour = yyvsp[-5].Number;
-	    yyMinutes = yyvsp[-3].Number;
+	    context->yyMinutes = yyvsp[-3].Number;
-	    yySeconds = yyvsp[-1].Number;
+	    context->yySeconds = yyvsp[-1].Number;
-	    yyMeridian = MER24;
+	    context->yyMeridian = MER24;
-	    yyHaveZone++;
+	    context->yyHaveZone++;
-	    yyTimezone = (yyvsp[0].Number < 0
+	    context->yyTimezone = (yyvsp[0].Number < 0
 				   ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60
 				   : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60));
 	;
    break;}
 case 14:
-#line 283 "getdate.y"
+#line 292 "getdate.y"
 {
-	    yyTimezone = yyvsp[0].Number;
+	    context->yyTimezone = yyvsp[0].Number;
 	;
    break;}
 case 15:
-#line 286 "getdate.y"
+#line 295 "getdate.y"
 {
-	    yyTimezone = yyvsp[0].Number - 60;
+	    context->yyTimezone = yyvsp[0].Number - 60;
 	;
    break;}
 case 16:
-#line 290 "getdate.y"
+#line 299 "getdate.y"
 {
-	    yyTimezone = yyvsp[-1].Number - 60;
+	    context->yyTimezone = yyvsp[-1].Number - 60;
 	;
    break;}
 case 17:
-#line 295 "getdate.y"
+#line 304 "getdate.y"
 {
-	    yyDayOrdinal = 1;
+	    context->yyDayOrdinal = 1;
-	    yyDayNumber = yyvsp[0].Number;
+	    context->yyDayNumber = yyvsp[0].Number;
 	;
    break;}
 case 18:
-#line 299 "getdate.y"
+#line 308 "getdate.y"
 {
-	    yyDayOrdinal = 1;
+	    context->yyDayOrdinal = 1;
-	    yyDayNumber = yyvsp[-1].Number;
+	    context->yyDayNumber = yyvsp[-1].Number;
 	;
    break;}
 case 19:
-#line 303 "getdate.y"
+#line 312 "getdate.y"
 {
-	    yyDayOrdinal = yyvsp[-1].Number;
+	    context->yyDayOrdinal = yyvsp[-1].Number;
-	    yyDayNumber = yyvsp[0].Number;
+	    context->yyDayNumber = yyvsp[0].Number;
 	;
    break;}
 case 20:
-#line 309 "getdate.y"
+#line 318 "getdate.y"
 {
-	    yyMonth = yyvsp[-2].Number;
+	    context->yyMonth = yyvsp[-2].Number;
-	    yyDay = yyvsp[0].Number;
+	    context->yyDay = yyvsp[0].Number;
 	;
    break;}
 case 21:
-#line 313 "getdate.y"
+#line 322 "getdate.y"
 {
 	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
 	     The goal in recognizing YYYY/MM/DD is solely to support legacy
@@ -1070,226 +1076,227 @@ case 21:
 	     you want portability, use the ISO 8601 format.  */
 	  if (yyvsp[-4].Number >= 1000)
 	    {
-	      yyYear = yyvsp[-4].Number;
+	      context->yyYear = yyvsp[-4].Number;
-	      yyMonth = yyvsp[-2].Number;
+	      context->yyMonth = yyvsp[-2].Number;
-	      yyDay = yyvsp[0].Number;
+	      context->yyDay = yyvsp[0].Number;
 	    }
 	  else
 	    {
-	      yyMonth = yyvsp[-4].Number;
+	      context->yyMonth = yyvsp[-4].Number;
-	      yyDay = yyvsp[-2].Number;
+	      context->yyDay = yyvsp[-2].Number;
-	      yyYear = yyvsp[0].Number;
+	      context->yyYear = yyvsp[0].Number;
 	    }
 	;
    break;}
 case 22:
-#line 331 "getdate.y"
+#line 340 "getdate.y"
 {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
-	    yyYear = yyvsp[-2].Number;
+	    context->yyYear = yyvsp[-2].Number;
-	    yyMonth = -yyvsp[-1].Number;
+	    context->yyMonth = -yyvsp[-1].Number;
-	    yyDay = -yyvsp[0].Number;
+	    context->yyDay = -yyvsp[0].Number;
 	;
    break;}
 case 23:
-#line 337 "getdate.y"
+#line 346 "getdate.y"
 {
 	    /* e.g. 17-JUN-1992.  */
-	    yyDay = yyvsp[-2].Number;
+	    context->yyDay = yyvsp[-2].Number;
-	    yyMonth = yyvsp[-1].Number;
+	    context->yyMonth = yyvsp[-1].Number;
-	    yyYear = -yyvsp[0].Number;
+	    context->yyYear = -yyvsp[0].Number;
 	;
    break;}
 case 24:
-#line 343 "getdate.y"
+#line 352 "getdate.y"
 {
-	    yyMonth = yyvsp[-1].Number;
+	    context->yyMonth = yyvsp[-1].Number;
-	    yyDay = yyvsp[0].Number;
+	    context->yyDay = yyvsp[0].Number;
 	;
    break;}
 case 25:
-#line 347 "getdate.y"
+#line 356 "getdate.y"
 {
-	    yyMonth = yyvsp[-3].Number;
+	    context->yyMonth = yyvsp[-3].Number;
-	    yyDay = yyvsp[-2].Number;
+	    context->yyDay = yyvsp[-2].Number;
-	    yyYear = yyvsp[0].Number;
+	    context->yyYear = yyvsp[0].Number;
 	;
    break;}
 case 26:
-#line 352 "getdate.y"
+#line 361 "getdate.y"
 {
-	    yyMonth = yyvsp[0].Number;
+	    context->yyMonth = yyvsp[0].Number;
-	    yyDay = yyvsp[-1].Number;
+	    context->yyDay = yyvsp[-1].Number;
 	;
    break;}
 case 27:
-#line 356 "getdate.y"
+#line 365 "getdate.y"
 {
-	    yyMonth = yyvsp[-1].Number;
+	    context->yyMonth = yyvsp[-1].Number;
-	    yyDay = yyvsp[-2].Number;
+	    context->yyDay = yyvsp[-2].Number;
-	    yyYear = yyvsp[0].Number;
+	    context->yyYear = yyvsp[0].Number;
 	;
    break;}
 case 28:
-#line 363 "getdate.y"
+#line 372 "getdate.y"
 {
-	    yyRelSeconds = -yyRelSeconds;
+	    context->yyRelSeconds = -context->yyRelSeconds;
-	    yyRelMinutes = -yyRelMinutes;
+	    context->yyRelMinutes = -context->yyRelMinutes;
-	    yyRelHour = -yyRelHour;
+	    context->yyRelHour = -context->yyRelHour;
-	    yyRelDay = -yyRelDay;
+	    context->yyRelDay = -context->yyRelDay;
-	    yyRelMonth = -yyRelMonth;
+	    context->yyRelMonth = -context->yyRelMonth;
-	    yyRelYear = -yyRelYear;
+	    context->yyRelYear = -context->yyRelYear;
 	;
    break;}
 case 30:
-#line 374 "getdate.y"
+#line 383 "getdate.y"
 {
-	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 31:
-#line 377 "getdate.y"
+#line 386 "getdate.y"
 {
-	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 32:
-#line 380 "getdate.y"
+#line 389 "getdate.y"
 {
-	    yyRelYear += yyvsp[0].Number;
+	    context->yyRelYear += yyvsp[0].Number;
 	;
    break;}
 case 33:
-#line 383 "getdate.y"
+#line 392 "getdate.y"
 {
-	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 34:
-#line 386 "getdate.y"
+#line 395 "getdate.y"
 {
-	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 35:
-#line 389 "getdate.y"
+#line 398 "getdate.y"
 {
-	    yyRelMonth += yyvsp[0].Number;
+	    context->yyRelMonth += yyvsp[0].Number;
 	;
    break;}
 case 36:
-#line 392 "getdate.y"
+#line 401 "getdate.y"
 {
-	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 37:
-#line 395 "getdate.y"
+#line 404 "getdate.y"
 {
-	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 38:
-#line 398 "getdate.y"
+#line 407 "getdate.y"
 {
-	    yyRelDay += yyvsp[0].Number;
+	    context->yyRelDay += yyvsp[0].Number;
 	;
    break;}
 case 39:
-#line 401 "getdate.y"
+#line 410 "getdate.y"
 {
-	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 40:
-#line 404 "getdate.y"
+#line 413 "getdate.y"
 {
-	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 41:
-#line 407 "getdate.y"
+#line 416 "getdate.y"
 {
-	    yyRelHour += yyvsp[0].Number;
+	    context->yyRelHour += yyvsp[0].Number;
 	;
    break;}
 case 42:
-#line 410 "getdate.y"
+#line 419 "getdate.y"
 {
-	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 43:
-#line 413 "getdate.y"
+#line 422 "getdate.y"
 {
-	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 44:
-#line 416 "getdate.y"
+#line 425 "getdate.y"
 {
-	    yyRelMinutes += yyvsp[0].Number;
+	    context->yyRelMinutes += yyvsp[0].Number;
 	;
    break;}
 case 45:
-#line 419 "getdate.y"
+#line 428 "getdate.y"
 {
-	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 46:
-#line 422 "getdate.y"
+#line 431 "getdate.y"
 {
-	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
+	    context->yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 47:
-#line 425 "getdate.y"
+#line 434 "getdate.y"
 {
-	    yyRelSeconds += yyvsp[0].Number;
+	    context->yyRelSeconds += yyvsp[0].Number;
 	;
    break;}
 case 48:
-#line 431 "getdate.y"
+#line 440 "getdate.y"
 {
-	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
+	    if (context->yyHaveTime && context->yyHaveDate &&
-	      yyYear = yyvsp[0].Number;
+		!context->yyHaveRel)
 	      context->yyYear = yyvsp[0].Number;
 	    else
 	      {
 		if (yyvsp[0].Number>10000)
 		  {
-		    yyHaveDate++;
+		    context->yyHaveDate++;
-		    yyDay= (yyvsp[0].Number)%100;
+		    context->yyDay= (yyvsp[0].Number)%100;
-		    yyMonth= (yyvsp[0].Number/100)%100;
+		    context->yyMonth= (yyvsp[0].Number/100)%100;
-		    yyYear = yyvsp[0].Number/10000;
+		    context->yyYear = yyvsp[0].Number/10000;
 		  }
 		else
 		  {
-		    yyHaveTime++;
+		    context->yyHaveTime++;
 		    if (yyvsp[0].Number < 100)
 		      {
-			yyHour = yyvsp[0].Number;
+			context->yyHour = yyvsp[0].Number;
-			yyMinutes = 0;
+			context->yyMinutes = 0;
 		      }
 		    else
 		      {
-		    	yyHour = yyvsp[0].Number / 100;
+		    	context->yyHour = yyvsp[0].Number / 100;
-		    	yyMinutes = yyvsp[0].Number % 100;
+		    	context->yyMinutes = yyvsp[0].Number % 100;
 		      }
-		    yySeconds = 0;
+		    context->yySeconds = 0;
-		    yyMeridian = MER24;
+		    context->yyMeridian = MER24;
 		  }
 	      }
 	  ;
    break;}
 case 49:
-#line 464 "getdate.y"
+#line 474 "getdate.y"
 {
 	    yyval.Meridian = MER24;
 	  ;
    break;}
 case 50:
-#line 468 "getdate.y"
+#line 478 "getdate.y"
 {
 	    yyval.Meridian = yyvsp[0].Meridian;
 	  ;
@@ -1516,7 +1523,7 @@ yyerrhandle:
    }
  return 1;
 }
-#line 473 "getdate.y"
+#line 483 "getdate.y"
 /* Include this file down here because bison inserts code above which
@@ -1772,7 +1779,8 @@ ToYear (Year)
 }
 static int
-LookupWord (buff)
+LookupWord (yylval, buff)
     YYSTYPE *yylval;
     char *buff;
 {
  register char *p;
@@ -1788,12 +1796,12 @@ LookupWord (buff)
  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
    {
-      yylval.Meridian = MERam;
+      yylval->Meridian = MERam;
      return tMERIDIAN;
    }
  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
    {
-      yylval.Meridian = MERpm;
+      yylval->Meridian = MERpm;
      return tMERIDIAN;
    }
@@ -1814,13 +1822,13 @@ LookupWord (buff)
 	{
 	  if (strncmp (buff, tp->name, 3) == 0)
 	    {
-	      yylval.Number = tp->value;
+	      yylval->Number = tp->value;
 	      return tp->type;
 	    }
 	}
      else if (strcmp (buff, tp->name) == 0)
 	{
-	  yylval.Number = tp->value;
+	  yylval->Number = tp->value;
 	  return tp->type;
 	}
    }
@@ -1828,7 +1836,7 @@ LookupWord (buff)
  for (tp = TimezoneTable; tp->name; tp++)
    if (strcmp (buff, tp->name) == 0)
      {
-	yylval.Number = tp->value;
+	yylval->Number = tp->value;
 	return tp->type;
      }
@@ -1838,7 +1846,7 @@ LookupWord (buff)
  for (tp = UnitsTable; tp->name; tp++)
    if (strcmp (buff, tp->name) == 0)
      {
-	yylval.Number = tp->value;
+	yylval->Number = tp->value;
 	return tp->type;
      }
@@ -1850,7 +1858,7 @@ LookupWord (buff)
      for (tp = UnitsTable; tp->name; tp++)
 	if (strcmp (buff, tp->name) == 0)
 	  {
-	    yylval.Number = tp->value;
+	    yylval->Number = tp->value;
 	    return tp->type;
 	  }
      buff[i] = 's';		/* Put back for "this" in OtherTable. */
@@ -1859,7 +1867,7 @@ LookupWord (buff)
  for (tp = OtherTable; tp->name; tp++)
    if (strcmp (buff, tp->name) == 0)
      {
-	yylval.Number = tp->value;
+	yylval->Number = tp->value;
 	return tp->type;
      }
@@ -1869,7 +1877,7 @@ LookupWord (buff)
      for (tp = MilitaryTable; tp->name; tp++)
 	if (strcmp (buff, tp->name) == 0)
 	  {
-	    yylval.Number = tp->value;
+	    yylval->Number = tp->value;
 	    return tp->type;
 	  }
    }
@@ -1885,7 +1893,7 @@ LookupWord (buff)
    for (tp = TimezoneTable; tp->name; tp++)
      if (strcmp (buff, tp->name) == 0)
 	{
-	  yylval.Number = tp->value;
+	  yylval->Number = tp->value;
 	  return tp->type;
 	}
@@ -1893,7 +1901,9 @@ LookupWord (buff)
 }
 static int
-yylex ()
+yylex (yylval, cookie)
     YYSTYPE *yylval;
     void *cookie;
 {
  register unsigned char c;
  register char *p;
@@ -1903,42 +1913,42 @@ yylex ()
  for (;;)
    {
-      while (ISSPACE ((unsigned char) *yyInput))
+      while (ISSPACE ((unsigned char) *context->yyInput))
-	yyInput++;
+	context->yyInput++;
-      if (ISDIGIT (c = *yyInput) || c == '-' || c == '+')
+      if (ISDIGIT (c = *context->yyInput) || c == '-' || c == '+')
 	{
 	  if (c == '-' || c == '+')
 	    {
 	      sign = c == '-' ? -1 : 1;
-	      if (!ISDIGIT (*++yyInput))
+	      if (!ISDIGIT (*++context->yyInput))
 		/* skip the '-' sign */
 		continue;
 	    }
 	  else
 	    sign = 0;
-	  for (yylval.Number = 0; ISDIGIT (c = *yyInput++);)
+	  for (yylval->Number = 0; ISDIGIT (c = *context->yyInput++);)
-	    yylval.Number = 10 * yylval.Number + c - '0';
+	    yylval->Number = 10 * yylval->Number + c - '0';
-	  yyInput--;
+	  context->yyInput--;
 	  if (sign < 0)
-	    yylval.Number = -yylval.Number;
+	    yylval->Number = -yylval->Number;
 	  return sign ? tSNUMBER : tUNUMBER;
 	}
      if (ISALPHA (c))
 	{
-	  for (p = buff; (c = *yyInput++, ISALPHA (c)) || c == '.';)
+	  for (p = buff; (c = *context->yyInput++, ISALPHA (c)) || c == '.';)
 	    if (p < &buff[sizeof buff - 1])
 	      *p++ = c;
 	  *p = '\0';
-	  yyInput--;
+	  context->yyInput--;
-	  return LookupWord (buff);
+	  return LookupWord (yylval, buff);
 	}
      if (c != '(')
-	return *yyInput++;
+	return *context->yyInput++;
      Count = 0;
      do
 	{
-	  c = *yyInput++;
+	  c = *context->yyInput++;
 	  if (c == '\0')
 	    return c;
 	  if (c == '(')
@@ -1978,10 +1988,11 @@ curl_getdate (const char *p, const time_t *now)
 {
  struct tm tm, tm0, *tmp;
  time_t Start;
  CONTEXT cookie;
 #ifdef HAVE_LOCALTIME_R
  struct tm keeptime;
 #endif
-  yyInput = p;
+  cookie.yyInput = p;
  Start = now ? *now : time ((time_t *) NULL);
 #ifdef HAVE_LOCALTIME_R
  tmp = (struct tm *)localtime_r(&Start, &keeptime);
@@ -1990,52 +2001,55 @@ curl_getdate (const char *p, const time_t *now)
 #endif
  if (!tmp)
    return -1;
-  yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
+  cookie.yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
-  yyMonth = tmp->tm_mon + 1;
+  cookie.yyMonth = tmp->tm_mon + 1;
-  yyDay = tmp->tm_mday;
+  cookie.yyDay = tmp->tm_mday;
-  yyHour = tmp->tm_hour;
+  cookie.yyHour = tmp->tm_hour;
-  yyMinutes = tmp->tm_min;
+  cookie.yyMinutes = tmp->tm_min;
-  yySeconds = tmp->tm_sec;
+  cookie.yySeconds = tmp->tm_sec;
  tm.tm_isdst = tmp->tm_isdst;
-  yyMeridian = MER24;
+  cookie.yyMeridian = MER24;
-  yyRelSeconds = 0;
+  cookie.yyRelSeconds = 0;
-  yyRelMinutes = 0;
+  cookie.yyRelMinutes = 0;
-  yyRelHour = 0;
+  cookie.yyRelHour = 0;
-  yyRelDay = 0;
+  cookie.yyRelDay = 0;
-  yyRelMonth = 0;
+  cookie.yyRelMonth = 0;
-  yyRelYear = 0;
+  cookie.yyRelYear = 0;
-  yyHaveDate = 0;
+  cookie.yyHaveDate = 0;
-  yyHaveDay = 0;
+  cookie.yyHaveDay = 0;
-  yyHaveRel = 0;
+  cookie.yyHaveRel = 0;
-  yyHaveTime = 0;
+  cookie.yyHaveTime = 0;
-  yyHaveZone = 0;
+  cookie.yyHaveZone = 0;
-  if (yyparse ()
+  if (yyparse (&cookie)
-      || yyHaveTime > 1 || yyHaveZone > 1 || yyHaveDate > 1 || yyHaveDay > 1)
+      || cookie.yyHaveTime > 1 || cookie.yyHaveZone > 1 ||
      cookie.yyHaveDate > 1 || cookie.yyHaveDay > 1)
    return -1;
-  tm.tm_year = ToYear (yyYear) - TM_YEAR_ORIGIN + yyRelYear;
+  tm.tm_year = ToYear (cookie.yyYear) - TM_YEAR_ORIGIN + cookie.yyRelYear;
-  tm.tm_mon = yyMonth - 1 + yyRelMonth;
+  tm.tm_mon = cookie.yyMonth - 1 + cookie.yyRelMonth;
-  tm.tm_mday = yyDay + yyRelDay;
+  tm.tm_mday = cookie.yyDay + cookie.yyRelDay;
-  if (yyHaveTime || (yyHaveRel && !yyHaveDate && !yyHaveDay))
+  if (cookie.yyHaveTime ||
      (cookie.yyHaveRel && !cookie.yyHaveDate && !cookie.yyHaveDay))
    {
-      tm.tm_hour = ToHour (yyHour, yyMeridian);
+      tm.tm_hour = ToHour (cookie.yyHour, cookie.yyMeridian);
      if (tm.tm_hour < 0)
 	return -1;
-      tm.tm_min = yyMinutes;
+      tm.tm_min = cookie.yyMinutes;
-      tm.tm_sec = yySeconds;
+      tm.tm_sec = cookie.yySeconds;
    }
  else
    {
      tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
    }
-  tm.tm_hour += yyRelHour;
+  tm.tm_hour += cookie.yyRelHour;
-  tm.tm_min += yyRelMinutes;
+  tm.tm_min += cookie.yyRelMinutes;
-  tm.tm_sec += yyRelSeconds;
+  tm.tm_sec += cookie.yyRelSeconds;
  /* Let mktime deduce tm_isdst if we have an absolute timestamp,
     or if the relative timestamp mentions days, months, or years.  */
-  if (yyHaveDate | yyHaveDay | yyHaveTime | yyRelDay | yyRelMonth | yyRelYear)
+  if (cookie.yyHaveDate | cookie.yyHaveDay | cookie.yyHaveTime |
      cookie.yyRelDay | cookie.yyRelMonth | cookie.yyRelYear)
    tm.tm_isdst = -1;
  tm0 = tm;
@@ -2053,18 +2067,18 @@ curl_getdate (const char *p, const time_t *now)
         we apply mktime to 1970-01-02 08:00:00 instead and adjust the time
         zone by 24 hours to compensate.  This algorithm assumes that
         there is no DST transition within a day of the time_t boundaries.  */
-      if (yyHaveZone)
+      if (cookie.yyHaveZone)
 	{
 	  tm = tm0;
 	  if (tm.tm_year <= EPOCH - TM_YEAR_ORIGIN)
 	    {
 	      tm.tm_mday++;
-	      yyTimezone -= 24 * 60;
+	      cookie.yyTimezone -= 24 * 60;
 	    }
 	  else
 	    {
 	      tm.tm_mday--;
-	      yyTimezone += 24 * 60;
+	      cookie.yyTimezone += 24 * 60;
 	    }
 	  Start = mktime (&tm);
 	}
@@ -2073,22 +2087,29 @@ curl_getdate (const char *p, const time_t *now)
 	return Start;
    }
-  if (yyHaveDay && !yyHaveDate)
+  if (cookie.yyHaveDay && !cookie.yyHaveDate)
    {
-      tm.tm_mday += ((yyDayNumber - tm.tm_wday + 7) % 7
+      tm.tm_mday += ((cookie.yyDayNumber - tm.tm_wday + 7) % 7
-		     + 7 * (yyDayOrdinal - (0 < yyDayOrdinal)));
+		     + 7 * (cookie.yyDayOrdinal - (0 < cookie.yyDayOrdinal)));
      Start = mktime (&tm);
      if (Start == (time_t) -1)
 	return Start;
    }
-  if (yyHaveZone)
+  if (cookie.yyHaveZone)
    {
      long delta;
-      struct tm *gmt = gmtime (&Start);
+      struct tm *gmt;
 #ifdef HAVE_GMTIME_R
      /* thread-safe version */
      struct tm keeptime;
      gmt = (struct tm *)gmtime_r(&Start, &keeptime);
 #else
      gmt = gmtime(&Start);
 #endif
      if (!gmt)
 	return -1;
-      delta = yyTimezone * 60L + difftm (&tm, gmt);
+      delta = cookie.yyTimezone * 60L + difftm (&tm, gmt);
      if ((Start + delta < Start) != (delta < 0))
 	return -1;		/* time_t overflow */
      Start += delta;
@@ -2126,11 +2147,3 @@ main (ac, av)
  /* NOTREACHED */
 }
 #endif /* defined (TEST) */
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -7,9 +7,7 @@
 **  This code is in the public domain and has no copyright.
 */
-#if HAVE_CONFIG_H
+# include "setup.h"
 # include <config.h>
 #endif
 #ifndef PARAMS
 # if defined PROTOTYPES || (defined __STDC__ && __STDC__)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -10,8 +10,6 @@
 #include "setup.h"
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
@@ -19,6 +17,10 @@
 # ifdef HAVE_TIME_H
 #  include <time.h>
 # endif
 #ifndef YYDEBUG
  /* to satisfy gcc -Wundef, we set this to 0 */
 #define YYDEBUG 0
 #endif
 /* Since the code of getdate.y is not included in the Emacs executable
@@ -168,41 +170,48 @@ typedef enum _MERIDIAN {
    MERam, MERpm, MER24
 } MERIDIAN;
 /* parse results and input string */
 typedef struct _CONTEXT {
    const char	*yyInput;
    int		yyDayOrdinal;
    int		yyDayNumber;
    int		yyHaveDate;
    int		yyHaveDay;
    int		yyHaveRel;
    int		yyHaveTime;
    int		yyHaveZone;
    int		yyTimezone;
    int		yyDay;
    int		yyHour;
    int		yyMinutes;
    int		yyMonth;
    int		yySeconds;
    int		yyYear;
    MERIDIAN	yyMeridian;
    int		yyRelDay;
    int		yyRelHour;
    int		yyRelMinutes;
    int		yyRelMonth;
    int		yyRelSeconds;
    int		yyRelYear;
 } CONTEXT;
-/*
+/* enable use of extra argument to yyparse and yylex which can be used to pass
-**  Global variables.  We could get rid of most of these by using a good
+**  in a user defined value (CONTEXT struct in our case)
 **  union as the yacc stack.  (This routine was originally written before
 **  yacc had the %union construct.)  Maybe someday; right now we only use
 **  the %union very rarely.
 */
-static const char	*yyInput;
+#define YYPARSE_PARAM cookie
-static int	yyDayOrdinal;
+#define YYLEX_PARAM cookie
-static int	yyDayNumber;
+#define context ((CONTEXT *) cookie)
 static int	yyHaveDate;
 static int	yyHaveDay;
 static int	yyHaveRel;
 static int	yyHaveTime;
 static int	yyHaveZone;
 static int	yyTimezone;
 static int	yyDay;
 static int	yyHour;
 static int	yyMinutes;
 static int	yyMonth;
 static int	yySeconds;
 static int	yyYear;
 static MERIDIAN	yyMeridian;
 static int	yyRelDay;
 static int	yyRelHour;
 static int	yyRelMinutes;
 static int	yyRelMonth;
 static int	yyRelSeconds;
 static int	yyRelYear;
 %}
 /* This grammar has 13 shift/reduce conflicts. */
 %expect 13
 /* turn global variables into locals, additionally enable extra arguments
 ** for yylex (pointer to yylval and user defined value)
 */
 %pure_parser
 %union {
    int			Number;
    enum _MERIDIAN	Meridian;
@@ -224,91 +233,91 @@ spec	: /* NULL */
 	;
 item	: time {
-	    yyHaveTime++;
+	    context->yyHaveTime++;
 	}
 	| zone {
-	    yyHaveZone++;
+	    context->yyHaveZone++;
 	}
 	| date {
-	    yyHaveDate++;
+	    context->yyHaveDate++;
 	}
 	| day {
-	    yyHaveDay++;
+	    context->yyHaveDay++;
 	}
 	| rel {
-	    yyHaveRel++;
+	    context->yyHaveRel++;
 	}
 	| number
 	;
 time	: tUNUMBER tMERIDIAN {
-	    yyHour = $1;
+	    context->yyHour = $1;
-	    yyMinutes = 0;
+	    context->yyMinutes = 0;
-	    yySeconds = 0;
+	    context->yySeconds = 0;
-	    yyMeridian = $2;
+	    context->yyMeridian = $2;
 	}
 	| tUNUMBER ':' tUNUMBER o_merid {
-	    yyHour = $1;
+	    context->yyHour = $1;
-	    yyMinutes = $3;
+	    context->yyMinutes = $3;
-	    yySeconds = 0;
+	    context->yySeconds = 0;
-	    yyMeridian = $4;
+	    context->yyMeridian = $4;
 	}
 	| tUNUMBER ':' tUNUMBER tSNUMBER {
-	    yyHour = $1;
+	    context->yyHour = $1;
-	    yyMinutes = $3;
+	    context->yyMinutes = $3;
-	    yyMeridian = MER24;
+	    context->yyMeridian = MER24;
-	    yyHaveZone++;
+	    context->yyHaveZone++;
-	    yyTimezone = ($4 < 0
+	    context->yyTimezone = ($4 < 0
 				   ? -$4 % 100 + (-$4 / 100) * 60
 				   : - ($4 % 100 + ($4 / 100) * 60));
 	}
 	| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
-	    yyHour = $1;
+	    context->yyHour = $1;
-	    yyMinutes = $3;
+	    context->yyMinutes = $3;
-	    yySeconds = $5;
+	    context->yySeconds = $5;
-	    yyMeridian = $6;
+	    context->yyMeridian = $6;
 	}
 	| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
-	    yyHour = $1;
+	    context->yyHour = $1;
-	    yyMinutes = $3;
+	    context->yyMinutes = $3;
-	    yySeconds = $5;
+	    context->yySeconds = $5;
-	    yyMeridian = MER24;
+	    context->yyMeridian = MER24;
-	    yyHaveZone++;
+	    context->yyHaveZone++;
-	    yyTimezone = ($6 < 0
+	    context->yyTimezone = ($6 < 0
 				   ? -$6 % 100 + (-$6 / 100) * 60
 				   : - ($6 % 100 + ($6 / 100) * 60));
 	}
 	;
 zone	: tZONE {
-	    yyTimezone = $1;
+	    context->yyTimezone = $1;
 	}
 	| tDAYZONE {
-	    yyTimezone = $1 - 60;
+	    context->yyTimezone = $1 - 60;
 	}
 	|
 	  tZONE tDST {
-	    yyTimezone = $1 - 60;
+	    context->yyTimezone = $1 - 60;
 	}
 	;
 day	: tDAY {
-	    yyDayOrdinal = 1;
+	    context->yyDayOrdinal = 1;
-	    yyDayNumber = $1;
+	    context->yyDayNumber = $1;
 	}
 	| tDAY ',' {
-	    yyDayOrdinal = 1;
+	    context->yyDayOrdinal = 1;
-	    yyDayNumber = $1;
+	    context->yyDayNumber = $1;
 	}
 	| tUNUMBER tDAY {
-	    yyDayOrdinal = $1;
+	    context->yyDayOrdinal = $1;
-	    yyDayNumber = $2;
+	    context->yyDayNumber = $2;
 	}
 	;
 date	: tUNUMBER '/' tUNUMBER {
-	    yyMonth = $1;
+	    context->yyMonth = $1;
-	    yyDay = $3;
+	    context->yyDay = $3;
 	}
 	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {
 	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
@@ -317,144 +326,145 @@ date	: tUNUMBER '/' tUNUMBER {
 	     you want portability, use the ISO 8601 format.  */
 	  if ($1 >= 1000)
 	    {
-	      yyYear = $1;
+	      context->yyYear = $1;
-	      yyMonth = $3;
+	      context->yyMonth = $3;
-	      yyDay = $5;
+	      context->yyDay = $5;
 	    }
 	  else
 	    {
-	      yyMonth = $1;
+	      context->yyMonth = $1;
-	      yyDay = $3;
+	      context->yyDay = $3;
-	      yyYear = $5;
+	      context->yyYear = $5;
 	    }
 	}
 	| tUNUMBER tSNUMBER tSNUMBER {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
-	    yyYear = $1;
+	    context->yyYear = $1;
-	    yyMonth = -$2;
+	    context->yyMonth = -$2;
-	    yyDay = -$3;
+	    context->yyDay = -$3;
 	}
 	| tUNUMBER tMONTH tSNUMBER {
 	    /* e.g. 17-JUN-1992.  */
-	    yyDay = $1;
+	    context->yyDay = $1;
-	    yyMonth = $2;
+	    context->yyMonth = $2;
-	    yyYear = -$3;
+	    context->yyYear = -$3;
 	}
 	| tMONTH tUNUMBER {
-	    yyMonth = $1;
+	    context->yyMonth = $1;
-	    yyDay = $2;
+	    context->yyDay = $2;
 	}
 	| tMONTH tUNUMBER ',' tUNUMBER {
-	    yyMonth = $1;
+	    context->yyMonth = $1;
-	    yyDay = $2;
+	    context->yyDay = $2;
-	    yyYear = $4;
+	    context->yyYear = $4;
 	}
 	| tUNUMBER tMONTH {
-	    yyMonth = $2;
+	    context->yyMonth = $2;
-	    yyDay = $1;
+	    context->yyDay = $1;
 	}
 	| tUNUMBER tMONTH tUNUMBER {
-	    yyMonth = $2;
+	    context->yyMonth = $2;
-	    yyDay = $1;
+	    context->yyDay = $1;
-	    yyYear = $3;
+	    context->yyYear = $3;
 	}
 	;
 rel	: relunit tAGO {
-	    yyRelSeconds = -yyRelSeconds;
+	    context->yyRelSeconds = -context->yyRelSeconds;
-	    yyRelMinutes = -yyRelMinutes;
+	    context->yyRelMinutes = -context->yyRelMinutes;
-	    yyRelHour = -yyRelHour;
+	    context->yyRelHour = -context->yyRelHour;
-	    yyRelDay = -yyRelDay;
+	    context->yyRelDay = -context->yyRelDay;
-	    yyRelMonth = -yyRelMonth;
+	    context->yyRelMonth = -context->yyRelMonth;
-	    yyRelYear = -yyRelYear;
+	    context->yyRelYear = -context->yyRelYear;
 	}
 	| relunit
 	;
 relunit	: tUNUMBER tYEAR_UNIT {
-	    yyRelYear += $1 * $2;
+	    context->yyRelYear += $1 * $2;
 	}
 	| tSNUMBER tYEAR_UNIT {
-	    yyRelYear += $1 * $2;
+	    context->yyRelYear += $1 * $2;
 	}
 	| tYEAR_UNIT {
-	    yyRelYear += $1;
+	    context->yyRelYear += $1;
 	}
 	| tUNUMBER tMONTH_UNIT {
-	    yyRelMonth += $1 * $2;
+	    context->yyRelMonth += $1 * $2;
 	}
 	| tSNUMBER tMONTH_UNIT {
-	    yyRelMonth += $1 * $2;
+	    context->yyRelMonth += $1 * $2;
 	}
 	| tMONTH_UNIT {
-	    yyRelMonth += $1;
+	    context->yyRelMonth += $1;
 	}
 	| tUNUMBER tDAY_UNIT {
-	    yyRelDay += $1 * $2;
+	    context->yyRelDay += $1 * $2;
 	}
 	| tSNUMBER tDAY_UNIT {
-	    yyRelDay += $1 * $2;
+	    context->yyRelDay += $1 * $2;
 	}
 	| tDAY_UNIT {
-	    yyRelDay += $1;
+	    context->yyRelDay += $1;
 	}
 	| tUNUMBER tHOUR_UNIT {
-	    yyRelHour += $1 * $2;
+	    context->yyRelHour += $1 * $2;
 	}
 	| tSNUMBER tHOUR_UNIT {
-	    yyRelHour += $1 * $2;
+	    context->yyRelHour += $1 * $2;
 	}
 	| tHOUR_UNIT {
-	    yyRelHour += $1;
+	    context->yyRelHour += $1;
 	}
 	| tUNUMBER tMINUTE_UNIT {
-	    yyRelMinutes += $1 * $2;
+	    context->yyRelMinutes += $1 * $2;
 	}
 	| tSNUMBER tMINUTE_UNIT {
-	    yyRelMinutes += $1 * $2;
+	    context->yyRelMinutes += $1 * $2;
 	}
 	| tMINUTE_UNIT {
-	    yyRelMinutes += $1;
+	    context->yyRelMinutes += $1;
 	}
 	| tUNUMBER tSEC_UNIT {
-	    yyRelSeconds += $1 * $2;
+	    context->yyRelSeconds += $1 * $2;
 	}
 	| tSNUMBER tSEC_UNIT {
-	    yyRelSeconds += $1 * $2;
+	    context->yyRelSeconds += $1 * $2;
 	}
 	| tSEC_UNIT {
-	    yyRelSeconds += $1;
+	    context->yyRelSeconds += $1;
 	}
 	;
 number	: tUNUMBER
          {
-	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
+	    if (context->yyHaveTime && context->yyHaveDate &&
-	      yyYear = $1;
+		!context->yyHaveRel)
 	      context->yyYear = $1;
 	    else
 	      {
 		if ($1>10000)
 		  {
-		    yyHaveDate++;
+		    context->yyHaveDate++;
-		    yyDay= ($1)%100;
+		    context->yyDay= ($1)%100;
-		    yyMonth= ($1/100)%100;
+		    context->yyMonth= ($1/100)%100;
-		    yyYear = $1/10000;
+		    context->yyYear = $1/10000;
 		  }
 		else
 		  {
-		    yyHaveTime++;
+		    context->yyHaveTime++;
 		    if ($1 < 100)
 		      {
-			yyHour = $1;
+			context->yyHour = $1;
-			yyMinutes = 0;
+			context->yyMinutes = 0;
 		      }
 		    else
 		      {
-		    	yyHour = $1 / 100;
+		    	context->yyHour = $1 / 100;
-		    	yyMinutes = $1 % 100;
+		    	context->yyMinutes = $1 % 100;
 		      }
-		    yySeconds = 0;
+		    context->yySeconds = 0;
-		    yyMeridian = MER24;
+		    context->yyMeridian = MER24;
 		  }
 	      }
 	  }
@@ -725,7 +735,8 @@ ToYear (Year)
 }
 static int
-LookupWord (buff)
+LookupWord (yylval, buff)
     YYSTYPE *yylval;
     char *buff;
 {
  register char *p;
@@ -741,12 +752,12 @@ LookupWord (buff)
  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
    {
-      yylval.Meridian = MERam;
+      yylval->Meridian = MERam;
      return tMERIDIAN;
    }
  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
    {
-      yylval.Meridian = MERpm;
+      yylval->Meridian = MERpm;
      return tMERIDIAN;
    }
@@ -767,13 +778,13 @@ LookupWord (buff)
 	{
 	  if (strncmp (buff, tp->name, 3) == 0)
 	    {
-	      yylval.Number = tp->value;
+	      yylval->Number = tp->value;
 	      return tp->type;
 	    }
 	}
      else if (strcmp (buff, tp->name) == 0)
 	{
-	  yylval.Number = tp->value;
+	  yylval->Number = tp->value;
 	  return tp->type;
 	}
    }
@@ -781,7 +792,7 @@ LookupWord (buff)
  for (tp = TimezoneTable; tp->name; tp++)
    if (strcmp (buff, tp->name) == 0)
      {
-	yylval.Number = tp->value;
+	yylval->Number = tp->value;
 	return tp->type;
      }
@@ -791,7 +802,7 @@ LookupWord (buff)
  for (tp = UnitsTable; tp->name; tp++)
    if (strcmp (buff, tp->name) == 0)
      {
-	yylval.Number = tp->value;
+	yylval->Number = tp->value;
 	return tp->type;
      }
@@ -803,7 +814,7 @@ LookupWord (buff)
      for (tp = UnitsTable; tp->name; tp++)
 	if (strcmp (buff, tp->name) == 0)
 	  {
-	    yylval.Number = tp->value;
+	    yylval->Number = tp->value;
 	    return tp->type;
 	  }
      buff[i] = 's';		/* Put back for "this" in OtherTable. */
@@ -812,7 +823,7 @@ LookupWord (buff)
  for (tp = OtherTable; tp->name; tp++)
    if (strcmp (buff, tp->name) == 0)
      {
-	yylval.Number = tp->value;
+	yylval->Number = tp->value;
 	return tp->type;
      }
@@ -822,7 +833,7 @@ LookupWord (buff)
      for (tp = MilitaryTable; tp->name; tp++)
 	if (strcmp (buff, tp->name) == 0)
 	  {
-	    yylval.Number = tp->value;
+	    yylval->Number = tp->value;
 	    return tp->type;
 	  }
    }
@@ -838,7 +849,7 @@ LookupWord (buff)
    for (tp = TimezoneTable; tp->name; tp++)
      if (strcmp (buff, tp->name) == 0)
 	{
-	  yylval.Number = tp->value;
+	  yylval->Number = tp->value;
 	  return tp->type;
 	}
@@ -846,7 +857,9 @@ LookupWord (buff)
 }
 static int
-yylex ()
+yylex (yylval, cookie)
     YYSTYPE *yylval;
     void *cookie;
 {
  register unsigned char c;
  register char *p;
@@ -856,42 +869,42 @@ yylex ()
  for (;;)
    {
-      while (ISSPACE ((unsigned char) *yyInput))
+      while (ISSPACE ((unsigned char) *context->yyInput))
-	yyInput++;
+	context->yyInput++;
-      if (ISDIGIT (c = *yyInput) || c == '-' || c == '+')
+      if (ISDIGIT (c = *context->yyInput) || c == '-' || c == '+')
 	{
 	  if (c == '-' || c == '+')
 	    {
 	      sign = c == '-' ? -1 : 1;
-	      if (!ISDIGIT (*++yyInput))
+	      if (!ISDIGIT (*++context->yyInput))
 		/* skip the '-' sign */
 		continue;
 	    }
 	  else
 	    sign = 0;
-	  for (yylval.Number = 0; ISDIGIT (c = *yyInput++);)
+	  for (yylval->Number = 0; ISDIGIT (c = *context->yyInput++);)
-	    yylval.Number = 10 * yylval.Number + c - '0';
+	    yylval->Number = 10 * yylval->Number + c - '0';
-	  yyInput--;
+	  context->yyInput--;
 	  if (sign < 0)
-	    yylval.Number = -yylval.Number;
+	    yylval->Number = -yylval->Number;
 	  return sign ? tSNUMBER : tUNUMBER;
 	}
      if (ISALPHA (c))
 	{
-	  for (p = buff; (c = *yyInput++, ISALPHA (c)) || c == '.';)
+	  for (p = buff; (c = *context->yyInput++, ISALPHA (c)) || c == '.';)
 	    if (p < &buff[sizeof buff - 1])
 	      *p++ = c;
 	  *p = '\0';
-	  yyInput--;
+	  context->yyInput--;
-	  return LookupWord (buff);
+	  return LookupWord (yylval, buff);
 	}
      if (c != '(')
-	return *yyInput++;
+	return *context->yyInput++;
      Count = 0;
      do
 	{
-	  c = *yyInput++;
+	  c = *context->yyInput++;
 	  if (c == '\0')
 	    return c;
 	  if (c == '(')
@@ -931,10 +944,11 @@ curl_getdate (const char *p, const time_t *now)
 {
  struct tm tm, tm0, *tmp;
  time_t Start;
  CONTEXT cookie;
 #ifdef HAVE_LOCALTIME_R
  struct tm keeptime;
 #endif
-  yyInput = p;
+  cookie.yyInput = p;
  Start = now ? *now : time ((time_t *) NULL);
 #ifdef HAVE_LOCALTIME_R
  tmp = (struct tm *)localtime_r(&Start, &keeptime);
@@ -943,52 +957,55 @@ curl_getdate (const char *p, const time_t *now)
 #endif
  if (!tmp)
    return -1;
-  yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
+  cookie.yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
-  yyMonth = tmp->tm_mon + 1;
+  cookie.yyMonth = tmp->tm_mon + 1;
-  yyDay = tmp->tm_mday;
+  cookie.yyDay = tmp->tm_mday;
-  yyHour = tmp->tm_hour;
+  cookie.yyHour = tmp->tm_hour;
-  yyMinutes = tmp->tm_min;
+  cookie.yyMinutes = tmp->tm_min;
-  yySeconds = tmp->tm_sec;
+  cookie.yySeconds = tmp->tm_sec;
  tm.tm_isdst = tmp->tm_isdst;
-  yyMeridian = MER24;
+  cookie.yyMeridian = MER24;
-  yyRelSeconds = 0;
+  cookie.yyRelSeconds = 0;
-  yyRelMinutes = 0;
+  cookie.yyRelMinutes = 0;
-  yyRelHour = 0;
+  cookie.yyRelHour = 0;
-  yyRelDay = 0;
+  cookie.yyRelDay = 0;
-  yyRelMonth = 0;
+  cookie.yyRelMonth = 0;
-  yyRelYear = 0;
+  cookie.yyRelYear = 0;
-  yyHaveDate = 0;
+  cookie.yyHaveDate = 0;
-  yyHaveDay = 0;
+  cookie.yyHaveDay = 0;
-  yyHaveRel = 0;
+  cookie.yyHaveRel = 0;
-  yyHaveTime = 0;
+  cookie.yyHaveTime = 0;
-  yyHaveZone = 0;
+  cookie.yyHaveZone = 0;
-  if (yyparse ()
+  if (yyparse (&cookie)
-      || yyHaveTime > 1 || yyHaveZone > 1 || yyHaveDate > 1 || yyHaveDay > 1)
+      || cookie.yyHaveTime > 1 || cookie.yyHaveZone > 1 ||
      cookie.yyHaveDate > 1 || cookie.yyHaveDay > 1)
    return -1;
-  tm.tm_year = ToYear (yyYear) - TM_YEAR_ORIGIN + yyRelYear;
+  tm.tm_year = ToYear (cookie.yyYear) - TM_YEAR_ORIGIN + cookie.yyRelYear;
-  tm.tm_mon = yyMonth - 1 + yyRelMonth;
+  tm.tm_mon = cookie.yyMonth - 1 + cookie.yyRelMonth;
-  tm.tm_mday = yyDay + yyRelDay;
+  tm.tm_mday = cookie.yyDay + cookie.yyRelDay;
-  if (yyHaveTime || (yyHaveRel && !yyHaveDate && !yyHaveDay))
+  if (cookie.yyHaveTime ||
      (cookie.yyHaveRel && !cookie.yyHaveDate && !cookie.yyHaveDay))
    {
-      tm.tm_hour = ToHour (yyHour, yyMeridian);
+      tm.tm_hour = ToHour (cookie.yyHour, cookie.yyMeridian);
      if (tm.tm_hour < 0)
 	return -1;
-      tm.tm_min = yyMinutes;
+      tm.tm_min = cookie.yyMinutes;
-      tm.tm_sec = yySeconds;
+      tm.tm_sec = cookie.yySeconds;
    }
  else
    {
      tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
    }
-  tm.tm_hour += yyRelHour;
+  tm.tm_hour += cookie.yyRelHour;
-  tm.tm_min += yyRelMinutes;
+  tm.tm_min += cookie.yyRelMinutes;
-  tm.tm_sec += yyRelSeconds;
+  tm.tm_sec += cookie.yyRelSeconds;
  /* Let mktime deduce tm_isdst if we have an absolute timestamp,
     or if the relative timestamp mentions days, months, or years.  */
-  if (yyHaveDate | yyHaveDay | yyHaveTime | yyRelDay | yyRelMonth | yyRelYear)
+  if (cookie.yyHaveDate | cookie.yyHaveDay | cookie.yyHaveTime |
      cookie.yyRelDay | cookie.yyRelMonth | cookie.yyRelYear)
    tm.tm_isdst = -1;
  tm0 = tm;
@@ -1006,18 +1023,18 @@ curl_getdate (const char *p, const time_t *now)
         we apply mktime to 1970-01-02 08:00:00 instead and adjust the time
         zone by 24 hours to compensate.  This algorithm assumes that
         there is no DST transition within a day of the time_t boundaries.  */
-      if (yyHaveZone)
+      if (cookie.yyHaveZone)
 	{
 	  tm = tm0;
 	  if (tm.tm_year <= EPOCH - TM_YEAR_ORIGIN)
 	    {
 	      tm.tm_mday++;
-	      yyTimezone -= 24 * 60;
+	      cookie.yyTimezone -= 24 * 60;
 	    }
 	  else
 	    {
 	      tm.tm_mday--;
-	      yyTimezone += 24 * 60;
+	      cookie.yyTimezone += 24 * 60;
 	    }
 	  Start = mktime (&tm);
 	}
@@ -1026,22 +1043,29 @@ curl_getdate (const char *p, const time_t *now)
 	return Start;
    }
-  if (yyHaveDay && !yyHaveDate)
+  if (cookie.yyHaveDay && !cookie.yyHaveDate)
    {
-      tm.tm_mday += ((yyDayNumber - tm.tm_wday + 7) % 7
+      tm.tm_mday += ((cookie.yyDayNumber - tm.tm_wday + 7) % 7
-		     + 7 * (yyDayOrdinal - (0 < yyDayOrdinal)));
+		     + 7 * (cookie.yyDayOrdinal - (0 < cookie.yyDayOrdinal)));
      Start = mktime (&tm);
      if (Start == (time_t) -1)
 	return Start;
    }
-  if (yyHaveZone)
+  if (cookie.yyHaveZone)
    {
      long delta;
-      struct tm *gmt = gmtime (&Start);
+      struct tm *gmt;
 #ifdef HAVE_GMTIME_R
      /* thread-safe version */
      struct tm keeptime;
      gmt = (struct tm *)gmtime_r(&Start, &keeptime);
 #else
      gmt = gmtime(&Start);
 #endif
      if (!gmt)
 	return -1;
-      delta = yyTimezone * 60L + difftm (&tm, gmt);
+      delta = cookie.yyTimezone * 60L + difftm (&tm, gmt);
      if ((Start + delta < Start) != (delta < 0))
 	return -1;		/* time_t overflow */
      Start += delta;
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -55,7 +55,6 @@ char *GetEnv(const char *variable)
  if (env && strcmp("HOME",variable) == 0) {
 	env = decc$translate_vms(env);
  }
 /*  printf ("Getenv: %s=%s\n",variable,env); */
 #else
  /* no length control */
  char *env = getenv(variable);
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -31,6 +31,10 @@
 #include <string.h>
 #include <stdarg.h>
 #ifdef	VMS
 #include	<stdlib.h>
 #endif
 /*
 * This is supposed to be called in the beginning of a permform() session
 * and should reset all session-info variables
@@ -44,11 +48,18 @@ CURLcode Curl_initinfo(struct SessionHandle *data)
  pro->t_connect = 0;
  pro->t_pretransfer = 0;
  pro->t_starttransfer = 0;
  pro->timespent = 0;
  info->httpcode = 0;
  info->httpversion=0;
  info->filetime=-1; /* -1 is an illegal time and thus means unknown */
  if (info->contenttype)
    free(info->contenttype);
  info->contenttype = NULL;
  info->header_size = 0;
  info->request_size = 0;
  return CURLE_OK;
 }
@@ -132,6 +143,9 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...)
  case CURLINFO_CONTENT_LENGTH_UPLOAD:
    *param_doublep = data->progress.size_ul;
    break;
  case CURLINFO_CONTENT_TYPE:
    *param_charp = data->info.contenttype;
    break;
  default:
    return CURLE_BAD_FUNCTION_ARGUMENT;
  }
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -0,0 +1,285 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * 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.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include "setup.h"
 #include <string.h>
 #include <stdlib.h>
 #include "hash.h"
 #include "llist.h"
 #ifdef MALLOCDEBUG
 /* this must be the last include file */
 #include "memdebug.h"
 #endif
 static unsigned long 
 curl_hash_str(const char *key, unsigned int key_length)
 {
  register unsigned long h = 0;
  register unsigned long g;
  register char *p = (char *) key;
  register char *end = (char *) key + key_length;
  while (p < end) {
    h = (h << 4) + *p++;
    if ((g = (h & 0xF0000000))) {
      h = h ^ (g >> 24);
      h = h ^ g;
    }
  }
  return h;
 }
 static unsigned long 
 curl_hash_num(unsigned long key)
 {
  key += ~(key << 15);
  key ^= (key >> 10);
  key += (key << 3);
  key ^= (key >> 6);
  key += (key << 11);
  key ^= (key >> 16);
  return key;
 }
 static void 
 hash_element_dtor(void *u, void *ele)
 {
  curl_hash_element *e = (curl_hash_element *) ele; 
  curl_hash         *h = (curl_hash *) u; 
  if (e->key.type == CURL_HASH_KEY_IS_STRING) {
    free(e->key.value.str.val);
  }
  h->dtor(e->ptr);
  free(e);
  e = NULL;
 }
 void 
 curl_hash_init(curl_hash *h, int slots, curl_hash_dtor dtor)
 {
  int i;
  h->dtor = dtor;
  h->size = 0;
  h->slots = slots;  
  h->table = (curl_llist **) malloc(slots * sizeof(curl_llist *));
  for (i = 0; i < h->slots; ++i) {
    h->table[i] = curl_llist_alloc((curl_llist_dtor) hash_element_dtor);
  }
 }
 curl_hash *
 curl_hash_alloc(int slots, curl_hash_dtor dtor)
 {
  curl_hash *h;
  h = (curl_hash *)malloc(sizeof(curl_hash));
  if(NULL == h)
    return NULL;
  curl_hash_init(h, slots, dtor);
  return h;
 }
 #define FIND_SLOT(__h, __s_key, __s_key_len, __n_key) \
  ((__s_key ? curl_hash_str(__s_key, __s_key_len) : curl_hash_num(__n_key)) % (__h)->slots)
 #define KEY_CREATE(__k, __s_key, __s_key_len, __n_key, __dup) \
  if (__s_key) { \
    if (__dup) { \
      (__k)->value.str.val = (char *) malloc(__s_key_len); \
      memcpy((__k)->value.str.val, __s_key, __s_key_len); \
    } else { \
      (__k)->value.str.val = __s_key; \
    } \
    (__k)->value.str.len = __s_key_len; \
    (__k)->type = CURL_HASH_KEY_IS_STRING; \
  } else { \
    (__k)->value.num = __n_key; \
    (__k)->type = CURL_HASH_KEY_IS_NUM; \
  }
 #define MIN(a, b) (a > b ? b : a)
 static int 
 curl_hash_key_compare(curl_hash_key *key1, curl_hash_key *key2)
 {
  if (key1->type == CURL_HASH_KEY_IS_NUM) {
    if (key2->type == CURL_HASH_KEY_IS_STRING)
      return 0;
    if (key1->value.num == key2->value.num)
      return 1;
  } else {
    if (key2->type == CURL_HASH_KEY_IS_NUM)
      return 0;
    if (memcmp(key1->value.str.val, key2->value.str.val, 
               MIN(key1->value.str.len, key2->value.str.len)) == 0)
      return 1;
  }
  return 0;
 }
 int 
 curl_hash_add_or_update(curl_hash *h, char *str_key, unsigned int str_key_len, 
                        unsigned long num_key, const void *p)
 {
  curl_hash_element  *e;
  curl_hash_key       tmp;
  curl_llist         *l; 
  curl_llist_element *le;
  int                slot;
  slot = FIND_SLOT(h, str_key, str_key_len, num_key);
  l = h->table[slot];
  KEY_CREATE(&tmp, str_key, str_key_len, num_key, 0);
  for (le = CURL_LLIST_HEAD(l); le != NULL; le = CURL_LLIST_NEXT(le)) {
    if (curl_hash_key_compare(&tmp, &((curl_hash_element *) CURL_LLIST_VALP(le))->key)) {
      curl_hash_element *to_update = CURL_LLIST_VALP(le);
      h->dtor(to_update->ptr);
      to_update->ptr = (void *) p;
      return 1;
    }
  }
  e = (curl_hash_element *) malloc(sizeof(curl_hash_element));
  KEY_CREATE(&e->key, str_key, str_key_len, num_key, 1);
  e->ptr = (void *) p;
  if (curl_llist_insert_next(l, CURL_LLIST_TAIL(l), e)) {
    ++h->size;
    return 1;
  } else {
    return 0;
  }
 }
 int 
 curl_hash_extended_delete(curl_hash *h, char *str_key, unsigned int str_key_len, 
                          unsigned long num_key)
 {
  curl_llist         *l;
  curl_llist_element *le;
  curl_hash_key       tmp;
  int                slot;
  slot = FIND_SLOT(h, str_key, str_key_len, num_key);
  l = h->table[slot];
  KEY_CREATE(&tmp, str_key, str_key_len, num_key, 0);
  for (le = CURL_LLIST_HEAD(l); le != NULL; le = CURL_LLIST_NEXT(le)) {
    if (curl_hash_key_compare(&tmp, &((curl_hash_element *) CURL_LLIST_VALP(le))->key)) {
      curl_llist_remove(l, le, (void *) h);
      --h->size;
      return 1;
    }
  }
  return 0;
 }
 int 
 curl_hash_extended_find(curl_hash *h, char *str_key, unsigned int str_key_len, 
                        unsigned long num_key, void **p)
 {
  curl_llist         *l;
  curl_llist_element *le;
  curl_hash_key       tmp;
  int                slot;
  slot = FIND_SLOT(h, str_key, str_key_len, num_key);
  l = h->table[slot];
  KEY_CREATE(&tmp, str_key, str_key_len, num_key, 0);
  for (le = CURL_LLIST_HEAD(l); le != NULL; le = CURL_LLIST_NEXT(le)) {
    if (curl_hash_key_compare(&tmp, &((curl_hash_element *) CURL_LLIST_VALP(le))->key)) {
      *p = ((curl_hash_element *) CURL_LLIST_VALP(le))->ptr;
      return 1;
    }
  }
  return 0;
 }
 void 
 curl_hash_apply(curl_hash *h, void *user, void (*cb)(void *, curl_hash_element *))
 {
  curl_llist_element  *le;
  int                  i;
  for (i = 0; i < h->slots; ++i) {
    for (le = CURL_LLIST_HEAD(h->table[i]); le != NULL; le = CURL_LLIST_NEXT(le)) {
      cb(user, (curl_hash_element *) CURL_LLIST_VALP(le));
    }
  }
 }
 void
 curl_hash_clean(curl_hash *h)
 {
  int i;
  for (i = 0; i < h->slots; ++i) {
    curl_llist_destroy(h->table[i], (void *) h);
  }
  free(h->table);
  h->table = NULL;
 }
 size_t 
 curl_hash_count(curl_hash *h)
 {
  return h->size;
 }
 void 
 curl_hash_destroy(curl_hash *h)
 {
  if (!h) {
    return;
  }
  curl_hash_clean(h);
  free(h);
  h = NULL;
 }
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -0,0 +1,85 @@
 #ifndef __HASH_H
 #define __HASH_H
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * Copyright (C) 2000, 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.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include "setup.h"
 #include <stddef.h>
 #include "llist.h"
 #define CURL_HASH_KEY_IS_STRING 0
 #define CURL_HASH_KEY_IS_NUM    1
 typedef void (*curl_hash_dtor)(void *);
 typedef struct _curl_hash {
  curl_llist     **table;
  curl_hash_dtor   dtor;
  int              slots;
  size_t           size;
 } curl_hash;
 typedef struct _curl_hash_key {
  union {
    struct {
      char *val;
      unsigned int len;
    } str;
    unsigned long num;
  } value;
  int type;
 } curl_hash_key;
 typedef struct _curl_hash_element {
  curl_hash_key  key;
  void          *ptr;
 } curl_hash_element;
 void curl_hash_init(curl_hash *h, int slots, curl_hash_dtor dtor);
 curl_hash *curl_hash_alloc(int slots, curl_hash_dtor dtor);
 int curl_hash_add_or_update(curl_hash *h, char *str_key, unsigned int str_key_len, 
 			     unsigned long num_key, const void *p);
 int curl_hash_extended_delete(curl_hash *h, char *str_key, unsigned int str_key_len, 
 			       unsigned long num_key);
 int curl_hash_extended_find(curl_hash *h, char *str_key, unsigned int str_key_len, 
 			     unsigned long num_key, void **p);
 void curl_hash_apply(curl_hash *h, void *user, void (*cb)(void *, curl_hash_element *));
 size_t curl_hash_count(curl_hash *h);
 void curl_hash_clean(curl_hash *h);
 void curl_hash_destroy(curl_hash *h);
 #define curl_hash_find(h, key, key_len, p) curl_hash_extended_find(h, key, key_len, 0, p)
 #define curl_hash_delete(h, key, key_len) curl_hash_extended_delete(h, key, key_len, 0)
 #define curl_hash_add(h, key, key_len, p) curl_hash_add_or_update(h, key, key_len, 0, p)
 #define curl_hash_update curl_hash_add
 #define curl_hash_index_find(h, key, p) curl_hash_extended_find(h, NULL, 0, key, p)
 #define curl_hash_index_delete(h, key) curl_hash_extended_delete(h, NULL, 0, key)
 #define curl_hash_index_add(h, key, p) curl_hash_add_or_update(h, NULL, 0, key, p)
 #define curl_hash_index_update curl_hash_index_add
 #endif
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -50,6 +50,7 @@
 #include <stdlib.h>	/* required for free() prototypes */
 #endif
 #ifdef	VMS
 #include <in.h>
 #include <inet.h>
 #include <stdlib.h>
 #endif
@@ -58,6 +59,10 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
 #include "hash.h"
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
 #include "inet_ntoa_r.h"
@@ -68,6 +73,151 @@
 #include "memdebug.h"
 #endif
 static curl_hash hostname_cache;
 static int host_cache_initialized;
 void Curl_global_host_cache_init(void)
 {
  if (!host_cache_initialized) {
    curl_hash_init(&hostname_cache, 7, Curl_freeaddrinfo);
    host_cache_initialized = 1;
  }
 }
 curl_hash *Curl_global_host_cache_get(void)
 {
  return &hostname_cache;
 }
 void Curl_global_host_cache_dtor(void)
 {
  if (host_cache_initialized) {
    curl_hash_clean(&hostname_cache);
    host_cache_initialized = 0;
  }
 }
 struct curl_dns_cache_entry {
  Curl_addrinfo *addr;
  time_t timestamp;
 };
 /* count the number of characters that an integer takes up */
 static int _num_chars(int i)
 {
  int chars = 0;
  /* While the number divided by 10 is greater than one, 
   * re-divide the number by 10, and increment the number of 
   * characters by 1.
   *
   * this relies on the fact that for every multiple of 10, 
   * a new digit is added onto every number
   */
  do {
    chars++;
    i = (int) i / 10;
  } while (i >= 1);
  return chars;
 }
 /* Create a hostcache id */
 static char *
 _create_hostcache_id(char *server, int port, ssize_t *entry_len)
 {
  char *id = NULL;
  /* Get the length of the new entry id */
  *entry_len = *entry_len +      /* Hostname length */
               1 +               /* The ':' seperator */
               _num_chars(port); /* The number of characters the port will take up */
  /* Allocate the new entry id */
  id = malloc(*entry_len + 1);
  if (!id) {
    return NULL;
  }
  /* Create the new entry */
  /* If sprintf() doesn't return the entry length, that signals failure */
  if (sprintf(id, "%s:%d", server, port) != *entry_len) {
    /* Free the allocated id, set length to zero and return NULL */
    *entry_len = 0;
    free(id);
    return NULL;
  }
  return id;
 }
 /* Macro to save redundant free'ing of entry_id */
 #define _hostcache_return(__v) \
 { \
  free(entry_id); \
  return (__v); \
 }
 Curl_addrinfo *Curl_resolv(struct SessionHandle *data,
                           char *hostname,
                           int port,
                           char **bufp)
 {
  char *entry_id = NULL;
  struct curl_dns_cache_entry *p = NULL;
  ssize_t entry_len;
  time_t now;
  /* If the host cache timeout is 0, we don't do DNS cach'ing
     so fall through */
  if (data->set.dns_cache_timeout == 0) {
    return Curl_getaddrinfo(data, hostname, port, bufp);
  }
  /* Create an entry id, based upon the hostname and port */
  entry_len = strlen(hostname);
  entry_id = _create_hostcache_id(hostname, port, &entry_len);
  /* If we can't create the entry id, don't cache, just fall-through
     to the plain Curl_getaddrinfo() */
  if (!entry_id) {
    return Curl_getaddrinfo(data, hostname, port, bufp);
  }
  time(&now);
  /* See if its already in our dns cache */
  if (entry_id && curl_hash_find(data->hostcache, entry_id, entry_len+1, (void **) &p)) {
    /* Do we need to check for a cache timeout? */
    if (data->set.dns_cache_timeout != -1) {
      /* Return if the entry has not timed out */
      if ((now - p->timestamp) < data->set.dns_cache_timeout) {
        _hostcache_return(p->addr);
      }
    }
    else {
      _hostcache_return(p->addr);
    }
  }
  /* Create a new cache entry */
  p = (struct curl_dns_cache_entry *) malloc(sizeof(struct curl_dns_cache_entry));
  if (!p) {
   _hostcache_return(NULL);
  }
  p->addr = Curl_getaddrinfo(data, hostname, port, bufp);
  if (!p->addr) {
    free(p);
    _hostcache_return(NULL);
  }
  p->timestamp = now;
  /* Save it in our host cache */
  curl_hash_update(data->hostcache, entry_id, entry_len+1, (const void *) p);
  _hostcache_return(p->addr);
 }
 /*
 * This is a wrapper function for freeing name information in a protocol
 * independent way. This takes care of using the appropriate underlaying
@@ -75,11 +225,15 @@
 */
 void Curl_freeaddrinfo(void *freethis)
 {
  struct curl_dns_cache_entry *p = (struct curl_dns_cache_entry *) freethis;
 #ifdef ENABLE_IPV6
-  freeaddrinfo(freethis);
+  freeaddrinfo(p->addr);
 #else
-  free(freethis);
+  free(p->addr);
 #endif
  free(p);
 }
 /* --- resolve name or IP-number --- */
@@ -102,7 +256,7 @@ int curl_getaddrinfo(char *hostname, char *service,
    /* success */
    if(logfile)
      fprintf(logfile, "ADDR %s:%d getaddrinfo() = %p\n",
-              source, line, *result);
+              source, line, (void *)*result);
  }
  else {
    if(logfile)
@@ -118,7 +272,7 @@ void curl_freeaddrinfo(struct addrinfo *freethis,
  (freeaddrinfo)(freethis);
  if(logfile)
    fprintf(logfile, "ADDR %s:%d freeaddrinfo(%p)\n",
-            source, line, freethis);
+            source, line, (void *)freethis);
 }
 #endif
@@ -139,7 +293,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
  char sbuf[NI_MAXSERV];
  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = PF_UNSPEC;
+  hints.ai_family = PF_INET;
  hints.ai_socktype = SOCK_STREAM;
  hints.ai_flags = AI_CANONNAME;
  snprintf(sbuf, sizeof(sbuf), "%d", port);
@@ -256,7 +410,7 @@ static char *MakeIP(unsigned long num,char *addr, int addr_len)
   considerably. */
 #ifndef INADDR_NONE
-#define INADDR_NONE (unsigned long) ~0
+#define INADDR_NONE (in_addr_t) ~0
 #endif
 Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
@@ -265,7 +419,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
                                char **bufp)
 {
  struct hostent *h = NULL;
-  unsigned long in;
+  in_addr_t in;
  int ret; /* this variable is unused on several platforms but used on some */
 #define CURL_NAMELOOKUP_SIZE 9000
@@ -273,10 +427,10 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
   * everything. OSF1 is known to require at least 8872 bytes. The buffer
   * required for storing all possible aliases and IP numbers is according to
   * Stevens' Unix Network Programming 2nd editor, p. 304: 8192 bytes! */
-  char *buf = (char *)malloc(CURL_NAMELOOKUP_SIZE);
+  int *buf = (int *)malloc(CURL_NAMELOOKUP_SIZE);
  if(!buf)
    return NULL; /* major failure */
-  *bufp = buf;
+  *bufp = (char *)buf;
  port=0; /* unused in IPv4 code */
  ret = 0; /* to prevent the compiler warning */
@@ -306,7 +460,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
    /* Solaris, IRIX and more */
    if ((h = gethostbyname_r(hostname,
                             (struct hostent *)buf,
-                             buf + sizeof(struct hostent),
+                             (char *)buf + sizeof(struct hostent),
                             CURL_NAMELOOKUP_SIZE - sizeof(struct hostent),
                             &h_errnop)) == NULL )
 #endif
@@ -314,7 +468,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
    /* Linux */
    if( gethostbyname_r(hostname,
                        (struct hostent *)buf,
-                        buf + sizeof(struct hostent),
+                        (char *)buf + sizeof(struct hostent),
                        CURL_NAMELOOKUP_SIZE - sizeof(struct hostent),
                        &h, /* DIFFERENCE */
                        &h_errnop))
@@ -357,7 +511,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
      /* we make a copy of the hostent right now, right here, as the
         static one we got a pointer to might get removed when we don't
         want/expect that */
-      h = pack_hostent(buf, h);
+      h = pack_hostent((char *)buf, h);
 #endif
  }
  return (h);
@@ -372,3 +526,4 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -23,10 +23,23 @@
 * $Id$
 *****************************************************************************/
 #include "hash.h"
 struct addrinfo;
 struct hostent;
 struct SessionHandle;
 void Curl_global_host_cache_init(void);
 void Curl_global_host_cache_dtor(void);
 curl_hash *Curl_global_host_cache_get(void);
 #define Curl_global_host_cache_use(__p) ((__p)->set.global_dns_cache)
 Curl_addrinfo *Curl_resolv(struct SessionHandle *data,
 			   char *hostname,
 			   int port,
 			   char **bufp);
 /* Get name info */
 Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
                                char *hostname,
--- a/lib/http.c
+++ b/lib/http.c
@@ -128,8 +128,10 @@ static
 CURLcode add_buffer_send(int sockfd, struct connectdata *conn, send_buffer *in,
                         long *bytes_written)
 {
-  size_t amount;
+  ssize_t amount;
-  CURLcode result;
+  CURLcode res;
  char *ptr;
  int size;
  if(conn->data->set.verbose) {
    fputs("> ", conn->data->set.err);
@@ -137,7 +139,25 @@ CURLcode add_buffer_send(int sockfd, struct connectdata *conn, send_buffer *in,
    fwrite(in->buffer, in->size_used, 1, conn->data->set.err);
  }
-  result = Curl_write(conn, sockfd, in->buffer, in->size_used, &amount);
+  /* The looping below is required since we use non-blocking sockets, but due
     to the circumstances we will just loop and try again and again etc */
  ptr = in->buffer;
  size = in->size_used;
  do {
    res = Curl_write(conn, sockfd, ptr, size, &amount);
    if(CURLE_OK != res)
      break;
    if(amount != size) {
      size -= amount;
      ptr += amount;
    }
    else
      break;
  } while(1);
  if(in->buffer)
    free(in->buffer);
@@ -145,7 +165,7 @@ CURLcode add_buffer_send(int sockfd, struct connectdata *conn, send_buffer *in,
  *bytes_written = amount;
-  return result;
+  return res;
 }
@@ -235,6 +255,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
  int subversion=0;
  struct SessionHandle *data=conn->data;
  CURLcode result;
  int res;
  int nread;   /* total size read */
  int perline; /* count bytes per line */
@@ -317,8 +338,12 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
       * to read, but when we use Curl_read() it may do so. Do confirm
       * that this is still ok and then remove this comment!
       */
-      if(CURLE_OK != Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread,
+      res= Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread,
-                               &gotbytes))
+                     &gotbytes);
      if(res< 0)
        /* EWOULDBLOCK */
        continue; /* go loop yourself */
      else if(res)
        keepon = FALSE;
      else if(gotbytes <= 0) {
        keepon = FALSE;
@@ -449,7 +474,7 @@ CURLcode Curl_http_done(struct connectdata *conn)
  if(0 == (http->readbytecount + conn->headerbytecount)) {
    /* nothing was read from the HTTP server, this can't be right
       so we return an error here */
-    failf(data, "Empty reply from server\n");
+    failf(data, "Empty reply from server");
    return CURLE_GOT_NOTHING;
  }
@@ -610,7 +635,7 @@ CURLcode Curl_http(struct connectdata *conn)
        passed += actuallyread;
        if(actuallyread != readthisamountnow) {
-          failf(data, "Could only read %d bytes from the input\n",
+          failf(data, "Could only read %d bytes from the input",
                passed);
          return CURLE_READ_ERROR;
        }
@@ -621,7 +646,7 @@ CURLcode Curl_http(struct connectdata *conn)
        data->set.infilesize -= conn->resume_from;
        if(data->set.infilesize <= 0) {
-          failf(data, "File already completely uploaded\n");
+          failf(data, "File already completely uploaded");
          return CURLE_PARTIAL_FILE;
        }
      }
@@ -735,10 +760,8 @@ CURLcode Curl_http(struct connectdata *conn)
       * equal to UTC (Coordinated Universal Time)." (see page 20 of RFC2616).
       */
-#ifdef HAVE_LOCALTIME_R
+#ifdef HAVE_GMTIME_R
      /* thread-safe version */
      /* We assume that the presense of localtime_r() proves the presense
         of gmtime_r() which is a bit ugly but might work */
      struct tm keeptime;
      thistime = (struct tm *)gmtime_r(&data->set.timevalue, &keeptime);
 #else
@@ -792,10 +815,8 @@ CURLcode Curl_http(struct connectdata *conn)
    }
    if(HTTPREQ_POST_FORM == data->set.httpreq) {
      char contentType[256];
      int linelength=0;
      if(Curl_FormInit(&http->form, http->sendit)) {
-        failf(data, "Internal HTTP POST error!\n");
+        failf(data, "Internal HTTP POST error!");
        return CURLE_HTTP_POST_ERROR;
      }
@@ -808,7 +829,7 @@ CURLcode Curl_http(struct connectdata *conn)
      data->set.in = (FILE *)&http->form;
      add_bufferf(req_buffer,
-                  "Content-Length: %d\r\n", http->postsize-2);
+                  "Content-Length: %d\r\n", http->postsize);
      if(!checkheaders(data, "Expect:")) {
        /* if not disabled explicitly we add a Expect: 100-continue
@@ -817,21 +838,33 @@ CURLcode Curl_http(struct connectdata *conn)
        add_bufferf(req_buffer,
                    "Expect: 100-continue\r\n");
        data->set.expect100header = TRUE;
      }
      if(!checkheaders(data, "Content-Type:")) {
        /* Get Content-Type: line from Curl_FormReadOneLine, which happens
           to always be the first line. We can know this for sure since
-           we always build the formpost linked list the same way! */
+           we always build the formpost linked list the same way!
           The Content-Type header line also contains the MIME boundary
           string etc why disabling this header is likely to not make things
           work, but we support it anyway.
        */
        char contentType[256];
        int linelength=0;
        linelength = Curl_FormReadOneLine (contentType,
                                           sizeof(contentType),
                                           1,
                                           (FILE *)&http->form);
        if(linelength == -1) {
-          failf(data, "Could not get Content-Type header line!\n");
+          failf(data, "Could not get Content-Type header line!");
          return CURLE_HTTP_POST_ERROR;
        }
        add_buffer(req_buffer, contentType, linelength);
      }
      /* make the request end in a true CRLF */
      add_buffer(req_buffer, "\r\n", 2);
      /* set upload size to the progress meter */
      Curl_pgrsSetUploadSize(data, http->postsize);
@@ -912,12 +945,11 @@ CURLcode Curl_http(struct connectdata *conn)
          add_buffer(req_buffer, "\r\n", 2);
          add_buffer(req_buffer, data->set.postfields,
                     data->set.postfieldsize);
          add_buffer(req_buffer, "\r\n", 2);
        }
        else {
          add_bufferf(req_buffer,
                      "\r\n"
-                      "%s\r\n",
+                      "%s",
                      data->set.postfields );
        }
      }
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -57,6 +57,10 @@
 #include "ftp.h"
 #include "sendf.h"
 #if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
 #include "inet_ntoa_r.h"
 #endif
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
@@ -193,10 +197,10 @@ krb4_auth(void *app_data, struct connectdata *conn)
  int checksum;
  u_int32_t cs;
  struct krb4_data *d = app_data;
  struct sockaddr_in *localaddr  = (struct sockaddr_in *)LOCAL_ADDR;
  char *host = conn->hostaddr->h_name;
  ssize_t nread;
  int l = sizeof(conn->local_addr);
  struct SessionHandle *data = conn->data;
  if(getsockname(conn->firstsocket,
                 (struct sockaddr *)LOCAL_ADDR, &l) < 0)
@@ -207,66 +211,62 @@ krb4_auth(void *app_data, struct connectdata *conn)
  if(ret == KDC_PR_UNKNOWN)
    ret = mk_auth(d, &adat, "rcmd", host, checksum);
  if(ret) {
-    printf("%s\n", krb_get_err_text(ret));
+    Curl_infof(data, "%s\n", krb_get_err_text(ret));
    return AUTH_CONTINUE;
  }
 #ifdef HAVE_KRB_GET_OUR_IP_FOR_REALM
  if (krb_get_config_bool("nat_in_use")) {
    struct sockaddr_in *localaddr  = (struct sockaddr_in *)LOCAL_ADDR;
    struct in_addr natAddr;
    if (krb_get_our_ip_for_realm(krb_realmofhost(host),
                                 &natAddr) != KSUCCESS
        && krb_get_our_ip_for_realm(NULL, &natAddr) != KSUCCESS)
-      printf("Can't get address for realm %s\n",
+      Curl_infof(data, "Can't get address for realm %s\n",
                 krb_realmofhost(host));
    else {
      if (natAddr.s_addr != localaddr->sin_addr.s_addr) {
-        printf("Using NAT IP address (%s) for kerberos 4\n",
+#ifdef HAVE_INET_NTOA_R
-               (char *)inet_ntoa(natAddr));
+        char ntoa_buf[64];
        char *ip = (char *)inet_ntoa_r(natAddr, ntoa_buf, sizeof(ntoa_buf));
 #else
        char *ip = (char *)inet_ntoa(natAddr);
 #endif
        Curl_infof(data, "Using NAT IP address (%s) for kerberos 4\n", ip);
        localaddr->sin_addr = natAddr;
        /*
         * This not the best place to do this, but it is here we know that
         * (probably) NAT is in use!  */
        /*passivemode = 1;***/
        /*printf("Setting: Passive mode on.\n");***/
      }
    }
  }
 #endif
  /*printf("Local address is %s\n", inet_ntoa(localaddr->sin_addr));***/
  /*printf("Remote address is %s\n", inet_ntoa(remoteaddr->sin_addr));***/
  if(Curl_base64_encode(adat.dat, adat.length, &p) < 0) {
-    printf("Out of memory base64-encoding.\n");
+    Curl_failf(data, "Out of memory base64-encoding");
    return AUTH_CONTINUE;
  }
  if(Curl_ftpsendf(conn, "ADAT %s", p))
    return -2;
-  nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, NULL);
+  nread = Curl_GetFTPResponse(data->state.buffer, conn, NULL);
  if(nread < 0)
    return -1;
  free(p);
-  if(/*ret != COMPLETE*/conn->data->state.buffer[0] != '2'){
+  if(data->state.buffer[0] != '2'){
-    printf("Server didn't accept auth data.\n");
+    Curl_failf(data, "Server didn't accept auth data");
    return AUTH_ERROR;
  }
-  p = strstr(conn->data->state.buffer, "ADAT=");
+  p = strstr(data->state.buffer, "ADAT=");
  if(!p) {
-    printf("Remote host didn't send adat reply.\n");
+    Curl_failf(data, "Remote host didn't send adat reply");
    return AUTH_ERROR;
  }
  p += 5;
  len = Curl_base64_decode(p, adat.dat);
  if(len < 0) {
-    printf("Failed to decode base64 from server.\n");
+    Curl_failf(data, "Failed to decode base64 from server");
    return AUTH_ERROR;
  }
  adat.length = len;
@@ -274,13 +274,13 @@ krb4_auth(void *app_data, struct connectdata *conn)
                    (struct sockaddr_in *)hisctladdr, 
                    (struct sockaddr_in *)myctladdr, &msg_data);
  if(ret) {
-    printf("Error reading reply from server: %s.\n", 
+    Curl_failf(data, "Error reading reply from server: %s", 
               krb_get_err_text(ret));
    return AUTH_ERROR;
  }
  krb_get_int(msg_data.app_data, &cs, 4, 0);
  if(cs - checksum != 1) {
-    printf("Bad checksum returned from server.\n");
+    Curl_failf(data, "Bad checksum returned from server");
    return AUTH_ERROR;
  }
  return AUTH_OK;
@@ -321,15 +321,14 @@ void Curl_krb_kauth(struct connectdata *conn)
  if(nread < 0)
    return /*CURLE_OPERATION_TIMEOUTED*/;
-  if(/*ret != CONTINUE*/conn->data->state.buffer[0] != '3'){
+  if(conn->data->state.buffer[0] != '3'){
    Curl_set_command_prot(conn, save);
    /*code = -1;***/
    return;
  }
  p = strstr(conn->data->state.buffer, "T=");
  if(!p) {
-    printf("Bad reply from server.\n");
+    Curl_failf(conn->data, "Bad reply from server");
    Curl_set_command_prot(conn, save);
    return;
  }
@@ -337,7 +336,7 @@ void Curl_krb_kauth(struct connectdata *conn)
  p += 2;
  tmp = Curl_base64_decode(p, &tkt.dat);
  if(tmp < 0) {
-    printf("Failed to decode base64 in reply.\n");
+    Curl_failf(conn->data, "Failed to decode base64 in reply.\n");
    Curl_set_command_prot(conn, save);
    return;
  }
@@ -346,7 +345,7 @@ void Curl_krb_kauth(struct connectdata *conn)
  p = strstr(conn->data->state.buffer, "P=");
  if(!p) {
-    printf("Bad reply from server.\n");
+    Curl_failf(conn->data, "Bad reply from server");
    Curl_set_command_prot(conn, save);
    return;
  }
@@ -374,7 +373,7 @@ void Curl_krb_kauth(struct connectdata *conn)
  memset(schedule, 0, sizeof(schedule));
  memset(passwd, 0, sizeof(passwd));
  if(Curl_base64_encode(tktcopy.dat, tktcopy.length, &p) < 0) {
-    failf(conn->data, "Out of memory base64-encoding.\n");
+    failf(conn->data, "Out of memory base64-encoding.");
    Curl_set_command_prot(conn, save);
    return;
  }
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -0,0 +1,168 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * 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.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include "setup.h"
 #include <string.h>
 #include <stdlib.h>
 #include "llist.h"
 #ifdef MALLOCDEBUG
 /* this must be the last include file */
 #include "memdebug.h"
 #endif
 void 
 curl_llist_init(curl_llist *l, curl_llist_dtor dtor)
 {
  l->size = 0;
  l->dtor = dtor;
  l->head = NULL;
  l->tail = NULL;
 }
 curl_llist *
 curl_llist_alloc(curl_llist_dtor dtor)
 {
  curl_llist *list;
  list = (curl_llist *)malloc(sizeof(curl_llist));
  if(NULL == list)
    return NULL;
  curl_llist_init(list, dtor);
  return list;
 }
 int
 curl_llist_insert_next(curl_llist *list, curl_llist_element *e, const void *p)
 {
  curl_llist_element  *ne;
  ne = (curl_llist_element *) malloc(sizeof(curl_llist_element));
  ne->ptr = (void *) p;
  if (list->size == 0) {
    list->head = ne;
    list->head->prev = NULL;
    list->head->next = NULL;
    list->tail = ne;
  } else {
    ne->next = e->next;
    ne->prev = e;
    if (e->next) {
      e->next->prev = ne;
    } else {
      list->tail = ne;
    }
    e->next = ne;
  }
  ++list->size;
  return 1;
 }
 int 
 curl_llist_insert_prev(curl_llist *list, curl_llist_element *e, const void *p)
 {
  curl_llist_element *ne;
  ne = (curl_llist_element *) malloc(sizeof(curl_llist_element));
  ne->ptr = (void *) p;
  if (list->size == 0) {
    list->head = ne;
    list->head->prev = NULL;
    list->head->next = NULL;
    list->tail = ne;
  } else {
    ne->next = e;
    ne->prev = e->prev;
    if (e->prev)
      e->prev->next = ne;
    else
      list->head = ne;
    e->prev = ne;
  }
  ++list->size;
  return 1;
 }
 int 
 curl_llist_remove(curl_llist *list, curl_llist_element *e, void *user)
 {
  if (e == NULL || list->size == 0)
    return 1;
  if (e == list->head) {
    list->head = e->next;
    if (list->head == NULL)
      list->tail = NULL;
    else
      e->next->prev = NULL;
  } else {
    e->prev->next = e->next;
    if (!e->next)
      list->tail = e->prev;
    else
      e->next->prev = e->prev;
  }
  list->dtor(user, e->ptr);
  free(e);
  --list->size;
  return 1;
 }
 int 
 curl_llist_remove_next(curl_llist *list, curl_llist_element *e, void *user)
 {
  return curl_llist_remove(list, e->next, user);
 }
 int 
 curl_llist_remove_prev(curl_llist *list, curl_llist_element *e, void *user)
 {
  return curl_llist_remove(list, e->prev, user);
 }
 size_t 
 curl_llist_count(curl_llist *list)
 {
  return list->size;
 }
 void 
 curl_llist_destroy(curl_llist *list, void *user)
 {
  while (list->size > 0) {
    curl_llist_remove(list, CURL_LLIST_TAIL(list), user);
  }
  free(list);
  list = NULL;
 }
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -0,0 +1,64 @@
 #ifndef __LLIST_H
 #define __LLIST_H
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * Copyright (C) 2001, 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.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include "setup.h"
 #include <stddef.h>
 typedef void (*curl_llist_dtor)(void *, void *);
 typedef struct _curl_llist_element {
  void *ptr;
  struct _curl_llist_element *prev;
  struct _curl_llist_element *next;
 } curl_llist_element;
 typedef struct _curl_llist {
  curl_llist_element *head;
  curl_llist_element *tail;
  curl_llist_dtor dtor;
  size_t size;
 } curl_llist;
 void curl_llist_init(curl_llist *, curl_llist_dtor);
 curl_llist *curl_llist_alloc(curl_llist_dtor);
 int curl_llist_insert_next(curl_llist *, curl_llist_element *, const void *);
 int curl_llist_insert_prev(curl_llist *, curl_llist_element *, const void *);
 int curl_llist_remove(curl_llist *, curl_llist_element *, void *);
 int curl_llist_remove_next(curl_llist *, curl_llist_element *, void *);
 size_t curl_llist_count(curl_llist *);
 void curl_llist_destroy(curl_llist *, void *);
 #define CURL_LLIST_HEAD(__l) ((__l)->head)
 #define CURL_LLIST_TAIL(__l) ((__l)->tail)
 #define CURL_LLIST_NEXT(__e) ((__e)->next)
 #define CURL_LLIST_PREV(__e) ((__e)->prev)
 #define CURL_LLIST_VALP(__e) ((__e)->ptr)
 #define CURL_LLIST_IS_TAIL(__e) ((__e)->next ? 0 : 1)
 #define CURL_LLIST_IS_HEAD(__e) ((__e)->prev ? 0 : 1)
 #endif
--- a/Show More
+++ b/Show More