another example source added

7.9.3 pre-release commit
non-blocking sockets, DNS caching updated, cookies corrected, bool is now
2002-01-08 08:26:22 +00:00 · 2002-01-08 08:25:44 +00:00 · 2002-01-08 07:22:33 +00:00 · 2002-01-08 07:06:07 +00:00 · 2002-01-08 04:30:59 +00:00 · 2002-01-08 04:26:47 +00:00
558 changed files with 27587 additions and 16763 deletions
--- a/2694
+++ b/2694
--- 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.2000
+++ b/CHANGES.2000
--- a/42
+++ b/42
@@ -10,24 +10,50 @@ 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.
-
+Compile and build instructions follow below.
  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
  buildconf     builds the makefiles and configure stuff
  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:
-automake
+./buildconf
 aclocal
 autoheader
 autoconf
 ./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/2
+++ b/2
@@ -1,4 +1,4 @@
- Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ Copyright (C) 1998-2001, Daniel Stenberg, <daniel@haxx.se>, et al.
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
--- a/MITX.txt
+++ b/MITX.txt
@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE
-Copyright (c) 2000, Daniel Stenberg, <daniel@haxx.se>.
+Copyright (c) 1996 - 2001, Daniel Stenberg, <daniel@haxx.se>.
 All rights reserved.
@@ -10,8 +10,7 @@ in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, and/or sell copies of the
 Software, and to permit persons to whom the Software is furnished to do so,
 provided that the above copyright notice(s) and this permission notice appear
-in all copies of the Software and that both the above copyright notice(s) and
+in all copies of the Software.
 this permission notice appear in supporting documentation.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,20 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 EXTRA_DIST =						\
 	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt	\
-	config-win32.h reconf packages/README Makefile.dist
+	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
-SUBDIRS = docs lib src include tests packages perl php
+SUBDIRS = docs lib src include tests packages multi
 # create a root makefile in the distribution:
 dist-hook:
 	cp $(srcdir)/Makefile.dist $(distdir)/Makefile
 html:
 	cd docs; make html
 check: test
 test:
@@ -47,3 +51,24 @@ rpm:
 	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \
 	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \
 	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .
 #
 # Build a Solaris pkkgadd format file
 # run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format
 # file (which ends up back in this directory).
 # The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do
 # pkgadd -d ./HAXXcurl-*
 #
 # gak - libtool requires an absoulte directory, hence the pwd below...
 pkgadd:
 	umask 022 ; \
 	make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \
 	cat LEGAL MITX.txt MPL-1.1.txt > $(srcdir)/packages/Solaris/copyright ; \
 	cd $(srcdir)/packages/Solaris && $(MAKE) package
 #
 # Build a cygwin binary tarball installation file
 # resulting .tar.bz2 file will end up at packages/Win32/cygwin
 cygwinbin:
 	$(MAKE) -C packages/Win32/cygwin cygwinbin
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___ 
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+# 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.
@@ -43,13 +43,13 @@ mingw32-ssl:
 vc:
 	cd lib
-	nmake -f Makefile.vc6
+	nmake -f Makefile.vc6 cfg=release
 	cd ..\src
 	nmake -f Makefile.vc6
 vc-ssl:
 	cd lib
-	nmake -f Makefile.vc6 release-ssl
+	nmake -f Makefile.vc6 cfg=release-ssl
 	cd ..\src
 	nmake -f Makefile.vc6
--- a/9
+++ b/9
@@ -12,7 +12,7 @@ README
  document.
  libcurl is a library that Curl is using to do its job. It is readily
-  available to be used by your software. Read the LIBCURL document to
+  available to be used by your software. Read the libcurl.3 man page to
  find out how!
  You find answers to the most frequent questions we get in the FAQ document.
@@ -26,6 +26,7 @@ README
  The official download mirror sites are:
        Sweden    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
        Sweden    -- http://cool.haxx.se/curl/
        Germany   -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
  To download the very latest source off the CVS server do this:
@@ -34,11 +35,9 @@ README
  (just press enter when asked for password)
-        cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl co .
+    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl co curl 
-     (now, you'll get all the latest sources downloaded into your current
+  (you'll get a directory named curl created, filled with the source code)
     directory. Note that this does NOT create a directory named curl or
     anything)
    cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl logout
--- a/acconfig.h
+++ b/acconfig.h
@@ -51,3 +51,16 @@
 /* Define this to your Entropy Gathering Daemon socket pathname */
 #undef EGD_SOCKET
 /* Define if you have a working OpenSSL installation */
 #undef OPENSSL_ENABLED
 /* Define the one correct non-blocking socket method below */
 #undef HAVE_FIONBIO
 #undef HAVE_IOCTLSOCKET
 #undef HAVE_IOCTLSOCKET_CASE
 #undef HAVE_O_NONBLOCK
 #undef HAVE_DISABLED_NONBLOCKING
 /* Define this to 'int' if in_addr_t is not an available typedefed type */
 #undef in_addr_t
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,92 +1,445 @@
-#serial 19
+dnl Check for how to set a socket to non-blocking state. There seems to exist
 dnl four known different ways, with the one used almost everywhere being POSIX
 dnl and XPG3, while the other different ways for different systems (old BSD,
 dnl Windows and Amiga).
 dnl
 dnl There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
 dnl O_NONBLOCK define is found but does not work. This condition is attempted
 dnl to get caught in this script by using an excessive number of #ifdefs...
 dnl
 AC_DEFUN(CURL_CHECK_NONBLOCKING_SOCKET,
 [
  AC_MSG_CHECKING([non-blocking sockets style])
-dnl By default, many hosts won't let programs access large files;
+  AC_TRY_COMPILE([
-dnl one must use special compiler options to get large-file access to work.
+/* headers for O_NONBLOCK test */
-dnl For more details about this brain damage please see:
+#include <sys/types.h>
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+#include <unistd.h>
 #include <fcntl.h>
 ],[
 /* try to compile O_NONBLOCK */
-dnl Written by Paul Eggert <eggert@twinsun.com>.
+#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 # if defined(__SVR4) || defined(__srv4__)
 #  define PLATFORM_SOLARIS
 # else
 #  define PLATFORM_SUNOS4
 # endif
 #endif
 #if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX4)
 # define PLATFORM_AIX_V3
 #endif
-dnl Internal subroutine of AC_SYS_LARGEFILE.
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
-dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+#error "O_NONBLOCK does not work on this platform"
-AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+#endif
-  [[#include <sys/types.h>
+  int socket;
-    /* Check that off_t can represent 2**63 - 1 correctly.
+  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
-       We can't simply "#define LARGE_OFF_T 9223372036854775807",
+],[
-       since some C++ compilers masquerading as C compilers
+dnl the O_NONBLOCK test was fine
-       incorrectly reject 9223372036854775807.  */
+nonblock="O_NONBLOCK"
-#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+AC_DEFINE(HAVE_O_NONBLOCK)
-    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+],[
-			&& LARGE_OFF_T % 2147483647 == 1)
+dnl the code was bad, try a different program now, test 2
 		       ? 1 : -1];
  ]])
-dnl Internal subroutine of AC_SYS_LARGEFILE.
+  AC_TRY_COMPILE([
-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+/* headers for FIONBIO test */
-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+#include <unistd.h>
-  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+#include <stropts.h>
-     [$3=no
+],[
-      AC_TRY_COMPILE([$5],
+/* FIONBIO source test */
-	[$6], 
+ int flags = ioctl(socket, FIONBIO, &flags);
-	,
+],[
-	[AC_TRY_COMPILE([#define $1 $2]
+dnl FIONBIO test was good
-[$5]
+nonblock="FIONBIO"
-	   ,
+AC_DEFINE(HAVE_FIONBIO)
-	   [$6],
+],[
-	   [$3=$2])])])
+dnl FIONBIO test was also bad
-   if test "[$]$3" != no; then
+dnl the code was bad, try a different program now, test 3
     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
   fi])
-AC_DEFUN(AC_SYS_LARGEFILE,
+  AC_TRY_COMPILE([
-  [AC_REQUIRE([AC_PROG_CC])
+/* headers for ioctlsocket test (cygwin?) */
-   AC_ARG_ENABLE(largefile,
+#include <windows.h>
-     [  --disable-largefile     omit support for large files])
+],[
-   if test "$enable_largefile" != no; then
+/* ioctlsocket source code */
 int flags = ioctlsocket(socket, FIONBIO, &flags);
 ],[
 dnl ioctlsocket test was good
 nonblock="ioctlsocket"
 AC_DEFINE(HAVE_IOCTLSOCKET)
 ],[
 dnl ioctlsocket didnt compile!
-     AC_CACHE_CHECK([for special C compiler options needed for large files],
+  AC_TRY_COMPILE([
-       ac_cv_sys_largefile_CC,
+/* headers for IoctlSocket test (Amiga?) */
-       [ac_cv_sys_largefile_CC=no
+#include <sys/ioctl.h>
-        if test "$GCC" != yes; then
+],[
-	  # IRIX 6.2 and later do not support large files by default,
+/* IoctlSocket source code */
-	  # so use the C compiler's -n32 option if that helps.
+ int flags = IoctlSocket(socket, FIONBIO, (long)1);
-	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+],[
-	    [ac_save_CC="$CC"
+dnl ioctlsocket test was good
-	     CC="$CC -n32"
+nonblock="IoctlSocket"
-	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+AC_DEFINE(HAVE_IOCTLSOCKET_CASE)
-	       ac_cv_sys_largefile_CC=' -n32')
+],[
-	     CC="$ac_save_CC"])
+dnl ioctlsocket didnt compile!
-        fi])
+nonblock="nada"
-     if test "$ac_cv_sys_largefile_CC" != no; then
+AC_DEFINE(HAVE_DISABLED_NONBLOCKING)
-       CC="$CC$ac_cv_sys_largefile_CC"
+])
-     fi
+dnl end of forth test
-     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+])
-       ac_cv_sys_file_offset_bits,
+dnl end of third test
-       [Number of bits in a file offset, on hosts where this is settable.],
+
-       AC_SYS_LARGEFILE_TEST_INCLUDES)
+])
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+dnl end of second test
-       ac_cv_sys_large_files,
+
-       [Define for large files, on AIX-style hosts.],
+])
-       AC_SYS_LARGEFILE_TEST_INCLUDES)
+dnl end of non-blocking try-compile test
  AC_MSG_RESULT($nonblock)
  if test "$nonblock" = "nada"; then
    AC_MSG_WARN([non-block sockets disabled])
  fi
 ])
-AC_DEFUN(AC_FUNC_FSEEKO,
+dnl Check for socklen_t: historically on BSD it is an int, and in
-  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+dnl POSIX 1g it is a type of its own, but some platforms use different
-     ac_cv_sys_largefile_source,
+dnl types for the argument to getsockopt, getpeername, etc.  So we
-     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
+dnl have to test to find something that will work.
-     [#include <stdio.h>], [return !fseeko;])
+AC_DEFUN([TYPE_SOCKLEN_T],
-   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+[
-   # in glibc 2.1.3, but that breaks too many other things.
+   AC_CHECK_TYPE([socklen_t], ,[
-   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+      AC_MSG_CHECKING([for socklen_t equivalent])
      AC_CACHE_VAL([curl_cv_socklen_t_equiv],
      [
         # Systems have either "struct sockaddr *" or
         # "void *" as the second argument to getpeername
         curl_cv_socklen_t_equiv=
         for arg2 in "struct sockaddr" void; do
            for t in int size_t unsigned long "unsigned long"; do
               AC_TRY_COMPILE([
                  #include <sys/types.h>
                  #include <sys/socket.h>
-   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
+                  int getpeername (int, $arg2 *, $t *);
-     [ac_cv_func_fseeko=no
+               ],[
-      AC_TRY_LINK([#include <stdio.h>],
+                  $t len;
-        [return fseeko && fseeko (stdin, 0, 0);],
+                  getpeername(0,0,&len);
-	[ac_cv_func_fseeko=yes])])
+               ],[
-   if test $ac_cv_func_fseeko != no; then
+                  curl_cv_socklen_t_equiv="$t"
-     AC_DEFINE(HAVE_FSEEKO, 1,
+                  break
-       [Define if fseeko (and presumably ftello) exists and is declared.])
+               ])
-   fi])
+            done
         done
         if test "x$curl_cv_socklen_t_equiv" = x; then
            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
         fi
      ])
      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
 			[type to use in place of socklen_t if not defined])],
      [#include <sys/types.h>
 #include <sys/socket.h>])
 ])
 dnl Check for in_addr_t: it is used to receive the return code of inet_addr()
 dnl and a few other things. If not found, we set it to unsigned int, as even
 dnl 64-bit implementations use to set it to a 32-bit type.
 AC_DEFUN([TYPE_IN_ADDR_T],
 [
   AC_CHECK_TYPE([in_addr_t], ,[
      AC_MSG_CHECKING([for in_addr_t equivalent])
      AC_CACHE_VAL([curl_cv_in_addr_t_equiv],
      [
         # Systems have either "struct sockaddr *" or
         # "void *" as the second argument to getpeername
         curl_cv_in_addr_t_equiv=
         for t in int size_t unsigned long "unsigned long"; do
            AC_TRY_COMPILE([
               #include <sys/types.h>
               #include <sys/socket.h>
               #include <arpa/inet.h>
            ],[
               $t data = inet_addr ("1.2.3.4");
            ],[
               curl_cv_in_addr_t_equiv="$t"
               break
            ])
         done
         if test "x$curl_cv_in_addr_t_equiv" = x; then
            AC_MSG_ERROR([Cannot find a type to use in place of in_addr_t])
         fi
      ])
      AC_MSG_RESULT($curl_cv_in_addr_t_equiv)
      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 <arpa/inet.h>])
 ])
 dnl ************************************************************
 dnl check for "localhost", if it doesn't exist, we can't do the
 dnl gethostbyname_r tests!
 dnl 
 AC_DEFUN(CURL_CHECK_WORKING_RESOLVER,[
 AC_MSG_CHECKING([if "localhost" resolves])
 AC_TRY_RUN([
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent *h;
 h = gethostbyname("localhost");
 exit (h == NULL ? 1 : 0); }],[
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_ERROR([can't figure out gethostbyname_r() since localhost doesn't resolve])
      ]
 )
 ])
 dnl ************************************************************
 dnl check for working getaddrinfo()
 dnl
 AC_DEFUN(CURL_CHECK_WORKING_GETADDRINFO,[
  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
  AC_TRY_RUN( [
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 void main(void) {
    struct addrinfo hints, *ai;
    int error;
    memset(&hints, 0, sizeof(hints));
    hints.ai_family = AF_UNSPEC;
    hints.ai_socktype = SOCK_STREAM;
    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
    if (error) {
        exit(1);
    }
    else {
        exit(0);
    }
 }
 ],[
  ac_cv_working_getaddrinfo="yes"
 ],[
  ac_cv_working_getaddrinfo="no"
 ],[
  ac_cv_working_getaddrinfo="yes"
 ])])
 if test "$ac_cv_working_getaddrinfo" = "yes"; then
  AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works])
  AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
  IPV6_ENABLED=1
  AC_SUBST(IPV6_ENABLED)
 fi
 ])
 AC_DEFUN(CURL_CHECK_LOCALTIME_R,
 [
  dnl check for a few thread-safe functions
  AC_CHECK_FUNCS(localtime_r,[
    AC_MSG_CHECKING(whether localtime_r is declared)
    AC_EGREP_CPP(localtime_r,[
 #include <time.h>],[
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(whether localtime_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(localtime_r,[
 #define _REENTRANT
 #include <time.h>],[
 	AC_DEFINE(NEED_REENTRANT)
 	AC_MSG_RESULT(yes)],
 	AC_MSG_RESULT(no))])])
 ])
 AC_DEFUN(CURL_CHECK_INET_NTOA_R,
 [
  dnl determine if function definition for inet_ntoa_r exists.
  AC_CHECK_FUNCS(inet_ntoa_r,[
    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
    AC_EGREP_CPP(inet_ntoa_r,[
 #include <arpa/inet.h>],[
      AC_DEFINE(HAVE_INET_NTOA_R_DECL)
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(inet_ntoa_r,[
 #define _REENTRANT
 #include <arpa/inet.h>],[
 	AC_DEFINE(HAVE_INET_NTOA_R_DECL)
 	AC_DEFINE(NEED_REENTRANT)
 	AC_MSG_RESULT(yes)],
 	AC_MSG_RESULT(no))])])
 ])
 AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
 [
  dnl check for number of arguments to gethostbyaddr_r. it might take
  dnl either 5, 7, or 8 arguments.
  AC_CHECK_FUNCS(gethostbyaddr_r,[
    AC_MSG_CHECKING(if gethostbyaddr_r takes 5 arguments)
    AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 struct hostent_data hdata;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
      ac_cv_gethostbyaddr_args=5],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(if gethostbyaddr_r with -D_REENTRANT takes 5 arguments)
      AC_TRY_COMPILE([
 #define _REENTRANT
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 struct hostent_data hdata;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
 	AC_DEFINE(NEED_REENTRANT)
 	ac_cv_gethostbyaddr_args=5],[
 	AC_MSG_RESULT(no)
 	AC_MSG_CHECKING(if gethostbyaddr_r takes 7 arguments)
 	AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 char buffer[8192];
 int h_errnop;
 struct hostent * hp;
 hp = gethostbyaddr_r(address, length, type, &h,
                     buffer, 8192, &h_errnop);],[
 	  AC_MSG_RESULT(yes)
 	  AC_DEFINE(HAVE_GETHOSTBYADDR_R_7)
 	  ac_cv_gethostbyaddr_args=7],[
 	  AC_MSG_RESULT(no)
 	  AC_MSG_CHECKING(if gethostbyaddr_r takes 8 arguments)
 	  AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 char buffer[8192];
 int h_errnop;
 struct hostent * hp;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h,
                     buffer, 8192, &hp, &h_errnop);],[
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8)
 	    ac_cv_gethostbyaddr_args=8],[
 	    AC_MSG_RESULT(no)
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
 ])
 AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
 [
  dnl check for number of arguments to gethostbyname_r. it might take
  dnl either 3, 5, or 6 arguments.
  AC_CHECK_FUNCS(gethostbyname_r,[
    AC_MSG_CHECKING([if gethostbyname_r takes 3 arguments])
    AC_TRY_COMPILE([
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 #undef NULL
 #define NULL (void *)0
 int
 gethostbyname_r(const char *, struct hostent *, struct hostent_data *);],[
 gethostbyname_r(NULL, NULL, NULL);],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
      ac_cv_gethostbyname_args=3],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING([if gethostbyname_r with -D_REENTRANT takes 3 arguments])
      AC_TRY_COMPILE([
 #define _REENTRANT
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 #undef NULL
 #define NULL (void *)0
 int
 gethostbyname_r(const char *,struct hostent *, struct hostent_data *);],[
 gethostbyname_r(NULL, NULL, NULL);],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
 	AC_DEFINE(NEED_REENTRANT)
 	ac_cv_gethostbyname_args=3],[
 	AC_MSG_RESULT(no)
 	AC_MSG_CHECKING([if gethostbyname_r takes 5 arguments])
 	AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>
 #undef NULL
 #define NULL (void *)0
 struct hostent *
 gethostbyname_r(const char *, struct hostent *, char *, int, int *);],[
 gethostbyname_r(NULL, NULL, NULL, 0, NULL);],[
 	  AC_MSG_RESULT(yes)
 	  AC_DEFINE(HAVE_GETHOSTBYNAME_R_5)
          ac_cv_gethostbyname_args=5],[
 	  AC_MSG_RESULT(no)
 	  AC_MSG_CHECKING([if gethostbyname_r takes 6 arguments])
 	  AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>
 #undef NULL
 #define NULL (void *)0
 int
 gethostbyname_r(const char *, struct hostent *, char *, size_t,
 struct hostent **, int *);],[
 gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL);],[
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6)
            ac_cv_gethostbyname_args=6],[
 	    AC_MSG_RESULT(no)
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"],
 	    [ac_cv_gethostbyname_args=0])],
 	  [ac_cv_gethostbyname_args=0])],
 	[ac_cv_gethostbyname_args=0])],
      [ac_cv_gethostbyname_args=0])])
 if test "$ac_cv_func_gethostbyname_r" = "yes"; then
  if test "$ac_cv_gethostbyname_args" = "0"; then
    dnl there's a gethostbyname_r() function, but we don't know how
    dnl many arguments it wants!
    AC_MSG_ERROR([couldn't figure out how to use gethostbyname_r()])
  fi
 fi
 ])
--- a/build_vms.com
+++ b/build_vms.com
@@ -0,0 +1,67 @@
 $!
 $
 $	on control_y then goto Common_Exit!
 $	orig = f$environment("DEFAULT")
 $	loc  = f$environment("PROCEDURE")
 $	def = f$parse("X.X;1",loc) - "X.X;1"
 $
 $	set def 'def'
 $	cc_qual = "/define=HAVE_CONFIG_H=1/include=(""../include/"",""../"")"
 $	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
 $
 $
 $	goto Common_Exit
 $build:	subroutine
 $	set noon
 $	set default 'p1'
 $	search = p2
 $	reset = f$search("reset")
 $	if f$search("CURL.OLB") .eqs. ""
 $	then
 $		LIB/CREATE/OBJECT CURL.OLB
 $	endif
 $	reset = f$search("reset",1)
 $Loop:
 $	file = f$search(search,1)
 $	if file .eqs. "" then goto EndLoop
 $		obj = f$search(f$parse(".OBJ;",file),2)
 $		if (obj .nes. "")
 $		then
 $			if (f$cvtime(f$file(file,"rdt")) .gts. f$cvtime(f$file(obj,"rdt")))
 $			then
 $				call compile 'file'
 $				lib/object curl.OLB 'f$parse(".obj;",file)'
 $			else
 $!				write sys$output "File: ''file' is up to date"
 $			endif
 $		else
 $!			write sys$output "Object for file: ''file' does not exist"
 $			call compile 'file'
 $			lib/object curl.OLB 'f$parse(".obj;",file)'
 $		endif
 $	goto Loop
 $EndLoop:
 $	purge
 $	set def 'def'
 $	endsubroutine	! Build
 $
 $compile:	subroutine
 $	set noon
 $	file = p1
 $	qual = p2+p3+p4+p5+p6+p7+p8
 $	typ = f$parse(file,,,"TYPE") - "."
 $	cmd_c = "CC "+cc_qual
 $	cmd_msg = "MESSAGE "+msg_qual
 $	x = cmd_'typ'
 $	'x' 'file'
 $	ENDSUBROUTINE	! Compile
 $
 $Common_Exit:
 $	set default 'orig'
 $	exit
--- a/11
+++ b/11
@@ -0,0 +1,11 @@
 #!/bin/sh
 die(){
 	echo "$@"
 	exit
 }
 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/config-mac.h
+++ b/config-mac.h
@@ -0,0 +1,45 @@
 #define OS "mac"
 #define HAVE_NETINET_IN_H	1
 #define HAVE_SYS_SOCKET_H	1
 #define HAVE_SYS_SELECT_H	1
 #define HAVE_NETDB_H		1
 #define HAVE_ARPA_INET_H	1
 #define HAVE_UNISTD_H		1
 #define HAVE_NET_IF_H		1
 #define HAVE_SYS_TYPES_H	1
 #define HAVE_GETTIMEOFDAY	1
 #define HAVE_FCNTL_H		1
 #define HAVE_SYS_STAT_H		1
 #define HAVE_ALLOCA_H		1
 #define HAVE_TIME_H			1
 #define HAVE_STDLIB_H		1
 #define HAVE_UTIME_H		1
 #define TIME_WITH_SYS_TIME	1
 #define HAVE_STRDUP			1
 #define HAVE_UTIME			1
 #define HAVE_INET_NTOA		1
 #define HAVE_SETVBUF		1
 #define HAVE_STRFTIME		1
 #define HAVE_INET_ADDR		1
 #define HAVE_MEMCPY			1
 #define HAVE_SELECT			1
 #define HAVE_SOCKET			1
 //#define HAVE_STRICMP		1
 #define HAVE_SIGACTION		1
 #ifdef MACOS_SSL_SUPPORT
 #	define USE_SSLEAY			1
 #	define USE_OPENSSL			1
 #endif
 #define HAVE_RAND_STATUS	1
 #define HAVE_RAND_EGD		1
 #define HAVE_FIONBIO        1
 #include <extra/stricmp.h>
 #include <extra/strdup.h>
--- a/config-riscos.h
+++ b/config-riscos.h
@@ -0,0 +1,25 @@
 #define socklen_t int
 #define HAVE_SYS_SOCKET_H
 #define HAVE_ARPA_INET_H
 #define HAVE_SYS_SELECT_H
 #define HAVE_FCNTL_H
 #define HAVE_GETTIMEOFDAY
 #define HAVE_SELECT
 #define HAVE_SOCKET
 #define ifr_dstaddr ifr_addr
 #include <sys/socket.h>
 #include <sys/if.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #define ioctl(a,b,c,d) (ioctl(a,b,c) * (d==d))
 #define OS "RISC OS"
--- a/config-vms.h
+++ b/config-vms.h
@@ -0,0 +1,367 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* Define if on AIX 3.
   System headers sometimes define this.
   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 #undef _ALL_SOURCE
 #endif
 /* Define to empty if the keyword does not work.  */
 #undef const
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #define TIME_WITH_SYS_TIME 1
 /* Define cpu-machine-OS */
 #define OS "ALPHA-COMPAQ-VMS"
 /* Define if you have the gethostbyaddr_r() function with 5 arguments */
 #undef HAVE_GETHOSTBYADDR_R_5
 /* Define if you have the gethostbyaddr_r() function with 7 arguments */
 #undef HAVE_GETHOSTBYADDR_R_7
 /* Define if you have the gethostbyaddr_r() function with 8 arguments */
 #undef HAVE_GETHOSTBYADDR_R_8
 /* Define if you have the gethostbyname_r() function with 3 arguments */
 #undef HAVE_GETHOSTBYNAME_R_3
 /* Define if you have the gethostbyname_r() function with 5 arguments */
 #undef HAVE_GETHOSTBYNAME_R_5
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 /* Define if you have the inet_ntoa_r function declared. */
 #undef HAVE_INET_NTOA_R_DECL
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 /* Define if you have the Kerberos4 libraries (including -ldes) */
 #undef KRB4
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 /* Define this to 'int' if socklen_t is not an available typedefed type */
 #define socklen_t size_t
 /* Define this as a suitable file to read random data from */
 #undef RANDOM_FILE
 /* Define this to your Entropy Gathering Daemon socket pathname */
 #undef EGD_SOCKET
 /* The number of bytes in a long double.  */
 #define SIZEOF_LONG_DOUBLE 8
 /* The number of bytes in a long long.  */
 #define SIZEOF_LONG_LONG 8
 /* Define if you have the RAND_egd function.  */
 #undef HAVE_RAND_EGD
 /* Define if you have the RAND_screen function.  */
 #undef HAVE_RAND_SCREEN
 /* Define if you have the RAND_status function.  */
 #undef HAVE_RAND_STATUS
 /* Define if you have the closesocket function.  */
 #undef HAVE_CLOSESOCKET
 /* Define if you have the geteuid function.  */
 #define HAVE_GETEUID 1
 /* Define if you have the gethostbyaddr function.  */
 #define HAVE_GETHOSTBYADDR 1
 /* Define if you have the gethostbyaddr_r function.  */
 #undef HAVE_GETHOSTBYADDR_R
 /* Define if you have the gethostbyname_r function.  */
 #undef HAVE_GETHOSTBYNAME_R
 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME 1
 /* Define if you have the getpass_r function.  */
 #undef HAVE_GETPASS_R
 /* Define if you have the getpwuid function.  */
 #define HAVE_GETPWUID 1
 /* Define if you have the getservbyname function.  */
 #define HAVE_GETSERVBYNAME 1
 /* Define if you have the gettimeofday function.  */
 #define HAVE_GETTIMEOFDAY 1
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 /* Define if you have the inet_ntoa function.  */
 #define HAVE_INET_NTOA 1
 /* Define if you have the inet_ntoa_r function.  */
 #undef HAVE_INET_NTOA_R
 /* Define if you have the krb_get_our_ip_for_realm function.  */
 #undef HAVE_KRB_GET_OUR_IP_FOR_REALM
 /* Define if you have the localtime_r function.  */
 #undef HAVE_LOCALTIME_R
 /* Define if you have the perror function.  */
 #define HAVE_PERROR 1
 /* Define if you have the select function.  */
 #define HAVE_SELECT 1
 /* Define if you have the setvbuf function.  */
 #undef HAVE_SETVBUF
 /* Define if you have the sigaction function.  */
 #define HAVE_SIGACTION 1
 /* Define if you have the signal function.  */
 #define HAVE_SIGNAL 1
 /* Define if you have the socket function.  */
 #define HAVE_SOCKET 1
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
 /* Define if you have the strcmpi function.  */
 #define HAVE_STRCMPI 1
 /* Define if you have the strdup function.  */
 #define HAVE_STRDUP 1
 /* Define if you have the strftime function.  */
 #define HAVE_STRFTIME 1
 /* Define if you have the stricmp function.  */
 #define HAVE_STRICMP 1
 /* Define if you have the strlcat function.  */
 #undef HAVE_STRLCAT
 /* Define if you have the strlcpy function.  */
 #undef HAVE_STRLCPY
 /* Define if you have the strstr function.  */
 #define  HAVE_STRSTR 1
 /* Define if you have the tcgetattr function.  */
 #undef HAVE_TCGETATTR
 /* Define if you have the tcsetattr function.  */
 #undef HAVE_TCSETATTR
 /* Define if you have the uname function.  */
 #define HAVE_UNAME 1
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 /* Define if you have the <arpa/inet.h> header file.  */
 #undef HAVE_ARPA_INET_H
 /* Define if you have the <crypto.h> header file.  */
 #undef HAVE_CRYPTO_H
 /* Define if you have the <des.h> header file.  */
 #undef HAVE_DES_H
 /* Define if you have the <dlfcn.h> header file.  */
 #undef HAVE_DLFCN_H
 /* Define if you have the <err.h> header file.  */
 #define HAVE_ERR_H 1
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 /* Define if you have the <getopt.h> header file.  */
 #define HAVE_GETOPT_H 1
 /* Define if you have the <io.h> header file.  */
 #undef HAVE_IO_H
 /* Define if you have the <krb.h> header file.  */
 #undef HAVE_KRB_H
 /* Define if you have the <malloc.h> header file.  */
 #define HAVE_MALLOC_H 1
 /* Define if you have the <net/if.h> header file.  */
 #define HAVE_NET_IF_H 1
 /* Define if you have the <netdb.h> header file.  */
 #define HAVE_NETDB_H 1
 /* Define if you have the <netinet/if_ether.h> header file.  */
 #define HAVE_NETINET_IF_ETHER_H 1
 /* Define if you have the <netinet/in.h> header file.  */
 #define HAVE_NETINET_IN_H 1
 /* Define if you have the <openssl/crypto.h> header file.  */
 #undef HAVE_OPENSSL_CRYPTO_H
 /* Define if you have the <openssl/err.h> header file.  */
 #undef HAVE_OPENSSL_ERR_H
 /* Define if you have the <openssl/pem.h> header file.  */
 #undef HAVE_OPENSSL_PEM_H
 /* Define if you have the <openssl/rsa.h> header file.  */
 #undef HAVE_OPENSSL_RSA_H
 /* Define if you have the <openssl/ssl.h> header file.  */
 #undef HAVE_OPENSSL_SSL_H
 /* Define if you have the <openssl/x509.h> header file.  */
 #undef HAVE_OPENSSL_X509_H
 /* Define if you have the <pem.h> header file.  */
 #undef HAVE_PEM_H
 /* Define if you have the <pwd.h> header file.  */
 #define HAVE_PWD_H 1
 /* Define if you have the <rsa.h> header file.  */
 #undef HAVE_RSA_H
 /* Define if you have the <sgtty.h> header file.  */
 #define HAVE_SGTTY_H 1
 /* Define if you have the <ssl.h> header file.  */
 #undef HAVE_SSL_H
 /* Define if you have the <stdlib.h> header file.  */
 #define HAVE_STDLIB_H 1
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 /* Define if you have the <sys/socket.h> header file.  */
 #define HAVE_SYS_SOCKET_H 1
 /* Define if you have the <sys/sockio.h> header file.  */
 #undef HAVE_SYS_SOCKIO_H
 /* Define if you have the <sys/stat.h> header file.  */
 #define HAVE_SYS_STAT_H 1
 /* Define if you have the <sys/time.h> header file.  */
 #define HAVE_SYS_TIME_H 1
 /* Define if you have the <sys/types.h> header file.  */
 #define HAVE_SYS_TYPES_H 1
 /* Define if you have the <termio.h> header file.  */
 #undef HAVE_TERMIO_H
 /* Define if you have the <termios.h> header file.  */
 #define HAVE_TERMIOS_H 1
 /* Define if you have the <time.h> header file.  */
 #define HAVE_TIME_H 1
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
 /* Define if you have the <winsock.h> header file.  */
 #undef HAVE_WINSOCK_H
 /* Define if you have the <x509.h> header file.  */
 #undef HAVE_X509_H
 /* Define if you have the crypto library (-lcrypto).  */
 #undef HAVE_LIBCRYPTO
 /* Define if you have the dl library (-ldl).  */
 #undef HAVE_LIBDL
 /* Define if you have the nsl library (-lnsl).  */
 #undef HAVE_LIBNSL
 /* Define if you have the resolv library (-lresolv).  */
 #define HAVE_LIBRESOLV 1
 /* Define if you have the resolve library (-lresolve).  */
 #undef HAVE_LIBRESOLVE
 /* Define if you have the socket library (-lsocket).  */
 #define HAVE_LIBSOCKET 1
 /* Define if you have the ssl library (-lssl).  */
 #undef HAVE_LIBSSL
 /* Define if you have the ucb library (-lucb).  */
 #undef HAVE_LIBUCB
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 /* Define if getaddrinfo exists and works */
 #define HAVE_GETADDRINFO 1
 /* Define if you want to enable IPv6 support */
 #undef ENABLE_IPV6
 /* Set to explicitly specify we don't want to use thread-safe functions */
 #undef DISABLED_THREADSAFE
 #define	HAVE_TIMEVAL_H	1
 /* Name of this package! */
 #define PACKAGE "not-used"
 /* Version number of this archive. */
 #define VERSION "not-used"
 /* Define if you have the getpass function.  */
 #undef HAVE_GETPASS
 /* Define if you have a working OpenSSL installation */
 #undef OPENSSL_ENABLED
 /* Define if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
 /* Define if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 /* Define if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 /* Define if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 /* Define if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 #define HAVE_MEMORY_H   1
--- a/config-win32.h
+++ b/config-win32.h
@@ -42,7 +42,7 @@
 #define SIZEOF_LONG_DOUBLE 16
 /* The number of bytes in a long long.  */
-#define SIZEOF_LONG_LONG 8
+/* #define SIZEOF_LONG_LONG 8 */
 /* Define if you have the gethostbyaddr function.  */
 #define HAVE_GETHOSTBYADDR 1
@@ -101,6 +101,9 @@
 /* Define if you have the <alloca.h> header file.  */
 /*#define HAVE_ALLOCA_H 1*/
 /* Define if you have the malloc.h file.  */
 #define HAVE_MALLOC_H 1
 /* Define if you have the <arpa/inet.h> header file.  */
 #define HAVE_ARPA_INET_H 1
@@ -176,6 +179,9 @@
 /* Define if you have the RAND_screen function when using SSL  */
 #define HAVE_RAND_SCREEN 1
 /* Define this to if in_addr_t is not an available typedefed type */
 #define in_addr_t unsigned long
 /*************************************************
 * This section is for compiler specific defines.*
 *************************************************/
@@ -185,3 +191,28 @@
 #define HAVE_UNISTD_H 1
 #endif
 /**************************************************
 *This is to eliminate the warnings when compiled *
 * using MS VC++ compiler	  			  *
 **************************************************/
 #ifdef _MSC_VER
 #pragma warning (disable: 4244)	/* truncation from 'const int' to 'char' */
 #pragma warning (disable: 4127)	/* conditional expression is constant */
 #pragma warning (disable: 4706)	/* assignment within conditional expression */
 #pragma warning (disable: 4761)	/* integral size mismatch in argument */
 #pragma warning (disable: 4101)	/* unreferenced local variable */
 #pragma warning (disable: 4131)	/* uses old-style declarator */
 #pragma warning (disable: 4057)	/* const char *' differs in indirection to
                                   slightly different base types from
                                   'unsigned char [x] */
 #pragma warning (disable: 4100)	/* unreferenced formal parameter */
 #pragma warning (disable: 4055)	/* type cast' : from data pointer 'void *' to
                                   function pointer
                                   'void *(__cdecl *)(char *,int ) */
 #pragma warning (disable: 4701)	/* local variable may be used without having
                                   been initialized */
 #pragma warning (disable: 4715)	/* ToHour' : not all control paths return a
                                   value */
 #endif
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-#
+
 timestamp='2001-09-04'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -30,28 +32,88 @@
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
+# don't specify an explicit build system type.
 #
 # Only a few systems have been added to this list; please add others
 # (but try to keep the structure clean).
 #
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
+me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 Output the configuration name of the system \`$me' is run on.
 Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
 Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.guess ($timestamp)
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 help="
 Try \`$me --help' for more information."
 # Parse command line
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit 0 ;;
    --version | -v )
       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
       echo "$usage"; exit 0 ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help" >&2
       exit 1 ;;
    * )
       break ;;
  esac
 done
 if test $# != 0; then
  echo "$me: too many arguments$help" >&2
  exit 1
 fi
 dummy=dummy-$$
 trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 # CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
 ,,)    echo "int dummy(){}" > $dummy.c ;
 	for c in cc gcc c89 ; do
 	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
 	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
 	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
-  if test x"$HOST_CC" != x; then
+	  CC_FOR_BUILD=no_compiler_found ;
    CC_FOR_BUILD="$HOST_CC"
  else
    if test x"$CC" != x; then
      CC_FOR_BUILD="$CC"
    else
      CC_FOR_BUILD=cc
 	fi
-  fi
+	;;
-fi
+ ,,*)   CC_FOR_BUILD=$CC ;;
-
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
 esac'
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
@@ -61,9 +123,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 dummy=dummy-$$
 trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -77,7 +136,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# object file format.
 	# Determine the machine/vendor (is the vendor relevant).
 	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-cbm ;;
+	    amiga) machine=m68k-unknown ;;
 	    arm32) machine=arm-unknown ;;
 	    atari*) machine=m68k-atari ;;
 	    sun3*) machine=m68k-sun ;;
@@ -87,7 +146,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
-	# The Operating System including object format.
+	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE}" in
 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -97,6 +160,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		else
 		    os=netbsdelf
 		fi
 		;;
 	    *)
 	        os=netbsd
 		;;
 	esac
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -137,6 +205,7 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
 	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `./$dummy` in
@@ -158,6 +227,9 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
 			2-1307)
 				UNAME_MACHINE="alphaev68"
 				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -173,7 +245,7 @@ EOF
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
+	echo m68k-unknown-sysv4
 	exit 0;;
    amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -205,7 +277,7 @@ EOF
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -261,6 +333,9 @@ EOF
    aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
    sparc*:NetBSD:*)
 	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
 	exit 0 ;;
    atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -318,6 +393,7 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -341,10 +417,13 @@ EOF
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm $dummy.c $dummy && exit 0
+	  && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
    Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -392,11 +471,20 @@ EOF
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
    ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
 	exit 0 ;;
    *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
@@ -408,7 +496,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -417,9 +505,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:4)
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -427,7 +515,7 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=4.${UNAME_RELEASE}
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -453,10 +541,29 @@ EOF
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
    9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
              case "${HPUX_REV}" in
                11.[0-9][0-9])
                  if [ -x /usr/bin/getconf ]; then
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                      532)                      # CPU_PA_RISC2_0
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
                        esac ;;
                    esac
                  fi ;;
              esac
              if [ "${HP_ARCH}" = "" ]; then
 	      eval $set_cc_for_build
              sed 's/^              //' << EOF >$dummy.c
              #define _HPUX_SOURCE
@@ -491,12 +598,18 @@ EOF
              }
 EOF
 	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 	    rm -f $dummy.c $dummy
 	fi ;;
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
    ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
    3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -522,7 +635,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -532,7 +645,7 @@ EOF
    9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -541,7 +654,7 @@ EOF
    hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -576,37 +689,39 @@ EOF
 	echo xmp-cray-unicos
        exit 0 ;;
    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3E:*:*:*)
+    CRAY*T3D:*:*:*)
 	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
        exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
    F301:UNIX_System_V:*:*)
       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
        exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    sparc*:BSD/OS:*:*)
@@ -627,6 +742,9 @@ EOF
    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -645,186 +763,95 @@ EOF
    *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    *:Linux:*:*)
+    i*86:Minix:*:*)
-
+	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
    arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    mips:Linux:*:*)
 	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
 	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
 	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
 	esac
 	;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit 0 ;;
    ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
 	exit 0 ;;
    alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
 	  PCA57) UNAME_MACHINE=alphapca56 ;;
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit 0 ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
 	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit 0 ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
 	exit 0 ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
    sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
    x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit 0 ;;
    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_help_string=`cd /; ld --help 2>&1`
+	ld_supported_targets=`cd /; ld --help 2>&1 \
-	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported targets:/!d
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_emulations" in
+        case "$ld_supported_targets" in
-	  *ia64)
+	  elf32-i386)
-		echo "${UNAME_MACHINE}-unknown-linux"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		exit 0
 		;;
-	  i?86linux)
+	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
+		exit 0 ;;		
-		;;
+	  coff-i386)
 	  elf_i?86)
 		echo "${UNAME_MACHINE}-pc-linux"
 		exit 0
 		;;
 	  i?86coff)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
+		exit 0 ;;
-		;;
+	  "")
-	  sparclinux)
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		# one that does not give us useful --help.
-		exit 0
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		;;
+		exit 0 ;;
 	  armlinux)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
 		exit 0
 		;;
 	  elf32arm*)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
 		exit 0
 		;;
 	  armelf_linux*)
 		echo "${UNAME_MACHINE}-unknown-linux-gnu"
 		exit 0
 		;;
 	  m68klinux)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
 		exit 0
 		;;
 	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
 		cat >$dummy.c <<EOF
 #include <features.h>
 #if defined(__GLIBC__)
 extern char __libc_version[];
 extern char __libc_release[];
 #endif
 main(argc, argv)
     int argc;
     char *argv[];
 {
 #if defined(__GLIBC__)
  printf("%s %s\n", __libc_version, __libc_release);
 #else
  printf("unkown\n");
 #endif
  return 0;
 }
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
 			./$dummy | grep 1\.99 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
 		fi
 		rm -f $dummy.c $dummy
 		echo powerpc-unknown-linux-gnu${LIBC}
 		exit 0
 		;;
 	esac
 	if test "${UNAME_MACHINE}" = "alpha" ; then
 		cat <<EOF >$dummy.s
 			.data
 		\$Lformat:
 			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
 			.text
 			.globl main
 			.align 4
 			.ent main
 		main:
 			.frame \$30,16,\$26,0
 			ldgp \$29,0(\$27)
 			.prologue 1
 			.long 0x47e03d80 # implver \$0
 			lda \$2,-1
 			.long 0x47e20c21 # amask \$2,\$1
 			lda \$16,\$Lformat
 			mov \$0,\$17
 			not \$1,\$18
 			jsr \$26,printf
 			ldgp \$29,0(\$26)
 			mov 0,\$16
 			jsr \$26,exit
 			.end main
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
 			case `./$dummy` in
 			0-0)
 				UNAME_MACHINE="alpha"
 				;;
 			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
 			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
 			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
 			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
 			esac
 			objdump --private-headers $dummy | \
 			  grep ld.so.1 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
 		fi
 		rm -f $dummy.s $dummy
 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
 #endif
 #ifdef __MIPSEB__
  printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
 #ifdef __MIPSEL__
  printf ("%sel-unknown-linux-gnu\n", argv[1]);
 #endif
  return 0;
 }
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
 	elif test "${UNAME_MACHINE}" = "s390"; then
 	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
 	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
 	  # If ld does not provide *any* "supported emulations:"
 	  # that means it is gnuoldld.
 	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
 	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 	  case "${UNAME_MACHINE}" in
 	  i?86)
 	    VENDOR=pc;
 	    ;;
 	  *)
 	    VENDOR=unknown;
 	    ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
@@ -836,28 +863,30 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+    printf ("%s-pc-linux-gnu\n", argv[1]);
 #  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 #  endif
 # else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 # endif
 #else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
 #endif
  return 0;
 }
 EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
-	fi ;;
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+	;;
-# are messed up and put the nodename in both sysname and nodename.
+    i*86:DYNIX/ptx:4*:*)
-    i?86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
        # Unixware is an offshoot of SVR4, but it has its own version
        # number series starting with 2...
        # I am not positive that other SVR4 systems won't match this,
@@ -865,7 +894,7 @@ EOF
        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -873,16 +902,15 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i?86:*:5:7*)
+    i*86:*:5:[78]*)
-        # Fixed at (any) Pentium or better
+	case `/bin/uname -X | grep "^Machine"` in
-        UNAME_MACHINE=i586
+	    *486*)	     UNAME_MACHINE=i486 ;;
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	else
+	esac
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	fi
 	exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -900,7 +928,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
    pc:*:*:*)
@@ -928,7 +956,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -939,21 +967,24 @@ EOF
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
@@ -971,7 +1002,7 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
        echo i586-unisys-sysv4
        exit 0 ;;
@@ -984,10 +1015,14 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
    *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
 	exit 0 ;;
    mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    news*:NEWS-OS:*:6*)
+    news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
 	exit 0 ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1030,20 +1065,64 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-W:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit 0 ;;
    BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
 	exit 0 ;;
    DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 	exit 0 ;;
    *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
 	if test "$cputype" = "386"; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
    i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit 0 ;;
    *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
    *:TENEX:*:*)
 	echo pdp10-unknown-tenex
 	exit 0 ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
 	exit 0 ;;
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
 	exit 0 ;;
    *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
 	exit 0 ;;
    *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
    i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
 	exit 0 ;;
    i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
 esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1131,7 +1210,20 @@ main ()
 #if defined (vax)
 # if !defined (ultrix)
 #  include <sys/param.h>
 #  if defined (BSD)
 #   if BSD == 43
      printf ("vax-dec-bsd4.3\n"); exit (0);
 #   else
 #    if BSD == 199006
      printf ("vax-dec-bsd4.3reno\n"); exit (0);
 #    else
      printf ("vax-dec-bsd\n"); exit (0);
 #    endif
 #   endif
 #  else
    printf ("vax-dec-bsd\n"); exit (0);
 #  endif
 # else
    printf ("vax-dec-ultrix\n"); exit (0);
 # endif
@@ -1145,7 +1237,7 @@ main ()
 }
 EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 # Apollos put the system type in the environment.
@@ -1178,6 +1270,48 @@ then
    esac
 fi
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
 $0: unable to guess system type
 This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
    ftp://ftp.gnu.org/pub/gnu/config/
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
 pertinent to <config-patches@gnu.org> in order to provide the needed
 information to handle your system.
 config.guess timestamp = $timestamp
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
 uname -s = `(uname -s) 2>/dev/null || echo unknown`
 uname -v = `(uname -v) 2>/dev/null || echo unknown`
 /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
 /bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
 hostinfo               = `(hostinfo) 2>/dev/null`
 /bin/universe          = `(/bin/universe) 2>/dev/null`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
 /bin/arch              = `(/bin/arch) 2>/dev/null`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 UNAME_MACHINE = ${UNAME_MACHINE}
 UNAME_RELEASE = ${UNAME_RELEASE}
 UNAME_SYSTEM  = ${UNAME_SYSTEM}
 UNAME_VERSION = ${UNAME_VERSION}
 EOF
 exit 1
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
+# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-#
+
 timestamp='2001-09-07'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -27,7 +29,6 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Written by Per Bothner <bothner@cygnus.com>.
 # Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -50,30 +51,73 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
-if [ x$1 = x ]
+me=`echo "$0" | sed -e 's,.*/,,'`
 then
 	echo Configuration name missing. 1>&2
 	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
 	echo "or     $0 ALIAS" 1>&2
 	echo where ALIAS is a recognized configuration type. 1>&2
 	exit 1
 fi
-# First pass through any local machine types.
+usage="\
 Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS
 Canonicalize a configuration name.
 Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
 Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 help="
 Try \`$me --help' for more information."
 # Parse command line
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit 0 ;;
    --version | -v )
       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
       echo "$usage"; exit 0 ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help"
       exit 1 ;;
    *local*)
       # First pass through any local machine types.
       echo $1
-		exit 0
+       exit 0;;
-		;;
+
    * )
-	;;
+       break ;;
  esac
 done
 case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
 esac
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -99,7 +143,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -113,6 +157,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
 	-chorusos*)
 		os=-chorusos
 		basic_machine=$1
 		;;
 	-chorusrdb)
 		os=-chorusrdb
 		basic_machine=$1
 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -171,30 +223,50 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	1750a | 580 \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+	| a29k \
-		| 580 | i960 | h8300 \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+	| c4x | clipper \
-		| hppa64 \
+	| d10v | d30v | dsp16xx \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+	| fr30 \
-		| alphaev6[78] \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+	| i370 | i860 | i960 | ia64 \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+	| m32r | m68000 | m68k | m88k | mcore \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-		| mips64vr5000 | miprs64vr5000el | mcore \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-		| thumb | d10v | fr30 | avr)
+	| mipsisa32 \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
 	| openrisc \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| s390 | s390x \
 	| sh | sh[34] | sh[34]eb | shbe | shle \
 	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
 	| stormy16 | strongarm \
 	| tahoe | thumb | tic80 | tron \
 	| v850 \
 	| we32k \
 	| x86 | xscale \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -203,28 +275,43 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
+	580-* \
-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	| a29k-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	| alphapca5[67]-* | arc-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
-	      | xmp-* | ymp-* \
+	| bs2000-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	| clipper-* | cray2-* | cydra-* \
-	      | hppa2.0n-* | hppa64-* \
+	| d10v-* | d30v-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	| elxsi-* \
-	      | alphaev6[78]-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	| h8300-* | h8500-* \
-	      | clipper-* | orion-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	| m32r-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	| m88110-* | m88k-* | mcore-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	      | bs2000-*)
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
 	| s390-* | s390x-* \
 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
 	| ymp-* \
 	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -261,14 +348,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@@ -315,13 +402,16 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
+	[cjt]90)
-		basic_machine=c90-cray
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -369,6 +459,10 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
 	go32)
 		basic_machine=i386-pc
 		os=-go32
 		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -444,19 +538,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -468,14 +562,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
 	i386-go32 | go32)
 		basic_machine=i386-unknown
 		os=-go32
 		;;
 	i386-mingw32 | mingw32)
 		basic_machine=i386-unknown
 		os=-mingw32
 		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -501,6 +587,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -531,7 +621,7 @@ case $basic_machine in
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@@ -595,6 +685,10 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
 	nonstopux)
 		basic_machine=mips-compaq
 		os=-nonstopux
 		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -630,28 +724,28 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -663,9 +757,23 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
 	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
 	pw32)
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -757,6 +865,10 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -809,6 +921,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
 	windows32)
 		basic_machine=i386-pc
 		os=-windows32-msvcrt
 		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -852,13 +968,20 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
 	pdp10)
 		# there are many clones, so DEC is not a safe bet
 		basic_machine=pdp10-unknown
 		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc | sparcv9)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -880,6 +1003,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -936,15 +1062,18 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -1000,7 +1129,7 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk)
+	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
@@ -1037,7 +1166,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@@ -1071,6 +1200,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
 	pdp10-*)
 		os=-tops20
 		;;
        pdp11-*)
 		os=-none
 		;;
@@ -1179,7 +1311,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1257,12 +1389,23 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
 			-vos*)
 				vendor=stratus
 				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 echo $basic_machine$os
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- a/configure.in
+++ b/configure.in
@@ -1,27 +1,56 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lib/urldata.h)
+
 dnl Ensure that this file is processed with autoconf 2.50 or newer
 dnl Don't even think about removing this check!
 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)
 dnl figure out the libcurl version
 VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
 AM_INIT_AUTOMAKE(curl,$VERSION)
-AM_PROG_LIBTOOL
+
 dnl
 dnl we extract the numerical version for curl-config only
 VERSIONNUM=`sed -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curl.h`
 AC_SUBST(VERSIONNUM)
 dnl Solaris pkgadd support definitions
 PKGADD_PKG="HAXXcurl"
 PKGADD_NAME="cURL - a client that groks URLs"
 PKGADD_VENDOR="curl.haxx.se"
 AC_SUBST(PKGADD_PKG)
 AC_SUBST(PKGADD_NAME)
 AC_SUBST(PKGADD_VENDOR)
 dnl
 dnl Detect the canonical host and target build environment
 dnl
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-dnl Checks for programs.
+AC_CANONICAL_HOST
-AC_PROG_CC
+dnl Get system canonical name
 AC_DEFINE_UNQUOTED(OS, "${host}")
 dnl Check for AIX weirdos
 AC_AIX
 dnl Checks for programs.
 AC_PROG_CC
 dnl check for how to do large files
 AC_SYS_LARGEFILE
 dnl check for cygwin stuff
 AC_LIBTOOL_WIN32_DLL
 dnl libtool setup
 AM_PROG_LIBTOOL
 dnl The install stuff has already been taken care of by the automake stuff
 dnl AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -40,274 +69,12 @@ AC_ARG_ENABLE(debug,
  *)   AC_MSG_RESULT(yes)
    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
-    CFLAGS="-Wall -pedantic -g" 
+    CFLAGS="-W -Wall -Wwrite-strings -pedantic -g" 
       ;;
  esac ],
       AC_MSG_RESULT(no)
 )
 dnl
 dnl check for working getaddrinfo()
 dnl
 AC_DEFUN(CURL_CHECK_WORKING_GETADDRINFO,[
  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
  AC_TRY_RUN( [
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 void main(void) {
    struct addrinfo hints, *ai;
    int error;
    memset(&hints, 0, sizeof(hints));
    hints.ai_family = AF_UNSPEC;
    hints.ai_socktype = SOCK_STREAM;
    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
    if (error) {
        exit(1);
    }
    else {
        exit(0);
    }
 }
 ],[
  ac_cv_working_getaddrinfo="yes"
 ],[
  ac_cv_working_getaddrinfo="no"
 ],[
  ac_cv_working_getaddrinfo="yes"
 ])])
 if test "$ac_cv_working_getaddrinfo" = "yes"; then
  AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works])
  AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
  IPV6_ENABLED=1
  AC_SUBST(IPV6_ENABLED)
 fi
 ])
 AC_DEFUN(CURL_CHECK_LOCALTIME_R,
 [
  dnl check for a few thread-safe functions
  AC_CHECK_FUNCS(localtime_r,[
    AC_MSG_CHECKING(whether localtime_r is declared)
    AC_EGREP_CPP(localtime_r,[
 #include <time.h>],[
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(whether localtime_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(localtime_r,[
 #define _REENTRANT
 #include <time.h>],[
 	AC_DEFINE(NEED_REENTRANT)
 	AC_MSG_RESULT(yes)],
 	AC_MSG_RESULT(no))])])
 ])
 AC_DEFUN(CURL_CHECK_INET_NTOA_R,
 [
  dnl determine if function definition for inet_ntoa_r exists.
  AC_CHECK_FUNCS(inet_ntoa_r,[
    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
    AC_EGREP_CPP(inet_ntoa_r,[
 #include <arpa/inet.h>],[
      AC_DEFINE(HAVE_INET_NTOA_R_DECL)
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(inet_ntoa_r,[
 #define _REENTRANT
 #include <arpa/inet.h>],[
 	AC_DEFINE(HAVE_INET_NTOA_R_DECL)
 	AC_DEFINE(NEED_REENTRANT)
 	AC_MSG_RESULT(yes)],
 	AC_MSG_RESULT(no))])])
 ])
 AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
 [
  dnl check for number of arguments to gethostbyaddr_r. it might take
  dnl either 5, 7, or 8 arguments.
  AC_CHECK_FUNCS(gethostbyaddr_r,[
    AC_MSG_CHECKING(if gethostbyaddr_r takes 5 arguments)
    AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 struct hostent_data hdata;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
      ac_cv_gethostbyaddr_args=5],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(if gethostbyaddr_r with -D_REENTRANT takes 5 arguments)
      AC_TRY_COMPILE([
 #define _REENTRANT
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 struct hostent_data hdata;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
 	AC_DEFINE(NEED_REENTRANT)
 	ac_cv_gethostbyaddr_args=5],[
 	AC_MSG_RESULT(no)
 	AC_MSG_CHECKING(if gethostbyaddr_r takes 7 arguments)
 	AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 char buffer[8192];
 int h_errnop;
 struct hostent * hp;
 hp = gethostbyaddr_r(address, length, type, &h,
                     buffer, 8192, &h_errnop);],[
 	  AC_MSG_RESULT(yes)
 	  AC_DEFINE(HAVE_GETHOSTBYADDR_R_7)
 	  ac_cv_gethostbyaddr_args=7],[
 	  AC_MSG_RESULT(no)
 	  AC_MSG_CHECKING(if gethostbyaddr_r takes 8 arguments)
 	  AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 char buffer[8192];
 int h_errnop;
 struct hostent * hp;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h,
                     buffer, 8192, &hp, &h_errnop);],[
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8)
 	    ac_cv_gethostbyaddr_args=8],[
 	    AC_MSG_RESULT(no)
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
 ])
 AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
 [
  dnl check for number of arguments to gethostbyname_r. it might take
  dnl either 3, 5, or 6 arguments.
  AC_CHECK_FUNCS(gethostbyname_r,[
    AC_MSG_CHECKING(if gethostbyname_r takes 3 arguments)
    AC_TRY_RUN([
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent h;
 struct hostent_data hdata;
 char *name = "localhost";
 int rc;
 memset(&h, 0, sizeof(struct hostent));
 memset(&hdata, 0, sizeof(struct hostent_data));
 rc = gethostbyname_r(name, &h, &hdata);
 exit (rc != 0 ? 1 : 0); }],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
      ac_cv_gethostbyname_args=3],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(if gethostbyname_r with -D_REENTRANT takes 3 arguments)
      AC_TRY_RUN([
 #define _REENTRANT
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent h;
 struct hostent_data hdata;
 char *name = "localhost";
 int rc;
 memset(&h, 0, sizeof(struct hostent));
 memset(&hdata, 0, sizeof(struct hostent_data));
 rc = gethostbyname_r(name, &h, &hdata);
 exit (rc != 0 ? 1 : 0); }],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
 	AC_DEFINE(NEED_REENTRANT)
 	ac_cv_gethostbyname_args=3],[
 	AC_MSG_RESULT(no)
 	AC_MSG_CHECKING(if gethostbyname_r takes 5 arguments)
 	AC_TRY_RUN([
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent *hp;
 struct hostent h;
 char *name = "localhost";
 char buffer[8192];
 int h_errno;
 hp = gethostbyname_r(name, &h, buffer, 8192, &h_errno);
 exit (hp == NULL ? 1 : 0); }],[
 	  AC_MSG_RESULT(yes)
 	  AC_DEFINE(HAVE_GETHOSTBYNAME_R_5)
          ac_cv_gethostbyname_args=5],[
 	  AC_MSG_RESULT(no)
 	  AC_MSG_CHECKING(if gethostbyname_r takes 6 arguments)
 	  AC_TRY_RUN([
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent h;
 struct hostent *hp;
 char *name = "localhost";
 char buf[8192];
 int rc;
 int h_errno;
 rc = gethostbyname_r(name, &h, buf, 8192, &hp, &h_errno);
 exit (rc != 0 ? 1 : 0); }],[
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6)
            ac_cv_gethostbyname_args=6],[
 	    AC_MSG_RESULT(no)
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"],
 	    [ac_cv_gethostbyname_args=0])],
 	  [ac_cv_gethostbyname_args=0])],
 	[ac_cv_gethostbyname_args=0])],
      [ac_cv_gethostbyname_args=0])])
 if test "$ac_cv_func_gethostbyname_r" = "yes"; then
  if test "$ac_cv_gethostbyname_args" = "0"; then
    dnl there's a gethostbyname_r() function, but we don't know how
    dnl many arguments it wants!
    AC_MSG_ERROR([couldn't figure out how to use gethostbyname_r()])
  fi
 fi
 ])
 dnl **********************************************************************
 dnl Checks for IPv6
 dnl **********************************************************************
@@ -400,7 +167,25 @@ dnl ucb lib?
 AC_CHECK_FUNC(gethostname, , AC_CHECK_LIB(ucb, gethostname))
 dnl dl lib?
-AC_CHECK_FUNC(dlopen, , AC_CHECK_LIB(dl, dlopen))
+AC_CHECK_FUNC(dlclose, , AC_CHECK_LIB(dl, dlopen))
 dnl **********************************************************************
 dnl Check how non-blocking sockets are set
 dnl **********************************************************************
 AC_ARG_ENABLE(nonblocking,
 [  --enable-nonblocking  Makes the script detect how to do it
  --disable-nonblocking Makes the script disable non-blocking sockets],
 [
  if test "$enableval" = "no" ; then
    AC_MSG_WARN([non-blocking sockets disabled])
    AC_DEFINE(HAVE_DISABLED_NONBLOCKING)
  else
    CURL_CHECK_NONBLOCKING_SOCKET
  fi
 ],
 [
  CURL_CHECK_NONBLOCKING_SOCKET
 ])
 dnl **********************************************************************
 dnl Check for the random seed preferences 
@@ -522,6 +307,7 @@ else
  AC_MSG_RESULT(no)
 fi
 dnl **********************************************************************
 dnl Check for the presence of SSL libraries and headers
 dnl **********************************************************************
@@ -539,26 +325,45 @@ then
  AC_MSG_WARN(SSL/https support disabled)  
 else
-  dnl Check for & handle argument to --with-ssl.
+  dnl Check for and handle argument to --with-ssl.
-  AC_MSG_CHECKING(where to look for SSL)
+  dnl save the pre-ssl check flags for a while
-  if test X"$OPT_SSL" = Xoff
+  CLEANLDFLAGS="$LDFLAGS"
-  then
+  CLEANCPPFLAGS="$CPPFLAGS"
  	AC_MSG_RESULT([defaults (or given in environment)])
  else
 	test X"$OPT_SSL" = Xyes && OPT_SSL=/usr/local/ssl
        dnl	LIBS="$LIBS -L$OPT_SSL/lib"
        LDFLAGS="$LDFLAGS -L$OPT_SSL/lib"
 	CPPFLAGS="$CPPFLAGS -I$OPT_SSL/include/openssl -I$OPT_SSL/include"
 	AC_MSG_RESULT([$OPT_SSL])
  fi
-  dnl check for crypto libs (part of SSLeay)
+  case "$OPT_SSL" in
-  AC_CHECK_LIB(crypto, CRYPTO_lock)
+  yes)
    EXTRA_SSL=/usr/local/ssl ;;
  off)
    EXTRA_SSL= ;;
  *)
    dnl check the given spot right away!
    EXTRA_SSL=$OPT_SSL
    LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
    CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
    ;;
  esac
-  if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
+  AC_CHECK_LIB(crypto, CRYPTO_lock,[
     HAVECRYPTO="yes"
     ],[
     OLDLDFLAGS="$LDFLAGS"
     OLDCPPFLAGS="$CPPFLAGS"
     LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib"
     CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
     AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
       HAVECRYPTO="yes" ], [
       LDFLAGS="$OLDLDFLAGS"
       CPPFLAGS="$OLDCPPFLAGS"
       ])
    ])
  if test "$HAVECRYPTO" = "yes"; then
    dnl This is only reasonable to do if crypto actually is there: check for
    dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
    AC_CHECK_LIB(crypto, CRYPTO_add_lock)
    AC_CHECK_LIB(ssl, SSL_connect)
    if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
@@ -577,36 +382,19 @@ else
    fi
    dnl Check for SSLeay headers
    AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \
-                     openssl/pem.h openssl/ssl.h openssl/err.h)
+                     openssl/pem.h openssl/ssl.h openssl/err.h,
      OPENSSL_ENABLED=1)
    if test $ac_cv_header_openssl_x509_h = no; then
-      AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h)
+      AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h,
        OPENSSL_ENABLED=1)
    fi
-    dnl
+    dnl Check for the OpenSSL engine header, it is kind of "separated"
-    dnl If all heades are present, we have enabled SSL!
+    dnl from the main SSL check
-    if test "$ac_cv_header_openssl_x509_h" = "yes" &&
+    AC_CHECK_HEADERS(openssl/engine.h)
       test "$ac_cv_header_openssl_rsa_h" = "yes" &&
       test "$ac_cv_header_openssl_crypto_h" = "yes" &&
       test "$ac_cv_header_openssl_pem_h" = "yes" &&
       test "$ac_cv_header_openssl_ssl_h" = "yes" &&
       test "$ac_cv_header_openssl_err_h" = "yes"; then
      OPENSSL_ENABLED="1";
    fi
    dnl
    dnl Check the alternative headers too
    if test "$ac_cv_header_x509_h" = "yes" &&
       test "$ac_cv_header_rsa_h" = "yes" &&
       test "$ac_cv_header_crypto_h" = "yes" &&
       test "$ac_cv_header_pem_h" = "yes" &&
       test "$ac_cv_header_ssl_h" = "yes" &&
       test "$ac_cv_header_err_h" = "yes"; then
      OPENSSL_ENABLED="1";
    fi
    AC_SUBST(OPENSSL_ENABLED)
@@ -685,6 +473,8 @@ else
  dnl is there a localtime_r()
  CURL_CHECK_LOCALTIME_R()
  AC_CHECK_FUNCS( gmtime_r )
 fi
 dnl **********************************************************************
@@ -708,7 +498,6 @@ AC_CHECK_HEADERS( \
        sys/stat.h \
        sys/types.h \
        sys/time.h \
        getopt.h \
        sys/param.h \
        termios.h \
        termio.h \
@@ -719,7 +508,9 @@ AC_CHECK_HEADERS( \
        winsock.h \
        time.h \
        io.h \
-        pwd.h
+        pwd.h \
        utime.h \
        sys/utime.h
 )
 dnl Check for libz header
@@ -740,31 +531,8 @@ AC_CHECK_SIZEOF(long long, 4)
 # check for ssize_t
 AC_CHECK_TYPE(ssize_t, int)
-dnl
+TYPE_SOCKLEN_T
-dnl We can't just AC_CHECK_TYPE() for socklen_t since it doesn't appear
+TYPE_IN_ADDR_T
 dnl in the standard headers. We egrep for it in the socket headers and
 dnl if it is used there we assume we have the type defined, otherwise
 dnl we search for it with AC_CHECK_TYPE() the "normal" way
 dnl
 if test "$ac_cv_header_sys_socket_h" = "yes"; then
   AC_MSG_CHECKING(for socklen_t in sys/socket.h)
   AC_EGREP_HEADER(socklen_t,
    sys/socket.h,
    socklen_t=yes
    AC_MSG_RESULT(yes),
    AC_MSG_RESULT(no))
 fi
 if test "$socklen_t" != "yes"; then
  # check for socklen_t the standard way if it wasn't found before
  AC_CHECK_TYPE(socklen_t, int)
 fi
 dnl Get system canonical name
 AC_CANONICAL_HOST
 AC_DEFINE_UNQUOTED(OS, "${host}")
 dnl Checks for library functions.
 dnl AC_PROG_GCC_TRADITIONAL
@@ -774,6 +542,7 @@ AC_CHECK_FUNCS( socket \
                select \
                strdup \
                strstr \
                strtok_r \
                strftime \
                uname \
                strcasecmp \
@@ -781,7 +550,6 @@ AC_CHECK_FUNCS( socket \
                strcmpi \
                gethostname \
                gethostbyaddr \
                getservbyname \
                gettimeofday \
                inet_addr \
                inet_ntoa \
@@ -795,7 +563,9 @@ AC_CHECK_FUNCS( socket \
                getpass_r \
                strlcat \
                getpwuid \
-                geteuid
+                geteuid \
                dlopen \
                utime
 )
 dnl removed 'getpass' check on October 26, 2000
@@ -821,25 +591,25 @@ dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib,
 dnl   $PATH:/usr/bin/:/usr/local/bin )
 dnl AC_SUBST(RANLIB)
-AC_OUTPUT( Makefile \
+AC_CONFIG_FILES([Makefile \
 	   docs/Makefile \
           docs/examples/Makefile \
 	   include/Makefile \
 	   include/curl/Makefile \
 	   src/Makefile \
 	   multi/Makefile \
           lib/Makefile \
           tests/Makefile \
           tests/data/Makefile \
 	   packages/Makefile \
 	   packages/Win32/Makefile \
 	   packages/Win32/cygwin/Makefile \
 	   packages/Linux/Makefile \
 	   packages/Linux/RPM/Makefile \
 	   packages/Linux/RPM/curl.spec \
 	   packages/Linux/RPM/curl-ssl.spec \
-           perl/Makefile \
+           packages/Solaris/Makefile \
           perl/Curl_easy/Makefile \
           php/Makefile \
           php/examples/Makefile \
           curl-config
-)
+])
 AC_OUTPUT
--- a/curl-config.in
+++ b/curl-config.in
@@ -22,6 +22,7 @@ Available values for OPTION include:
  --libs      library linking information
  --prefix    curl install prefix
  --version   output version information
  --vernum    output the version information as a number (hexadecimal)
 EOF
    exit $1
@@ -62,19 +63,25 @@ while test $# -gt 0; do
 	exit 0
 	;;
    --vernum)
 	echo @VERSIONNUM@
 	exit 0
 	;;
    --help)
 	usage 0
 	;;
    --cflags)
-       	echo @CPPFLAGS@
+       	echo -I@includedir@
       	;;
    --libs)
-       	echo @LDFLAGS@ @LIBS@
+       	echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@
       	;;
    *)
        echo "unknown option: $1"
 	usage
 	exit 1
 	;;
--- a/curl-mode.el
+++ b/curl-mode.el
@@ -0,0 +1,21 @@
 ;;;; Emacs Lisp help for writing curl code. ;;;;
 ;;; In C files, put something like this to load this file automatically:
 ;;
 ;;   /* -----------------------------------------------------------------
 ;;    * local variables:
 ;;    * eval: (load-file "../curl-mode.el")
 ;;    * end:
 ;;    */
 ;;
 ;; (note: make sure to get the path right in the argument to load-file).
 ;;; The curl hacker's C conventions
 ;;; we use intent-level 2
 (setq c-basic-offset 2)
 ;;; never ever use tabs to indent!
 (setq indent-tabs-mode nil)
 ;;; I like this, stolen from Subversion! ;-)
 (setq angry-mob-with-torches-and-pitchforks t)
--- a/docs/BUGS
+++ b/docs/BUGS
@@ -1,3 +1,4 @@
 $Id$
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -35,23 +36,24 @@ BUGS
  The address and how to subscribe to the mailing list is detailed in the
  MANUAL file.
-  HOW TO GET A STACK TRACE with a common unix debugger
+  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.
+  don't 'strip' the final executable. Try to avoid optimizing the code as
  well, remove -O, -O2 etc from the compiler options.
-  Run the program until it bangs.
+  Run the program until it dumps core.
  Run your debugger on the core file, like '<debugger> curl core'. <debugger>
  should be replaced with the name of your debugger, in most cases that will
  be 'gdb', but 'dbx' and others also occur.
  When the debugger has finished loading the core file and presents you a
-  prompt, you can give the compiler instructions. Enter 'where' (without the
+  prompt, enter 'where' (without the quotes) and press return.
  quotes) and press return.
  The list that is presented is the stack trace. If everything worked, it is
  supposed to contain the chain of functions that were called when curl
-  crashed.
+  crashed. Include the stack trace with your detailed bug report. It'll help a
  lot.
--- a/docs/CONTRIBUTE
+++ b/docs/CONTRIBUTE
@@ -10,6 +10,12 @@ To Think About When Contributing Source Code
 in mind when you decide to write a contribution to the project. This concerns
 new features as well as corrections to existing flaws or bugs.
 Join the Community
 Skip over to http://curl.haxx.se/mail/ and join the appropriate mailing
 list(s).  Read up on details before you post questions. Read this file before
 you start sending patches!
 The License Issue
 When contributing with code, you agree to put your changes and new code under
@@ -21,6 +27,12 @@ The License Issue
 GPL (as we don't want the GPL virus to attack users of libcurl) but they must
 use "GPL compatible" licenses.
 What To Read
 Source code, the man pages, the INTERALS document, the TODO, the most recent
 CHANGES. Just lurking on the libcurl mailing list is gonna give you a lot of
 insights on what's going on right now.
 Naming
 Try using a non-confusing naming scheme for your new functions and variable
@@ -87,7 +99,9 @@ Write Access to CVS Repository
 If you are a frequent contributor, or have another good reason, you can of
 course get write access to the CVS repository and then you'll be able to
 check-in all your changes straight into the CVS tree instead of sending all
- changes by mail as patches. Just ask if this is what you'd want.
+ changes by mail as patches. Just ask if this is what you'd want. You will be
 required to have posted a few quality patches first, before you can be
 granted write access.
 Test Cases
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: April 22, 2001 (http://curl.haxx.se/docs/faq.shtml)
+Updated: December 21, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -14,6 +14,7 @@ FAQ
  1.4 When will you make curl do XXXX ?
  1.5 Who makes cURL?
  1.6 What do you get for making cURL?
  1.7 What about CURL from curl.com?
 2. Install Related Problems
  2.1 configure doesn't find OpenSSL even when it is installed
@@ -32,8 +33,10 @@ 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?
 4. Running Problems
  4.1 Problems connecting to SSL servers.
@@ -46,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!
@@ -79,7 +83,7 @@ FAQ
  fact it can also be pronounced 'see URL' also helped.
  Curl supports a range of common Internet protocols, currently including
-  HTTP, HTTPS, FTP, GOPHER, LDAP, DICT, TELNET and FILE.
+  HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and FILE.
  We spell it cURL or just curl. We pronounce it with an initial k sound:
  [kurl].
@@ -94,10 +98,9 @@ FAQ
  1.3 What is cURL not?
-  Curl is *not*, I repeat, *not* a wget clone even though that is a very
+  Curl is *not* a wget clone even though that is a very common misconception.
-  common misconception. Never, during curl's development, have I intended curl
+  Never, during curl's development, have we intended curl to replace wget or
-  to replace wget or compete on its market. Curl is targeted at single-shot
+  compete on its market. Curl is targeted at single-shot file transfers.
  file transfers.
  Curl is not a web site mirroring program. If you wanna use curl to mirror
  something: fine, go ahead and write a script that wraps around curl to make
@@ -132,7 +135,7 @@ FAQ
  * We focus on protocol related issues and improvements. If you wanna do more
    magic with the supported protocols than curl currently does, chances are
-    big I will agree. If you wanna add more protocols, I may very well
+    big we will agree. If you wanna add more protocols, we may very well
    agree.
  * If you want someone else to make all the work while you wait for us to
@@ -152,9 +155,9 @@ FAQ
  have them inserted in the main sources (of course on the condition that
  developers agree on that the fixes are good).
-  The list of contributors in the bottom of the man page is only a small part
+  The list of contributors in the docs/THANKS file is only a small part of all
-  of all the people that every day provide us with bug reports, suggestions,
+  the people that every day provide us with bug reports, suggestions, ideas
-  ideas and source code.
+  and source code.
  curl is developed by a community, with Daniel at the wheel.
@@ -169,6 +172,27 @@ FAQ
  sourceforge.net hosts several project tools we take advantage from like the
  bug tracker, mailing lists and more.
  If you want to support our project with a donation or similar, one way of
  doing that would be to buy "gift certificates" at useful online shopping
  sites, such as amazon.com or thinkgeek.com. Another way would be to sponsor
  us through a banner-program or by simply helping us coding, documenting,
  testing etc.
  1.7 What about CURL from curl.com?
  During the summer 2001, curl.com has been busy advertising their client-side
  programming language for the web, named CURL.
  We are in no way associated with curl.com or their CURL programming
  language. 
  Our project name curl has been in effective use since 1998. We were not the
  first computer related project to use the name "curl" and do not claim any
  first-hand rights to the name.
  We recognize that we will be living in parallel with curl.com and wish them
  every success.
 2. Install Related Problems
  2.1. configure doesn't find OpenSSL even when it is installed
@@ -311,31 +335,25 @@ 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
-  may be able you write your own wrapper for a not-yet support language!
+  may be able you write your own wrapper for a not-yet supported language!
  Find out more about which languages that support curl directly, and how to
  install and use them, in the libcurl section of the curl web site:
        http://curl.haxx.se/libcurl/
-  PHP4 has the ability to use libcurl as an internal module if built with that
+  In December 2001, there are interfaces available for the following
-  option enabled. You then get a set of extra functions that can be used
+  languages: C/C++, Cocoa, Dylan, Java, Perl, PHP, Python, Rexx, Ruby, Scheme
-  within your PHP programs. You find all details about those functions in the
+  and Tcl. By the time you read this, additional ones may have appeared!
  curl section in the PHP manual, see the online version at:
        http://www.php.net/manual/ref.curl.php
  PHP also offers the option to run a command line, and then you can of course
  invoke the curl tool using a command line. This is the way to use curl if
  you're using PHP3 or PHP4 built without curl module support.
  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
@@ -347,6 +365,25 @@ FAQ
  Using libcurl or PHP's curl modules is just as fine and you'd just use the
  proper library options to do the same.
  3.11 How do I POST with a different Content-Type?
  You can always replace the internally generated headers with -H/--header.
  To make a simple HTTP POST with text/xml as content-type, do something like:
        curl -d "datatopost" -H "Content-Type: text/xml" [URL]
  3.12 Why do FTP specific features over HTTP proxy fail?
  Because when you use a HTTP proxy, the protocol spoken on the network will
  be HTTP, even if you specify a FTP URL. This effectively means that you
  normally can't use FTP specific features such as ftp upload and ftp quote
  etc.
  There is one exception to this rule, and that is if you can "tunnel through"
  the given HTTP proxy. Proxy tunneling is enabled with a special option (-p)
  and is generally not available as proxy admins usually disable tunneling to
  other ports than 443 (which is used for HTTPS access through proxies).
 4. Running Problems
  4.1. Problems connecting to SSL servers.
@@ -436,12 +473,23 @@ 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
-  that curl has existed due to a timeout. There was no nice way for curl to
+  that curl has exited due to a crash. This is a serious error, and we
-  abort from such a condition and that's why it got this undocumented
+  appreciate a detailed bug report from you that describes how we could go
-  error. This should not occur in releases after 7.4.1.
+  ahead and repeat this!
  4.7. How do I keep user names and passwords secret in Curl command lines?
@@ -497,6 +545,8 @@ FAQ
  5.2 How can I receive all data into a large memory chunk?
  [ See also the examples/getinmemory.c source ]
  You are in full control of the callback function that gets called every time
  there is data received from the remote server. You can make that callback do
  whatever you want. You do not have to write the received data to a file.
@@ -543,13 +593,7 @@ FAQ
  5.4 Does libcurl do Winsock initialization on win32 systems?
-  No.
+  Yes (since 7.8.1) if told to in the curl_global_init() call.
  On win32 systems, you need to init the winsock stuff manually, libcurl will
  not do that for you. WSAStartup() and WSACleanup() should be used
  accordingly. The reason for this is of course that a single application may
  use several different libraries and parts, and there's no reason for every
  single library to do this.
  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -56,7 +56,7 @@ FTP
 - download
 - authentication
 - kerberos security
- - PORT or PASV
+ - active/passive using PORT, EPRT, PASV or EPSV
 - single file size information (compare to HTTP HEAD)
 - 'type=' URL support
 - dir listing
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -6,13 +6,14 @@
                                How To Compile
-Curl has been compiled and built on numerous different operating systems. The
+Curl has been compiled and built on numerous different operating systems.
 way to proceed is mainly divided in two different ways: the unix way or the 
 windows way.
-If you're using Windows (95/98/NT/ME/2000 or whatever) or OS/2, you should
+Most systems build curl the same way (unix-style). Continue reading below for
-continue reading from the Win32 or OS/2 headers further down. All other
+more details if you're one of them.
-systems should be capable of being installed as described below.
+
 If you're using Windows (95/98/NT/ME/2000/XP or similar), VMS, RISC OS or OS/2
 or cross-compile, you should continue reading from one the paragraphs further
 down.
 UNIX
 ====
@@ -35,8 +36,7 @@ UNIX
   The configure script always tries to find a working SSL library unless
   explicitly told not to. If you have OpenSSL installed in the default search
   path for your compiler/linker, you don't need to do anything special. If
-   you have OpenSSL installed in e.g /usr/local/ssl, you can run configure
+   you have OpenSSL installed in /usr/local/ssl, you can run configure like:
   like:
 	./configure --with-ssl
@@ -45,13 +45,13 @@ UNIX
 	./configure --with-ssl=/opt/OpenSSL
-   If you insist on forcing a build *without* SSL support, even though you may
+   If you insist on forcing a build without SSL support, even though you may
-   have it installed in your system, you can run configure like this:
+   have OpenSSL installed in your system, you can run configure like this:
        ./configure --without-ssl
   If you have OpenSSL installed, but with the libraries in one place and the
-   header files somewhere else, you'll have to set the LDFLAGS and CPPFLAGS
+   header files somewhere else, you have to set the LDFLAGS and CPPFLAGS
   environment variables prior to running configure.  Something like this
   should work:
@@ -71,7 +71,7 @@ UNIX
     LIBS=-lRSAglue -lrsaref
     (as suggested by Doug Kaufman)
-   KNOWN PROBLEMS
+   KNOWN PROBLEMS (these ones should not happen anymore)
     If you happen to have autoconf installed, but a version older than 2.12
     you will get into trouble. Then you can still build curl by issuing these
@@ -100,8 +100,8 @@ UNIX
   MORE OPTIONS
-     Remember, to force configure to use the standard cc compiler if both
+     To force configure to use the standard cc compiler if both cc and gcc are
-     cc and gcc are present, run configure like
+     present, run configure like
       CC=cc ./configure
         or
@@ -129,11 +129,6 @@ UNIX
       ./configure --with-krb4=/usr/athena
     If your system support shared libraries, but you want to built a static
     version only, you can disable building the shared version by using:
       ./configure --disable-shared
     If you're a curl developer and use gcc, you might want to enable more
     debug options with the --enable-debug option.
@@ -176,9 +171,9 @@ Win32
        Make the sources in the src/ drawer be a "win32 console application"
        project. Name it curl.
-        With VC++, add 'wsock32.lib' to the link libs when you build curl!
+        With VC++, add 'ws2_32.lib' to the link libs when you build curl!
-        Borland seems to do that itself magically. Of course you have to
+        Borland seems to do that itself magically. Of course you have to make
-        make sure it links with the libcurl too!
+        sure it links with the libcurl too!
        For VC++ 6, there's an included Makefile.vc6 that should be possible
        to use out-of-the-box.
@@ -206,8 +201,14 @@ Win32
      Microsoft command line style
      ----------------------------
        Please read the OpenSSL documentation on how to compile and install
        the OpenSSL library.  This generates the libeay32.dll and ssleay32.dll
        files.
        Run the 'vcvars32.bat' file to get the proper environment variables
-        set, then run 'nmake vc-ssl' in the root dir.
+        set. Edit the makefile.vc6 in the lib directory and define
        OPENSSL_PATH.  Set the location of the OpenSSL library and run 'nmake
        vc-ssl' in the root directory.
        The vcvars32.bat file is part of the Microsoft development
        environment.
@@ -237,7 +238,7 @@ IBM OS/2
   If you want to build with OpenSSL or OpenLDAP support, you'll need to
   download those libraries, too. Dirk Ohme has done some work to port SSL
   libraries under OS/2, but it looks like he doesn't care about emx.  You'll
-   find his patches on: http://come.to/Dirk.Ohme
+   find his patches on: http://come.to/Dirk_Ohme
   If during the linking you get an error about _errno being an undefined
   symbol referenced from the text segment, you need to add -D__ST_MT_ERRNO__
@@ -249,29 +250,167 @@ IBM OS/2
   If you're getting huge binaries, probably your makefiles have the -g in
   CFLAGS.
 VMS
 ===
   (The VMS section is in whole contributed by the friendly Nico Baggus)
   This is the first attempt at porting cURL to VMS.
   Curl seems to work with FTP & HTTP other protocols are not tested.  (the
   perl http/ftp testing server supplied as testing too cannot work on VMS
   because vms has no concept of fork(). [ I tried to give it a whack, but
   thats of no use.
   SSL stuff has not been ported.
   Telnet has about the same issues as for Win32. When the changes for Win32
   are clear maybe they'l work for VMS too. The basic problem is that select
   ONLY works for sockets.
   Marked instances of fopen/[f]stat that might become a problem, especially
   for non stream files. In this regard, the files opened for writing will be
   created stream/lf and will thus be safe. Just keep in mind that non-binary
   read/wring from/to files will have a records size limit of 32767 bytes
   imposed.
   Stat to get the size of the files is again only safe for stream files &
   fixed record files without implied CC.
   -- My guess is that only allowing access to stream files is the quickest
   way to get around the most issues. Therefore all files need to to be
   checked to be sure they will be stream/lf before processing them.  This is
   the easiest way out, I know. The reason for this is that code that needs to
   report the filesize will become a pain in the ass otherwise.
   Exit status.... Well we needed something done here,
   VMS has a structured exist status:
   | 3  |       2    |     1       |  0|
   |1098|765432109876|5432109876543|210|
   +----+------------+-------------+---+
   |Ctrl|  Facility  | Error code  |sev|
   +----+------------+-------------+---+
   With the Ctrl-bits an application can tell if part or the whole message has
   allready been printed from the program, DCL doesn't need to print it again.
   Facility - basicaly the program ID. A code assigned to the program
   the name can be fetched from external or internal message libraries
   Errorcode - the errodes assigned by the application
   Sev. - severity: Even = error, off = non error
 		0 = Warning
 		1 = Success
 		2 = Error
 		3 = Information
 		4 = Fatal 
 		<5-7> reserved.
   This all presents itself with:
   %<FACILITY>-<SeV>-<Errorname>, <Error message>
   See also the src/curlmsg.msg file, it has the source for the messages In
   src/main.c a section is devoted to message status values, the globalvalues
   create symbols with certain values, referenced from a compiled message
   file. Have all exit function use a exit status derived from a translation
   table with the compiled message codes.
   This was all compiled with:
 	Compaq C V6.2-003 on OpenVMS Alpha V7.1-1H2
   So far for porting notes as of:
   13-jul-2001
   N. Baggus
 QNX
 ===
   (This section was graciously brought to us by David Bentham)
   By setting FD_SETSIZE early in connect.c we override the QNX default value
   and thus avoid a crash.
   Fortunately in the QNX headers its defined as
    #ifndef FD_SETSIZE
      #define FD_SETSIZE 32
    #endif
   so its relatively easy to override without changing the original
   definition. QNX claim posix compliance so this definition style could be
   standard in other o/s's. Eg Microsoft Visual C++ 6 defines it similarly,
   but its set to 64.
 CROSS COMPILE
 =============
   (This section was graciously brought to us by Jim Duey, 23-oct-2001)
   Download and unpack the cURL package.  Version should be 7.9.1 or later.
   'cd' to the new directory. (ie. curl-7.9.1-pre4)
   Set environment variables to point to the cross-compile toolchain and call
   configure with any options you need.  Be sure and specify the '--host' and
   '--build' parameters at configuration time.  The following script is an
   example of cross-compiling for the IBM 405GP PowerPC processor using the
   toolchain from MonteVista for Hardhat Linux.
   (begin script)
   #! /bin/sh
   export PATH=$PATH:/opt/hardhat/devkit/ppc/405/bin
   export CPPFLAGS="-I/opt/hardhat/devkit/ppc/405/target/usr/include"
   export AR=ppc_405-ar
   export AS=ppc_405-as
   export LD=ppc_405-ld
   export RANLIB=ppc_405-ranlib
   export CC=ppc_405-gcc
   export NM=ppc_405-nm
   configure --target=powerpc-hardhat-linux \
 	--host=powerpc-hardhat-linux \
 	--build=i586-pc-linux-gnu \
 	--prefix=/opt/hardhat/devkit/ppc/405/target/usr/local \
 	--exec-prefix=/usr/local
   (end script)
   The '--prefix' parameter specifies where cURL will be installed.  If
   'configure' completes successfully, do 'make' and 'make install' as usual.
 PORTS
 =====
-   This is a probably incomplete list of known hardware and
+   This is a probably incomplete list of known hardware and operating systems
-   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!
        - Ultrix 4.3a
        - SINIX-Z v5
        - Alpha DEC OSF 4
        - Alpha Digital UNIX v3.2
        - Alpha FreeBSD 4.1
        - Alpha Linux 2.2.16
        - Alpha OpenVMS V7.1-1H2
        - Alpha Tru64 v5.0 5.1
        - HP-PA HP-UX 9.X 10.X 11.X
        - HP-PA Linux
        - MIPS IRIX 6.2, 6.5
        - MIPS Linux
        - Power AIX 4.2, 4.3.1, 4.3.2
        - PowerPC Darwin 1.0
        - PowerPC Linux
        - PowerPC Mac OS 9
        - PowerPC Mac OS X
        - SINIX-Z v5
        - Sparc Linux
        - Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7, 8
        - Sparc SunOS 4.1.X
        - StrongARM (and other ARM) RISC OS 3.1, 4.02
        - StrongARM Linux 2.4
        - StrongARM NetBSD 1.4.1
        - 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
@@ -281,8 +420,9 @@ PORTS
        - i386 Windows 95, 98, ME, NT, 2000
        - ia64 Linux 2.3.99
        - m68k AmigaOS 3
        - m68k Linux
        - m68k OpenBSD
-        - StrongARM NetBSD 1.4.1
+        - s390 Linux 
 OpenSSL
 =======
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -1,4 +1,4 @@
-                                       Updated for curl 7.7 on March 13, 2001
+                                    Updated for curl 7.9.1 on November 2, 2001
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -69,45 +69,103 @@ 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
 introduced. They should be called by the application to initialize and clean
 up global stuff in the library. As of today, they just do the global SSL
 initing if SSL is enabled. 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.
 curl_easy_init() allocates an internal struct and makes some initializations.
- The returned handle does not revail internals.
+ The returned handle does not reveal internals. This is the 'SessionHandle'
 struct which works as an "anchor" struct for all curl_easy functions. All
 connections performed will get connect-specific data allocated that should be
 used for things related to particular connections/requests.
- curl_easy_setopt() takes a three arguments, where the option stuff must be
+ curl_easy_setopt() takes three arguments, where the option stuff must be
- passed in pairs, the parameter-ID and the parameter-value. The list of
+ passed in pairs: the parameter-ID and the parameter-value. The list of
- options is documented in the man page.
+ options is documented in the man page. This function mainly sets things in
 the 'SessionHandle' struct.
 curl_easy_perform() does a whole lot of things:
- It starts off in the lib/easy.c file by calling curl_transfer(), but the main
+ It starts off in the lib/easy.c file by calling Curl_perform() and the main
- work is lib/url.c. The function first analyzes the URL, it separates the
+ work then continues in lib/url.c. The flow continues with a call to
- different components and connects to the remote host. This may involve using
+ Curl_connect() to connect to the remote site.
 a proxy and/or using SSL. The Curl_gethost() function in lib/hostip.c is used
 for looking up host names.
- When connected, the proper protocol-specific function is called. The
+ o Curl_connect()
- functions are named after the protocols they handle. Curl_ftp(), Curl_http(),
+
- Curl_dict(), etc. They all reside in their respective files (ftp.c, http.c
+   ... analyzes the URL, it separates the different components and connects to
- and dict.c).
+   the remote host. This may involve using a proxy and/or using SSL. The
   Curl_gethost() function in lib/hostip.c is used for looking up host names.
   When Curl_connect is done, we are connected to the remote site. Then it is
   time to tell the server to get a document/file. Curl_do() arranges this.
   This function makes sure there's an allocated and initiated 'connectdata'
   struct that is used for this particular connection only (although there may
   be several requests performed on the same connect). A bunch of things are
   inited/inherited from the SessionHandle struct.
 o Curl_do()
   Curl_do() makes sure the proper protocol-specific function is called. The
   functions are named after the protocols they handle. Curl_ftp(),
   Curl_http(), Curl_dict(), etc. They all reside in their respective files
   (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
   Curl_ftp().
   The protocol-specific functions of course deal with protocol-specific
   negotiations and setup. They have access to the Curl_sendf() (from
- lib/sendf.c) function to send printf-style formatted data to the remote host
+   lib/sendf.c) function to send printf-style formatted data to the remote
- and when they're ready to make the actual file transfer they call the
+   host and when they're ready to make the actual file transfer they call the
   Curl_Transfer() function (in lib/transfer.c) to setup the transfer and
- returns. Curl_perform() then calls Transfer() in lib/transfer.c that performs
+   returns.
- the entire file transfer. Curl_perform() is what does the main "connect - do
+
- - transfer - done" loop. It loops if there's a Location: to follow.
+   Starting in 7.9.1, if this DO function fails and the connection is being
   re-used, libcurl will then close this connection, setup a new connection
   and re-issue the DO request on that. This is because there is no way to be
   perfectly sure that we have discovered a dead connection before the DO
   function and thus we might wrongly be re-using a connection that was closed
   by the remote peer.
 o Transfer()
   Curl_perform() then calls Transfer() in lib/transfer.c that performs
   the entire file transfer.
   During transfer, the progress functions in lib/progress.c are called at a
   frequent interval (or at the user's choice, a specified callback might get
- called). The speedcheck functions in lib/speedcheck.c are also used to verify
+   called). The speedcheck functions in lib/speedcheck.c are also used to
- that the transfer is as fast as required.
+   verify that the transfer is as fast as required.
 o Curl_done()
   Called after a transfer is done. This function takes care of everything
   that has to be done after a transfer. This function attempts to leave
   matters in a state so that Curl_do() should be possible to call again on
   the same connection (in a persistent connection case). It might also soon
   be closed with Curl_disconnect().
 o Curl_disconnect()
   When doing normal connections and transfers, no one ever tries to close any
   connections so this is not normally called when curl_easy_perform() is
   used. This function is only used when we are certain that no more transfers
   is going to be made on the connection. It can be also closed by force, or
   it can be called to make sure that libcurl doesn't keep too many
   connections alive at the same time (there's a default amount of 5 but that
   can be changed with the CURLOPT_MAXCONNECTS option).
   This function cleans up all resources that are associated with a single
   connection.
 Curl_perform() is the function that does the main "connect - do - transfer -
 done" loop. It loops if there's a Location: to follow.
 When completed, the curl_easy_cleanup() should be called to free up used
- resources.
+ resources. It runs Curl_disconnect() on all open connectons.
 A quick roundup on internal function sequences (many of these call
 protocol-specific function-pointers):
@@ -204,26 +262,26 @@ Library
 Persistent Connections
 ======================
- With curl 7.7, we added persistent connection support to libcurl which has
+ The persistent connection support in libcurl requires some considerations on
- introduced a somewhat different treatmeant of things inside of libcurl.
+ how to do things inside of the library.
- o The 'UrlData' struct returned in the curl_easy_init() call must never
+ o The 'SessionHandle' struct returned in the curl_easy_init() call must never
-   hold connection-oriented data. It is meant to hold the root data as well
+   hold connection-oriented data. It is meant to hold the root data as well as
-   as all the options etc that the library-user may choose.
+   all the options etc that the library-user may choose.
- o The 'UrlData' struct holds the cache array of pointers to 'connectdata'
+ o The 'SessionHandle' struct holds the "connection cache" (an array of
-   structs. There's one connectdata struct for each connection that libcurl
+   pointers to 'connectdata' structs). There's one connectdata struct
-   knows about.
+   allocated for each connection that libcurl knows about.
 o This also enables the 'curl handle' to be reused on subsequent transfers,
-   something that was illegal in pre-7.7 versions.
+   something that was illegal before libcurl 7.7.
 o When we are about to perform a transfer with curl_easy_perform(), we first
   check for an already existing connection in the cache that we can use,
   otherwise we create a new one and add to the cache. If the cache is full
   already when we add a new connection, we close one of the present ones. We
   select which one to close dependent on the close policy that may have been
   previously set.
- o When the tranfer operation is complete, we try to leave the connection open.
+ o When the transfer operation is complete, we try to leave the connection
-   Particular options may tell us not to, and protocols may signal closure on
+   open. Particular options may tell us not to, and protocols may signal
-   connections and then we don't keep it open of course.
+   closure on connections and then we don't keep it open of course.
 o When curl_easy_cleanup() is called, we close all still opened connections.
 You do realize that the curl handle must be re-used in order for the
@@ -233,10 +291,9 @@ Library Symbols
 ===============
 All symbols used internally in libcurl must use a 'Curl_' prefix if they're
- used in more than a single file. Single-file symbols must be made
+ used in more than a single file. Single-file symbols must be made static.
- static. Public (exported) symbols must use a 'curl_' prefix. (There are
+ Public ("exported") symbols must use a 'curl_' prefix. (There are exceptions,
- exceptions, but they are destined to be changed to follow this pattern in the
+ but they are to be changed to follow this pattern in future versions.)
 future.)
 Return Codes and Informationals
 ===============================
@@ -257,6 +314,7 @@ Client
 ======
 main() resides in src/main.c together with most of the client code.
 src/hugehelp.c is automatically generated by the mkhelp.pl perl script to
 display the complete "manual" and the src/urlglob.c file holds the functions
 used for the URL-"globbing" support. Globbing in the sense that the {} and []
@@ -272,25 +330,26 @@ Client
 curl_easy_getinfo() function to extract useful information from the curl
 session.
- Recent versions may loop and do all that several times if many URLs were
+ Recent versions may loop and do all this several times if many URLs were
 specified on the command line or config file.
 Memory Debugging
 ================
- The file named lib/memdebug.c contains debug-versions of a few
+ The file lib/memdebug.c contains debug-versions of a few functions. Functions
- functions. Functions such as malloc, free, fopen, fclose, etc that somehow
+ such as malloc, free, fopen, fclose, etc that somehow deal with resources
- deal with resources that might give us problems if we "leak" them. The
+ that might give us problems if we "leak" them. The functions in the memdebug
- functions in the memdebug system do nothing fancy, they do their normal
+ system do nothing fancy, they do their normal function and then log
- function and then log information about what they just did. The logged data
+ information about what they just did. The logged data can then be analyzed
- can then be analyzed after a complete session,
+ after a complete session,
- memanalyze.pl is a perl script present only present in CVS (not part of the
+ memanalyze.pl is the perl script present only present in CVS (not part of the
 release archives) that analyzes a log file generated by the memdebug
 system. It detects if resources are allocated but never freed and other kinds
 of errors related to resource management.
- Use -DMALLOCDEBUG when compiling to enable memory debugging.
+ Use -DMALLOCDEBUG when compiling to enable memory debugging, this is also
 switched on by running configure with --enable-debug.
 Test Suite
 ==========
--- a/docs/LIBCURL
+++ b/docs/LIBCURL
@@ -1,117 +0,0 @@
                         _ _ _                     _ 
                        | (_) |__   ___ _   _ _ __| |
                        | | | '_ \ / __| | | | '__| |
                        | | | |_) | (__| |_| | |  | |
                        |_|_|_.__/ \___|\__,_|_|  |_|
                   How To Use Libcurl In Your C/C++ Program
 [ libcurl can be used directly from within your Java, PHP, Perl, Ruby or Tcl
   programs as well, look elsewhere for documentation on this ]
 The interface is meant to be very simple for applictions/programmers, hence
 the name "easy". We have therefore minimized the number of entries.
 The Easy Interface
 When using the easy interface, you init your session and get a handle, which
 you use as input to the following interface functions you use. Use
 curl_easy_init() to get the handle.
 You continue by setting all the options you want in the upcoming transfer,
 most important among them is the URL itself (you can't transfer anything
 without a specified URL as you may have figured out yourself). You might want
 to set some callbacks as well that will be called from the library when data
 is available etc. curl_easy_setopt() is there for this.
 When all is setup, you tell libcurl to perform the transfer using
 curl_easy_perform(). It will then do the entire operation and won't return
 until it is done or failed.
 After the transfer has been made, you cleanup the session with
 curl_easy_cleanup() and libcurl is entirely off the hook! If you want
 persistant connections, you don't cleanup immediately, but instead run ahead
 and perform other transfers. See the chapter below for Persistant
 Connections.
 While the above mentioned four functions are the main functions to use in the
 easy interface, there is a series of other helpful functions to use. They
 are:
   curl_version()        - displays the libcurl version
   curl_getdate()        - converts a date string to time_t
   curl_getenv()         - portable environment variable reader
   curl_easy_getinfo()   - get information about a performed transfer
   curl_formparse()      - helps building a HTTP form POST
   curl_formfree()       - free a list built with curl_formparse()
   curl_slist_append()   - builds a linked list
   curl_slist_free_all() - frees a whole curl_slist
 For details on these, read the separate man pages.
 Linking with libcurl
 Staring with 7.7.2 (on unix-like machines), there's a tool named curl-config
 that gets installed with the rest of the curl stuff when 'make install' is
 performed.
 curl-config is added to make it easier for applications to link with
 libcurl and developers to learn about libcurl and how to use it.
 Run 'curl-config --libs' to get the (additional) linker options you need to
 link with the particular version of libcurl you've installed.
 For details, see the curl-config.1 man page.
 libcurl symbol names
 All public functions in the libcurl interface are prefixed with 'curl_' (with
 a lowercase c). You can find other functions in the library source code, but
 other prefixes indicate the functions are private and may change without
 further notice in the next release.
 Only use documented functions and functionality!
 Portability
 libcurl works *exactly* the same, on any of the platforms it compiles and
 builds on.
 There's only one caution, and that is the win32 platform that may(*) require
 you to init the winsock stuff before you use the libcurl functions. Details
 on this are noted on the curl_easy_init() man page.
 (*) = it appears as if users of the cygwin environment get this done
       automatically.
 Threads
 Never *ever* call curl-functions simultaneously using the same handle from
 several threads. libcurl is thread-safe and can be used in any number of
 threads, but you must use separate curl handles if you want to use libcurl in
 more than one thread simultaneously.
 Persistant Connections
 With libcurl 7.7, persistant connections were added. Persistant connections
 means that libcurl can re-use the same connection for several transfers, if
 the conditions are right.
 libcurl will *always* attempt to use persistant connections. Whenever you use
 curl_easy_perform(), libcurl will attempt to use an existing connection to do
 the transfer, and if none exists it'll open a new one that will be subject
 for re-use on a possible following call to curl_easy_perform().
 To allow libcurl to take full advantage of persistant connections, you should
 do as many of your file transfers as possible using the same curl
 handle. When you call curl_easy_cleanup(), all the possibly open connections
 held by libcurl will be closed and forgotten.
 Note that the options set with curl_easy_setopt() will be used in on every
 repeat curl_easy_perform() call
 Compatibility with older libcurls
 Repeated curl_easy_perform() calls on the same handle were not supported in
 pre-7.7 versions, and caused confusion and defined behaviour.
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -132,7 +132,7 @@ UPLOADING
  Upload all data on stdin to a specified ftp site:
-        curl -t ftp://ftp.upload.com/myfile
+        curl -T - ftp://ftp.upload.com/myfile
  Upload data from a specified file, login with user and password:
@@ -157,7 +157,7 @@ UPLOADING
  Upload all data on stdin to a specified http site:
-        curl -t http://www.upload.com/myfile
+        curl -T - http://www.upload.com/myfile
  Note that the http server must've been configured to accept PUT before this
  can be done successfully.
@@ -591,7 +591,7 @@ HTTPS
    Run the 'openssl' application to convert the certificate. If you cd to the
    openssl installation, you can do it like:
-     # ./apps/openssl pkcs12 -certfile [file you saved] -out [PEMfile]
+     # ./apps/openssl pkcs12 -in [file you saved] -clcerts -out [PEMfile]
 RESUMING FILE TRANSFERS
@@ -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.
@@ -756,6 +756,17 @@ TELNET
  You might want the -N/--no-buffer option to switch off the buffered output
  for slow connections or similar.
  Pass options to the telnet protocol negotiation, by using the -t option. To
  tell the server we use a vt100 terminal, try something like:
        curl -tTTYPE=vt100 telnet://remote.server.com
  Other interesting options for it -t include:
   - XDISPLOC=<X display> Sets the X display location.
   - NEW_ENV=<var,val> Sets an environment variable.
  NOTE: the telnet protocol does not specify any way to login with a specified
  user and password so curl can't do that automatically. To do that, you need
  to track when the login prompt is received and send the username and
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -12,7 +12,9 @@ man_MANS = \
 	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 \
@@ -23,11 +25,53 @@ man_MANS = \
 	curl_unescape.3 \
 	curl_strequal.3 \
 	curl_strnequal.3 \
-	curl_printf.3 \
+	curl_mprintf.3 \
-	libcurl.5
+	curl_global_init.3 \
 	curl_global_cleanup.3 \
 	libcurl.3
 SUBDIRS = examples
 HTMLPAGES = \
 	curl.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) \
 	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \
-	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting
+	README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS \
 	VERSIONS $(HTMLPAGES)
-SUBDIRS = examples
+MAN2HTML= gnroff -man $< | man2html >$@
 SUFFIXES = .1 .3 .html
 html: $(HTMLPAGES)
 .3.html:
 	$(MAN2HTML)
 .1.html:
 	$(MAN2HTML)
--- a/docs/README.win32
+++ b/docs/README.win32
@@ -12,13 +12,11 @@ README.win32
  systems. While not being the main develop target, a fair share of curl users
  are win32-based.
-  Some documentation in this archive will be tricky to read for Windows
+  The unix-style man pages are tricky to read on windows, so therefore are all
-  people, as they come in unix-style man pages. You can either download a
+  those pages also converted to HTML and those are also included in the
-  freely available nroff binary for win32 (*pointers appriciated*), convert
+  release archives.
  the files into plain-text on your neighbor's unix machine or run over to the
  curl web site and view them as plain HTML.
-  The main curl.1 man page is "built-in". Use a command line similar to this
+  The main curl.1 man page is also "built-in" in the command line tool. Use a
-  in order to extract a separate text file:
+  command line similar to this in order to extract a separate text file:
        curl -M >manual.txt
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -0,0 +1,81 @@
 This project has been alive for several years. Countless people have provided
 feedback that have improved curl. Here follows a (incomplete) list of people
 that have contributed with non-trivial parts:
 - Daniel Stenberg <daniel@haxx.se>
 - Rafael Sagula <sagula@inf.ufrgs.br>
 - Sampo Kellomaki <sampo@iki.fi>
 - Linas Vepstas <linas@linas.org>
 - Bjorn Reese <breese@mail1.stofanet.dk>
 - Johan Anderson <johan@homemail.com>
 - Kjell Ericson <Kjell.Ericson@haxx.se>
 - Troy Engel <tengel@sonic.net>
 - Ryan Nelson <ryan@inch.com>
 - Bj<42>rn Stenberg <bjorn@haxx.se>
 - Angus Mackay <amackay@gus.ml.org>
 - Eric Young <eay@cryptsoft.com>
 - Simon Dick <simond@totally.irrelevant.org>
 - Oren Tirosh <oren@monty.hishome.net>
 - Steven G. Johnson <stevenj@alum.mit.edu>
 - Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
 - Andr<64>s Garc<72>a <ornalux@redestb.es>
 - Douglas E. Wegscheid <wegscd@whirlpool.com>
 - Mark Butler <butlerm@xmission.com>
 - Eric Thelin <eric@generation-i.com>
 - Marc Boucher <marc@mbsi.ca>
 - Greg Onufer <Greg.Onufer@Eng.Sun.COM>
 - Doug Kaufman <dkaufman@rahul.net>
 - David Eriksson <david@2good.com>
 - Ralph Beckmann <rabe@uni-paderborn.de>
 - T. Yamada <tai@imasy.or.jp>
 - Lars J. Aas <larsa@sim.no>
 - J<>rn Hartroth <Joern.Hartroth@computer.org>
 - Matthew Clarke <clamat@van.maves.ca>
 - Linus Nielsen Feltzing <linus@haxx.se>
 - Felix von Leitner <felix@convergence.de>
 - Dan Zitter <dzitter@zitter.net>
 - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
 - Chris Maltby <chris@aurema.com>
 - Ron Zapp <rzapper@yahoo.com>
 - Paul Marquis <pmarquis@iname.com>
 - Ellis Pritchard <ellis@citria.com>
 - Damien Adant <dams@usa.net>
 - Chris <cbayliss@csc.come>
 - Marco G. Salvagno <mgs@whiz.cjb.net>
 - Paul Marquis <pmarquis@iname.com>
 - David LeBlanc <dleblanc@qnx.com>
 - Rich Gray at Plus Technologies
 - Luong Dinh Dung <u8luong@lhsystems.hu>
 - Torsten Foertsch <torsten.foertsch@gmx.net>
 - Kristian K<>hntopp <kris@koehntopp.de>
 - Fred Noz <FNoz@siac.com>
 - Caolan McNamara <caolan@csn.ul.ie>
 - Albert Chin-A-Young <china@thewrittenword.com>
 - Stephen Kick <skick@epicrealm.com>
 - Martin Hedenfalk <mhe@stacken.kth.se>
 - Richard Prescott <rip at step.polymtl.ca>
 - Jason S. Priebe <priebe@wral-tv.com>
 - T. Bharath <TBharath@responsenetworks.com>
 - Alexander Kourakos <awk@users.sourceforge.net>
 - James Griffiths <griffiths_james@yahoo.com>
 - Loic Dachary <loic@senga.org>
 - Robert Weaver <robert.weaver@sabre.com>
 - Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
 - Jun-ichiro itojun Hagino <itojun@iijlab.net>
 - Frederic Lepied <flepied@mandrakesoft.com>
 - Georg Horn <horn@koblenz-net.de>
 - Cris Bailiff <c.bailiff@awayweb.com>
 - Sterling Hughes <sterling@designmultimedia.com>
 - S. Moonesamy
 - Ingo Wilken <iw@WWW.Ecce-Terram.DE>
 - Pawel A. Gajda <mis@k2.net.pl>
 - Patrick Bihan-Faou
 - Nico Baggus <Nico.Baggus@mail.ing.nl>
 - Sergio Ballestrero
 - Andrew Francis <locust@familyhealth.com.au>
 - 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
@@ -7,59 +7,71 @@
 TODO
 Things to do in project cURL. Please tell me what you think, contribute and
- send me patches that improve things!
+ send me patches that improve things! Also check the http://curl.haxx.se/dev
 web section for various development notes.
-To do for the next release:
+ LIBCURL
- * Make sure SSL works even when IPv6 is enabled. We just can't connect to
+ * Consider an interface to libcurl that allows applications to easier get to
-   IPv6 sites and use SSL, but we should detect that particular condition
+   know what cookies that are sent back in the response headers.
   and warn about it.
- * Make SSL session ids get used if multiple HTTPS documents from the same
+ * Make content encoding/decoding internally be made using a filter system.
   host is requested.
-To do in a future release (random order):
+ * The new 'multi' interface is being designed. Work out the details, start
   implementing and write test applications!
   [http://curl.haxx.se/dev/multi.h]
- * Rewrite parts of the test suite. Make a (XML?) format to store all
+ * Add a name resolve cache to libcurl to make repeated fetches to the same
-   test-data in a single for a single test case. The current system makes far
+   host name (when persitancy isn't available) faster.
-   too many separate files. We also need to have the test suite support
+
-   different behaviors, like when libcurl is compiled for IPv6 support and
+ * Introduce another callback interface for upload/download that makes one
-   thus performs a different set of FTP commands.
+   less copy of data and thus a faster operation.
   [http://curl.haxx.se/dev/no_copy_callbacks.txt]
 * Add configure options that disables certain protocols in libcurl to
   decrease footprint.  '--disable-[protocol]' where protocol is http, ftp,
   telnet, ldap, dict or file.
- * Extend the test suite to include telnet and https. The telnet could just do
+ * Add asynchronous name resolving. http://curl.haxx.se/dev/async-resolver.txt
   ftp or http operations (for which we have test servers) and the https would
   probably work against/with some of the openssl tools.
- * Add a command line option that allows the output file to get the same time
+ * Strip any trailing CR from the error message when Curl_failf() is used.
   stamp as the remote file. libcurl already is capable of fetching the remote
   file's date.
- * Make curl's SSL layer option capable of using other free SSL libraries.
+ DOCUMENTATION
   Such as the Mozilla Security Services
   (http://www.mozilla.org/projects/security/pki/nss/) and GNUTLS
   (http://gnutls.hellug.gr/)
- * Add asynchronous name resolving, as this enables full timeout support for
+ * Document all CURLcode error codes, why they happen and what most likely
-   fork() systems.
+   will make them not happen again.
- * Non-blocking connect(), also to make timeouts work on windows.
+ FTP
- * Move non-URL related functions that are used by both the lib and the curl
+ * FTP ASCII upload does not follow RFC959 section 3.1.1.1: "The sender
-   application to a separate "portability lib".
+   converts the data from an internal character representation to the standard
   8-bit NVT-ASCII representation (see the Telnet specification).  The
   receiver will convert the data from the standard form to his own internal
   form."
- * Add support for other languages than C.  C++ (rumours have been heard about
+ * An option to only download remote FTP files if they're newer than the local
-   something being worked on in this area) and perl (we have seen the first
+   one is a good idea, and it would fit right into the same syntax as the
-   versions of this!) comes to mind. Python anyone?
+   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...!
 * 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
 * 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.
 * "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
   since it proved more work than we thought. It is still a good idea to
-   implement though.
+   implement though. This requires the filter system mentioned above.
 * Authentication: NTLM. Support for that MS crap called NTLM
   authentication. MS proxies and servers sometime require that. Since that
@@ -82,11 +94,43 @@ To do in a future release (random order):
   sends the password in cleartext over the network, this "Digest" method uses
   a challange-response protocol which increases security quite a lot.
- * Other proxies
+ TELNET
   Ftp-kind proxy, Socks5, whatever kind of proxies are there?
- * IPv6 Awareness and support. (This is partly done.)  RFC 2428 "FTP
+ * Make TELNET work on windows98!
   Extensions for IPv6 and NATs" is interesting. PORT should be replaced with
   EPRT for IPv6 (done), and EPSV instead of PASV.  HTTP proxies are left to
   add support for.
 SSL
 * 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"
 * 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/)
 CLIENT
 * "curl ftp://site.com/*.txt"
 * Several URLs can be specified to get downloaded. We should be able to use
   the same syntax to specify several files to get uploaded (using the same
   persistant connection), using -T.
 * Say you have a list of FTP addresses to download in a file named
   ftp-list.txt: "cat ftp-list.txt | xargs curl -O -O -O [...]". curl _needs_
   an "-Oalways" flag -- all addresses on the command line use the base
   filename to store locally.  Else a script must precount the # of URLs,
   construct the proper number of "-O"s...
 TEST SUITE
 * Extend the test suite to include more protocols. The telnet could just do
   ftp or http operations (for which we have test servers).
 * Make the test suite work on more platforms. OpenBSD and Mac OS. Remove
   fork()s and it should become even more portable.
 * Introduce a test suite that tests libcurl better and more explicitly.
--- a/docs/TheArtOfHttpScripting
+++ b/docs/TheArtOfHttpScripting
@@ -1,6 +1,7 @@
 Online:  http://curl.haxx.se/docs/httpscripting.shtml
 Author:  Daniel Stenberg <daniel@haxx.se>
-Date:    September 15, 2000
+Date:    October 31, 2001
-Version: 0.3
+Version: 0.5
                The Art Of Scripting HTTP Requests Using Curl
                =============================================
@@ -47,7 +48,7 @@ Version: 0.3
 2. URL
 The Uniform Resource Locator format is how you specify the address of a
- particular resource on the internet. You know these, you've seen URLs like
+ particular resource on the Internet. You know these, you've seen URLs like
 http://curl.haxx.se or https://yourbank.com a million times.
 3. GET a page
@@ -55,7 +56,7 @@ Version: 0.3
 The simplest and most common request/operation made using HTTP is to get a
 URL. The URL could itself refer to a web page, an image or a file. The client
 issues a GET request to the server and receives the document it asked for.
- If you isse the command line
+ If you issue the command line
        curl http://curl.haxx.se
@@ -88,7 +89,7 @@ Version: 0.3
          <input type=submit name=press value="OK">
        </form>
-  In your favourite browser, this form will appear with a text box to fill in
+  In your favorite browser, this form will appear with a text box to fill in
  and a press-button labeled "OK". If you fill in '1905' and press the OK
  button, your browser will then create a new URL to get for you. The URL will
  get "junk.cgi?birthyear=1905&press=OK" appended to the path part of the
@@ -135,8 +136,8 @@ Version: 0.3
 4.3 FILE UPLOAD POST
  Back in late 1995 they defined a new way to post data over HTTP. It was
-  documented in the RFC 1867, why this method sometimes is refered to as
+  documented in the RFC 1867, why this method sometimes is referred to as
-  a rfc1867-posting.
+  a RFC1867-posting.
  This method is mainly designed to better support file uploads. A form that
  allows a user to upload a file could be written like this in HTML:
@@ -174,6 +175,19 @@ Version: 0.3
        curl -d "birthyear=1905&press=OK&person=daniel" [URL]
 4.5 FIGURE OUT WHAT A POST LOOKS LIKE
  When you're about fill in a form and send to a server by using curl instead
  of a browser, you're of course very interested in sending a POST exactly the
  way your browser does.
  An easy way to get to see this, is to save the HTML page with the form on
  your local disk, modify the 'method' to a GET, and press the submit button
  (you could also change the action URL if you want to).
  You will then clearly see the data get appended to the URL, separated with a
  '?'-letter as GET forms are supposed to.
 5. PUT
 The perhaps best way to upload data to a HTTP server is to use PUT. Then
@@ -182,7 +196,7 @@ Version: 0.3
 Put a file to a HTTP server with curl:
-        curl -t uploadfile www.uploadhttp.com/receive.cgi
+        curl -T uploadfile www.uploadhttp.com/receive.cgi
 6. AUTHENTICATION
@@ -200,7 +214,7 @@ Version: 0.3
 Sometimes your HTTP access is only available through the use of a HTTP
 proxy. This seems to be especially common at various companies. A HTTP proxy
 may require its own user and password to allow the client to get through to
- the internet. To specify those with curl, run something like:
+ the Internet. To specify those with curl, run something like:
        curl -U proxyuser:proxypassword curl.haxx.se
@@ -280,7 +294,7 @@ Version: 0.3
 contents to the server, unless of course they are expired.
 Many applications and servers use this method to connect a series of requests
- into a single logical session. To be able to use curl in such occations, we
+ into a single logical session. To be able to use curl in such occasions, we
 must be able to record and send back cookies the way the web application
 expects them. The same way browsers deal with them.
@@ -289,7 +303,6 @@ Version: 0.3
        curl -b "name=Daniel" www.cookiesite.com
 Cookies are sent as common HTTP headers. This is practical as it allows curl
 to record cookies simply by recording headers. Record cookies with curl by
 using the -D option like:
@@ -304,6 +317,23 @@ Version: 0.3
        curl -b stored_cookies_in_file www.cookiesite.com
 Curl's "cookie engine" gets enabled when you use the -b option. If you only
 want curl to understand received cookies, use -b with a file that doesn't
 exist. Example, if you want to let curl understand cookies from a page and
 follow a location (and thus possibly send back cookies it received), you can
 invoke it like:
        curl -b nada -L www.cookiesite.com
 Curl has the ability to read and write cookie files that use the same file
 format that Netscape and Mozilla do. It is a convenient way to share cookies
 between browsers and automatic scripts. The -b switch automatically detects
 if a given file is such a cookie file and parses it, and by using the
 -c/--cookie-jar option you'll make curl write a new cookie file at the end of
 an operation:
        curl -b cookies.txt -c newcookies.txt www.cookiesite.com
 11. HTTPS
 There are a few ways to do secure HTTP transfers. The by far most common
@@ -328,7 +358,7 @@ Version: 0.3
  you need to enter the unlock-code before the certificate can be used by
  curl. The PIN-code can be specified on the command line or if not, entered
  interactively when curl queries for it. Use a certificate with curl on a
-  https server like:
+  HTTPS server like:
        curl -E mycert.pem https://that.secure.server.com
@@ -337,10 +367,12 @@ Version: 0.3
 RFC 2616 is a must to read if you want in-depth understanding of the HTTP
 protocol.
- RFC 2396 explains the URL syntax
+ RFC 2396 explains the URL syntax.
 RFC 2109 defines how cookies are supposed to work.
 RFC 1867 defines the HTTP post upload format.
 http://www.openssl.org is the home of the OpenSSL project
 http://curl.haxx.se is the home of the cURL project
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -0,0 +1,64 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 Version Numbers and Releases
 Curl is not only curl. Curl is also libcurl. They're actually individually
 versioned, but they mostly follow each other rather closely.
 The version numbering is always built up using the same system:
        X.Y[.Z][-preN]
 Where
   X is main version number
   Y is release number
   Z is patch number
   N is pre-release number
 One of these numbers will get bumped in each new release. The numbers to the
 right of a bumped number will be reset to zero. If Z is zero, it is not
 included in the version number. The pre release number is only included in
 pre releases (they're never used in public, official, releases).
 The main version number will get bumped when *really* big, world colliding
 changes are made. The release number is bumped when big changes are
 performed. The patch number is bumped when the changes are mere bugfixes and
 only minor feature changes. The pre-release is a counter, to identify which
 pre-release a certain release is.
 When reaching the end of a pre-release period, the version without the
 pre-release part will be released as a public release.
 It means that after release 1.2.3, we can release 2.0 if something really big
 has been made, 1.3 if not that big changes were made or 1.2.4 if mostly bugs
 were fixed. Before 1.2.4 is released, we might release a 1.2.4-pre1 release
 for the brave people to try before the actual release.
 Bumping, as in increasing the number with 1, is unconditionally only
 affecting one of the numbers (except the ones to the right of it, that may be
 set to zero). 1 becomes 2, 3 becomes 4, 9 becomes 10, 88 becomes 89 and 99
 becomes 100. So, after 1.2.9 comes 1.2.10. After 3.99.3, 3.100 might come.
 All original curl source release archives are named according to the libcurl
 version (not according to the curl client version that, as said before, might
 differ).
 As a service to any application that might want to support new libcurl
 features while still being able to build with older versions, all releases
 have the libcurl version stored in the curl/curl.h file using a static
 numbering scheme that can be used for comparison. The version number is
 defined as:
        #define LIBCURL_VERSION_NUM 0xXXYYZZ
 Where XX, YY and ZZ are the main version, release and patch numbers in
 hexadecimal. All three numbers are always represented using two digits.  1.2
 would appear as "0x010200" while version 9.11.7 appears as "0x090b07".
 This 6-digit hexadecimal number does not show pre-release number, and it is
 always a greater number in a more recent release. It makes comparisons with
 greater than and less than work.
--- 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 "18 March 2001" "Curl 7.7.2" "curl-config manual"
+.TH curl-config 1 "16 August 2001" "Curl 7.8.1" "curl-config manual"
 .SH NAME
 curl-config \- Get information about a libcurl installation
 .SH SYNOPSIS
@@ -12,8 +12,8 @@ curl-config \- Get information about a libcurl installation
 displays information about a previous curl and libcurl installation.
 .SH OPTIONS
 .IP "--cflags"
-What set of CFLAGS that was used when libcurl was built. This is mostly a
+Set of compiler options (CFLAGS) to use when compiling files that use
-debug option that serves no particular use to most people.
+libcurl. Currently that is only thw include path to the curl include files.
 .IP "--feature"
 Lists what particular main features the installed libcurl was built with. At
 the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume
@@ -30,19 +30,20 @@ in $prefix/lib and its header files are installed in $prefix/include and so
 on. The prefix is set with "configure --prefix".
 .IP "--version"
 Outputs version information about the installed libcurl.
 .IP "--vernum"
 Outputs version information about the installed libcurl, in numerical mode.
 This outputs the version number, in hexadecimal, with 8 bits for each part;
 major, minor, patch. So that libcurl 7.7.4 would appear as 070704 and libcurl
 12.13.14 would appear as 0c0d0e...
 .SH "EXAMPLES"
-What is the path to the curl header files?
+What linker options do I need when I link with libcurl?
  echo `curl-config --prefix`/include
 What is the path to libcurl?
  echo `curl-config --prefix`/lib
 What other linker options do I need when I link with libcurl?
  curl-config --libs
 What compiler options do I need when I compile using libcurl functions?
  curl-config --cflags
 How do I know if libcurl was built with SSL support?
  curl-config --feature | grep SSL
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -2,10 +2,9 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "20 April 2001" "Curl 7.7.2" "Curl Manual"
+.TH curl 1 "30 Nov 2001" "Curl 7.9.2" "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...]
@@ -39,14 +38,14 @@ supported at the moment:
 http://www.any.org/archive[1996-1999]/volume[1-4]part{a,b,c,index}.html
-Starting with curl 7.6, you can specify any amount of URLs on the command
+You can specify any amount of URLs on the command line. They will be fetched
-line. They will be fetched in a sequential manner in the specified order.
+in a sequential manner in the specified order.
-Starting with curl 7.7, curl will attempt to re-use connections for multiple
+Curl will attempt to re-use connections for multiple file transfers, so that
-file transfers, so that getting many files from the same server will not do
+getting many files from the same server will not do multiple connects /
-multiple connects/handshakes. This improves speed. Of course this is only done
+handshakes. This improves speed. Of course this is only done on files
-on files specified on a single command line and cannot be used between
+specified on a single command line and cannot be used between separate curl
-separate curl invokes.
+invokes.
 .SH OPTIONS
 .IP "-a/--append"
 (FTP)
@@ -62,7 +61,7 @@ fail if its not set to "Mozilla/4.0".  To encode blanks in the string,
 surround the string with single quote marks.  This can also be set with the
 -H/--header flag of course.
-If this option is used more than once, the last one will be the one to be
+If this option is set more than once, the last one will be the one that's
 used.
 .IP "-b/--cookie <name=data>"
 (HTTP)
@@ -72,18 +71,18 @@ The data should be in the format "NAME1=VALUE1; NAME2=VALUE2".
 If no '=' letter is used in the line, it is treated as a filename to use to
 read previously stored cookie lines from, which should be used in this session
-if they match. Using this method also activates the "cookie parser" which
+if they match. Using this method also activates the "cookie parser" which will
-will make curl record incoming cookies too, which may be handy if you're using
+make curl record incoming cookies too, which may be handy if you're using this
-this in combination with the -L/--location option. The file format of the file
+in combination with the -L/--location option. The file format of the file to
-to read cookies from should be plain HTTP headers or the netscape cookie file
+read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie
-format.
+file format.
 .B NOTE
 that the file specified with -b/--cookie is only used as input. No cookies
 will be stored in the file. To store cookies, save the HTTP headers to a file
 using -D/--dump-header!
-If this option is used more than once, the last one will be the one to be
+If this option is set more than once, the last one will be the one that's
 used.
 .IP "-B/--use-ascii"
 Use ASCII transfer when getting an FTP file or LDAP info. For FTP, this can
@@ -91,6 +90,12 @@ also be enforced by using an URL that ends with ";type=A". This option causes
 data sent to stdout to be in text mode for win32 systems.
 If this option is used twice, the second one will disable ASCII usage.
 .IP "--ciphers <list of ciphers>"
 (SSL) Specifies which ciphers to use in the connection. The list of ciphers
 must be using valid ciphers. Read up on SSL cipher list details on this URL:
 .I http://www.openssl.org/docs/apps/ciphers.html (Option added in curl 7.9)
 If this option is used severl times, the last one will override the others.
 .IP "--connect-timeout <seconds>"
 Maximum time in seconds that you allow the connection to the server to take.
 This only limits the connection phase, once curl has connected this option is
@@ -100,23 +105,24 @@ also the
 option.
 If this option is used several times, the last one will be used.
-.IP "-c/--continue"
+.IP "-c/--cookie-jar <file name>"
-.B Deprecated. Use '-C -' instead.
+Specify to which file you want curl to write all cookies after a completed
-Continue/Resume a previous file transfer. This instructs curl to
+operation. Curl writes all cookies previously read from a specified file as
-continue appending data on the file where it was previously left,
+well as all cookies received from remote server(s). If no cookies are known,
-possibly because of a broken connection to the server. There must be
+no file will be written. The file will be written using the Netscape cookie
-a named physical file to append to for this to work.
+file format. If you set the file name to a single dash, "-", the cookies will
-Note: Upload resume is depening on a command named SIZE not always
+be written to stdout. (Option added in curl 7.9)
-present in all ftp servers! Upload resume is for FTP only.
+
-HTTP resume is only possible with HTTP/1.1 or later servers.
+If this option is used several times, the last specfied file name will be
 used.
 .IP "-C/--continue-at <offset>"
-Continue/Resume a previous file transfer at the given offset. The
+Continue/Resume a previous file transfer at the given offset. The given offset
-given offset is the exact number of bytes that will be skipped
+is the exact number of bytes that will be skipped counted from the beginning
-counted from the beginning of the source file before it is transfered
+of the source file before it is transfered to the destination.  If used with
-to the destination.
+uploads, the ftp server command SIZE will not be used by curl.
-If used with uploads, the ftp server command SIZE will not be used by
+
-curl. Upload resume is for FTP only.
+Use "-C -" to tell curl to automatically find out where/how to resume the
-HTTP resume is only possible with HTTP/1.1 or later servers.
+transfer. It then uses the given output/input files to figure that out.
 If this option is used several times, the last one will be used.
 .IP "-d/--data <data>"
@@ -134,7 +140,8 @@ name=daniel -d skill=lousy' would generate a post chunk that looks like
 If you start the data with the letter @, the rest should be a file name to
 read the data from, or - if you want curl to read the data from stdin.  The
 contents of the file must already be url-encoded. Multiple files can also be
-specified.
+specified. Posting data from a file named 'foobar' would thus be done with
 "--data @foobar".
 To post data purely binary, you should instead use the --data-binary option.
@@ -153,10 +160,14 @@ using this option the entire context of the posted data is kept as-is. If you
 want to post a binary file without the strip-newlines feature of the
 --data-ascii option, this is for you.
 If this option is used several times, the last one will be used.
 If this option is used several times, the ones following the first will
 append data.
 .IP "--disable-epsv"
 (FTP) Tell curl to disable the use of the EPSV command when doing passive FTP
 downloads. Curl will normally always first attempt to use EPSV before PASV,
 but with this option, it will not try using EPSV.
 IF this option is used several times, each occurrence will toggle this on/off.
 .IP "-D/--dump-header <file>"
 (HTTP/FTP)
 Write the HTTP headers to this file. Write the FTP file info to this
@@ -232,6 +243,11 @@ you can specify URLs that contain the letters {}[] without having them being
 interpreted by curl itself. Note that these letters are not normal legal URL
 contents but they should be encoded according to the URI standard. (Option
 added in curl 7.6)
 .IP "-G/--get"
 When used, this option will make all data specified with -d/--data or
 --data-binary to be used in a HTTP GET request instead of the POST request
 that otherwise would be used. The data will be appended to the URL with a '?'
 separator. (Option added in curl 7.9)
 .IP "-h/--help"
 Usage help.
 .IP "-H/--header <header>"
@@ -318,6 +334,8 @@ file in the user's home directory for login name and password. This is
 typically used for ftp on unix. If used with http, curl will enable user
 authentication. See
 .BR netrc(4)
 or
 .BR ftp(1)
 for details on the file format. Curl will not complain if that file
 hasn't the right permissions (it should not be world nor group
 readable). The environment variable "HOME" is used to find the home
@@ -446,6 +464,12 @@ FTP range downloads only support the simple syntax 'start-stop' (optionally
 with one of the numbers omitted). It depends on the non-RFC command SIZE.
 If this option is used several times, the last one will be used.
 .IP "-R/--remote-time"
 When used, this will make libcurl attempt to figure out the timestamp of the
 remote file, and if that is available make the local file get that same
 timestamp.
 If this option is used twice, the second time disables this again.
 .IP "-s/--silent"
 Silent mode. Don't show progress meter or error messages.  Makes
 Curl mute.
@@ -464,14 +488,15 @@ XDISPLOC=<X display> Sets the X display location.
 NEW_ENV=<var,val> Sets an environment variable.
 .IP "-T/--upload-file <file>"
-Like -t, but this transfers the specified local file. If there is no
+This transfers the specified local file to the remote URL. If there is no file
-file part in the specified URL, Curl will append the local file
+part in the specified URL, Curl will append the local file name. NOTE that you
-name. NOTE that you must use a trailing / on the last directory to
+must use a trailing / on the last directory to really prove to Curl that there
-really prove to Curl that there is no file name or curl will
+is no file name or curl will think that your last directory name is the remote
-think that your last directory name is the remote file name to
+file name to use. That will most likely cause the upload operation to fail. If
 use. That will most likely cause the upload operation to fail. If
 this is used on a http(s) server, the PUT command will be used.
 Use the file name "-" (a single dash) to use stdin instead of a given file.
 If this option is used several times, the last one will be used.
 .IP "-u/--user <user:password>"
 Specify user and password to use when fetching. See README.curl for detailed
@@ -547,6 +572,11 @@ The time, in seconds, it took from the start until the file transfer is just
 about to begin. This includes all pre-transfer commands and negotiations that
 are specific to the particular protocol(s) involved.
 .TP
 .B time_starttransfer
 The time, in seconds, it took from the start until the first byte is just about
 to be transfered. This includes time_pretransfer and also the time the
 server needs to calculate the result.
 .TP
 .B size_download
 The total amount of bytes that were downloaded.
 .TP
@@ -568,8 +598,13 @@ The average upload speed that curl measured for the complete upload.
 If this option is used several times, the last one will be used.
 .IP "-x/--proxy <proxyhost[:port]>"
-Use specified proxy. If the port number is not specified, it is assumed at
+Use specified HTTP proxy. If the port number is not specified, it is assumed
-port 1080.
+at port 1080.
 \fBNote\fP that all operations that are performed over a HTTP proxy will
 transparantly be converted to HTTP. It means that certain protocol specific
 operations might not be available. This is not the case if you can tunnel
 through the proxy, as done with the \fI-p/--proxytunnel\fP option.
 If this option is used several times, the last one will be used.
 .IP "-X/--request <command>"
@@ -617,6 +652,9 @@ Forces curl to use SSL version 3 when negotiating with a remote SSL server.
 .IP "-2/--sslv2"
 (HTTPS)
 Forces curl to use SSL version 2 when negotiating with a remote SSL server.
 .IP "-0/--http1.0"
 (HTTP) Forces curl to issue its requests using HTTP 1.0 instead of using its
 internally preferred: HTTP 1.1.
 .IP "-#/--progress-bar"
 Make curl display progress information as a progress bar instead of the
 default statistics.
@@ -638,7 +676,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.
@@ -649,11 +687,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,
@@ -756,76 +791,22 @@ Interface error. A specified outgoing interface could not be used.
 Bad password entered. An error was signalled when the password was entered.
 .IP 47
 Too many redirects. When following redirects, curl hit the maximum amount.
 .IP 48
 Unknown TELNET option specified.
 .IP 49
 Malformed telnet option.
 .IP 51
 The remote peer's SSL certificate wasn't ok
 .IP 52
 The server didn't reply anything, which here is considered an error.
 .IP XX
 There will appear more error codes here in future releases. The existing ones
 are meant to never change.
 .SH BUGS
 If you do find bugs, mail them to curl-bug@haxx.se.
 .SH AUTHORS / CONTRIBUTORS
- - Daniel Stenberg <Daniel.Stenberg@haxx.se>
+Daniel Stenberg is the main author, but the whole list of contributors is
- - Rafael Sagula <sagula@inf.ufrgs.br>
+found in the separate THANKS file.
 - Sampo Kellomaki <sampo@iki.fi>
 - Linas Vepstas <linas@linas.org>
 - Bjorn Reese <breese@mail1.stofanet.dk>
 - Johan Anderson <johan@homemail.com>
 - Kjell Ericson <Kjell.Ericson@haxx.se>
 - Troy Engel <tengel@sonic.net>
 - Ryan Nelson <ryan@inch.com>
 - Bj<42>rn Stenberg <Bjorn.Stenberg@haxx.se>
 - Angus Mackay <amackay@gus.ml.org>
 - Eric Young <eay@cryptsoft.com>
 - Simon Dick <simond@totally.irrelevant.org>
 - Oren Tirosh <oren@monty.hishome.net>
 - Steven G. Johnson <stevenj@alum.mit.edu>
 - Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
 - Andr<64>s Garc<72>a <ornalux@redestb.es>
 - Douglas E. Wegscheid <wegscd@whirlpool.com>
 - Mark Butler <butlerm@xmission.com>
 - Eric Thelin <eric@generation-i.com>
 - Marc Boucher <marc@mbsi.ca>
 - Greg Onufer <Greg.Onufer@Eng.Sun.COM>
 - Doug Kaufman <dkaufman@rahul.net>
 - David Eriksson <david@2good.com>
 - Ralph Beckmann <rabe@uni-paderborn.de>
 - T. Yamada <tai@imasy.or.jp>
 - Lars J. Aas <larsa@sim.no>
 - J<>rn Hartroth <Joern.Hartroth@computer.org>
 - Matthew Clarke <clamat@van.maves.ca>
 - Linus Nielsen Feltzing <linus@haxx.se>
 - Felix von Leitner <felix@convergence.de>
 - Dan Zitter <dzitter@zitter.net>
 - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
 - Chris Maltby <chris@aurema.com>
 - Ron Zapp <rzapper@yahoo.com>
 - Paul Marquis <pmarquis@iname.com>
 - Ellis Pritchard <ellis@citria.com>
 - Damien Adant <dams@usa.net>
 - Chris <cbayliss@csc.come>
 - Marco G. Salvagno <mgs@whiz.cjb.net>
 - Paul Marquis <pmarquis@iname.com>
 - David LeBlanc <dleblanc@qnx.com>
 - Rich Gray at Plus Technologies
 - Luong Dinh Dung <u8luong@lhsystems.hu>
 - Torsten Foertsch <torsten.foertsch@gmx.net>
 - Kristian K<>hntopp <kris@koehntopp.de>
 - Fred Noz <FNoz@siac.com>
 - Caolan McNamara <caolan@csn.ul.ie>
 - Albert Chin-A-Young <china@thewrittenword.com>
 - Stephen Kick <skick@epicrealm.com>
 - Martin Hedenfalk <mhe@stacken.kth.se>
 - Richard Prescott
 - Jason S. Priebe <priebe@wral-tv.com>
 - T. Bharath <TBharath@responsenetworks.com>
 - Alexander Kourakos <awk@users.sourceforge.net>
 - James Griffiths <griffiths_james@yahoo.com>
 - Loic Dachary <loic@senga.org>
 - Robert Weaver <robert.weaver@sabre.com>
 - Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
 - Jun-ichiro itojun Hagino <itojun@iijlab.net>
 - Frederic Lepied <flepied@mandrakesoft.com>
 - Georg Horn <horn@koblenz-net.de>
 - Cris Bailiff <c.bailiff@awayweb.com>
 .SH WWW
 http://curl.haxx.se
 .SH FTP
--- a/docs/curl_easy_cleanup.3
+++ b/docs/curl_easy_cleanup.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_easy_cleanup 3 "5 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
@@ -8,7 +8,7 @@ curl_easy_cleanup - End a libcurl session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "curl_easy_cleanup(CURL *" handle ");"
+.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
--- a/docs/curl_easy_duphandle.3
+++ b/docs/curl_easy_duphandle.3
@@ -0,0 +1,37 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_duphandle 3 "18 September 2001" "libcurl 7.9" "libcurl Manual"
 .SH NAME
 curl_easy_duphandle - Clone a libcurl session handle
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURL *curl_easy_duphandle(CURL *"handle ");"
 .ad
 .SH DESCRIPTION
 This function will return a new curl handle, a duplicate, using all the
 options previously set in the input curl \fIhandle\fP. Both handles can
 subsequently be used independently and they must both be freed with
 \fIcurl_easy_cleanup()\fP.
 All strings that the input handle has been told to point to (as opposed to
 copy) with previous calls to \fIcurl_easy_setopt\fP using char * inputs, will
 be pointed to by the new handle as well. You must therefore make sure to keep
 the data around until both handles have been cleaned up.
 The new handle will \fBnot\fP inherit any state information, no connections,
 no SSL sessions and no cookies.
 \fBNote\fP that even in multi-threaded programs, this function must be called
 in a synchronous way, the input handle may not be in use when cloned.
 This function was added in libcurl 7.9.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and no valid handle was
 returned.
 .SH "SEE ALSO"
 .BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_global_init "(3)
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_getinfo.3
+++ b/docs/curl_easy_getinfo.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_easy_init 3 "5 March 2001" "libcurl 7.6.1" "libcurl Manual"
 .SH NAME
@@ -52,6 +52,12 @@ start until the file transfer is just about to begin. This includes all
 pre-transfer commands and negotiations that are specific to the particular
 protocol(s) involved.
 .TP
 .B CURLINFO_STARTTRANSFER_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the first byte is just about to be transfered. This includes
 CURLINFO_PRETRANSFER_TIME and also the time the server needs to calculate
 the result.
 .TP
 .B CURLINFO_SIZE_UPLOAD
 Pass a pointer to a double to receive the total amount of bytes that were
 uploaded.
--- a/docs/curl_easy_init.3
+++ b/docs/curl_easy_init.3
@@ -1,8 +1,8 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
-.TH curl_easy_init 3 "5 March 2001" "libcurl 7.7" "libcurl Manual"
+.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
@@ -17,8 +17,10 @@ intializes curl and this call MUST have a corresponding call to
 .I curl_easy_cleanup
 when the operation is complete.
-On win32 systems, you need to init the winsock stuff manually, libcurl will
+On win32 systems, if you want to init the winsock stuff manually, libcurl will
-not do that for you. WSAStartup() and WSACleanup() should be used accordingly.
+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
@@ -27,6 +29,6 @@ connections where possible.
 If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
-.BR curl_easy_cleanup "(3), "
+.BR curl_easy_cleanup "(3), " curl_global_init "(3)
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_perform.3
+++ b/docs/curl_easy_perform.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_easy_perform 3 "5 Mar 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
--- a/docs/curl_easy_setopt.3
+++ b/docs/curl_easy_setopt.3
@@ -1,95 +1,84 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
-.TH curl_easy_setopt 3 "10 April 2001" "libcurl 7.7.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
-.B #include <curl/curl.h>
+#include <curl/curl.h>
-.sp
+
-.BI "CURLcode curl_easy_setopt(CURL *" handle ", CURLoption "option ", ...);"
+CURLcode curl_easy_setopt(CURL *handle, CURLoption option, parameter);
 .ad
 .SH DESCRIPTION
-curl_easy_setopt() is called to tell libcurl how to behave in a number of
+curl_easy_setopt() is used to tell libcurl how to behave. Most operations in
-ways. Most operations in libcurl have default actions, and by using the
+libcurl have default actions, and by using the appropriate options to
-appropriate options you can make them behave differently (as documented).  All
+\fIcurl_easy_setopt\fP, you can change them.  All options are set with the
-options are set with the
+\fIoption\fP followed by a \fIparameter\fP. That parameter can be a long, a
-.I option
+function pointer or an object pointer, all depending on what the specific
-followed by a parameter. That parameter can be a long, a function pointer or
+option expects. Read this manual carefully as bad input values may cause
-an object pointer, all depending on what the option in question expects. Read
+libcurl to behave badly!  You can only set one option in each function call. A
-this manual carefully as bad input values may cause libcurl to behave badly!
+typical application uses many curl_easy_setopt() calls in the setup phase.
 You can only set one option in each function call. A typical application uses
 many curl_easy_setopt() calls in the setup phase.
-NOTE: strings passed to libcurl as 'char *' arguments, will not be copied by
+\fBNOTE:\fP strings passed to libcurl as 'char *' arguments, will not be
-the library. Instead you should keep them available until libcurl no longer
+copied by the library. Instead you should keep them available until libcurl no
-needs them. Failing to do so will cause very odd behaviour or even crashes.
+longer needs them. Failing to do so will cause very odd behavior or even
 crashes.
-More note: the options set with this function call are valid for the
+\fBNOTE2:\fP options set with this function call are valid for the forthcoming
-forthcoming data transfers that are performed when you invoke
+data transfers that are performed when you invoke \fIcurl_easy_perform\fP.
 .I curl_easy_perform .
 The options are not in any way reset between transfers, so if you want
 subsequent transfers with different options, you must change them between the
 transfers.
-The
+The \fIhandle\fP is the return code from a \fIcurl_easy_init(3)\fP or
-.I "handle"
+\fIcurl_easy_duphandle(3)\fP call.
 is the return code from the
 .I "curl_easy_init"
 call.
 .SH OPTIONS
-These options are in a bit of random order, but you'll figure it out!
+The options are listed in a sort of random order, but you'll figure it out!
 .TP 0.8i
 .B CURLOPT_FILE
-Data pointer to pass instead of FILE * to the file write function. Note that
+Data pointer to pass to the file write function. Note that if you specify the
-if you specify the
+\fICURLOPT_WRITEFUNCTION\fP, this is the pointer you'll get as input. If you
-.I CURLOPT_WRITEFUNCTION
+don't use a callback, you must pass a 'FILE *' as libcurl will pass this to
-, this is the pointer you'll get as input.
+fwrite() when writing data.
-NOTE: If you're using libcurl as a win32 .DLL, you MUST use a
+\fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use the
-.I CURLOPT_WRITEFUNCTION
+\fICURLOPT_WRITEFUNCTION\fP if you set this option or you will experience
-if you set the
+crashes.
 .I CURLOPT_FILE
 option.
 .TP
 .B CURLOPT_WRITEFUNCTION
-Function pointer that should match the following prototype:
+Function pointer that should match the following prototype: \fBsize_t
-.BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
+function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
-This function gets called by libcurl as soon as there is received data that
+function gets called by libcurl as soon as there is data available to pass
-needs to be written down. The size of the data pointed to by
+available that needs to be saved. The size of the data pointed to by \fIptr\fP
-.I ptr 
+is \fIsize\fP multiplied with \fInmemb\fP.  Return the number of bytes
-is
+actually taken care of. If that amount differs from the amount passed to your
-.I size
+function, it'll signal an error to the library and it will abort the transfer
-multiplied with
+and return \fICURLE_WRITE_ERROR\fP.
-.I nmemb.
+
-Return the number of bytes actually written or return -1 to signal error to the library (it will cause it to abort the transfer).
+Set the \fIstream\fP argument with the \fBCURLOPT_FILE\fP option.
 \fBNOTE:\fP you will be passed as much data as possible in all invokes, but
 you cannot possibly make any assumptions. It may be one byte, it may be
 thousands.
 .TP
 .B CURLOPT_INFILE
-Data pointer to pass instead of FILE * to the file read function. Note that if
+Data pointer to pass to the file read function. Note that if you specify the
-you specify the
+\fICURLOPT_READFUNCTION\fP, this is the pointer you'll get as input. If you
-.I CURLOPT_READFUNCTION
+don't specify a read callback, this must be a valid FILE *.
 , this is the pointer you'll get as input.
-NOTE: If you're using libcurl as a win32 .DLL, you MUST use a
+\fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use a
-.I CURLOPT_READFUNCTION
+\fICURLOPT_READFUNCTION\fP if you set this option.
 if you set the
 .I CURLOPT_INFILE
 option.
 .TP
 .B CURLOPT_READFUNCTION
-Function pointer that should match the following prototype:
+Function pointer that should match the following prototype: \fBsize_t
-.BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
+function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
-This function gets called by libcurl as soon as it needs to read data in order
+function gets called by libcurl as soon as it needs to read data in order to
-to send it to the peer. The data area pointed at by the pointer
+send it to the peer. The data area pointed at by the pointer \fIptr\fP may be
-.I ptr
+filled with at most \fIsize\fP multiplied with \fInmemb\fP number of
-may be filled with at most
+bytes. Your function must return the actual number of bytes that you stored in
-.I size
+that memory area. Returning 0 will signal end-of-file to the library and cause
-multiplied with
+it to stop the current transfer.
 .I nmemb
 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 it to abort the current transfer immediately.
 .TP
 .B CURLOPT_INFILESIZE
 When uploading a file to a remote site, this option should be used to tell
@@ -98,48 +87,67 @@ libcurl what the expected size of the infile is.
 .B CURLOPT_URL
 The actual URL to deal with. The parameter should be a char * to a zero
 terminated string. The string must remain present until curl no longer needs
-it, as it doesn't copy the string. NOTE: this option is required to be set
+it, as it doesn't copy the string.
-before curl_easy_perform() is called.
+
 \fBNOTE:\fP this option is (the only one) required to be set before
 \fIcurl_easy_perform(3)\fP is called.
 .TP
 .B CURLOPT_PROXY
-If you need libcurl to use a http proxy to access the outside world, set the
+Set HTTP proxy to use. The parameter should be a char * to a zero terminated
-proxy string with this option. The parameter should be a char * to a zero
+string holding the host name or dotted IP address. To specify port number in
-terminated string. To specify port number in this string, append :[port] to
+this string, append :[port] to the end of the host name. The proxy string may
-the end of the host name. The proxy string may be prefixed with
+be prefixed with [protocol]:// since any such prefix will be ignored. The
-[protocol]:// since any such prefix will be ignored.
+proxy's port number may optionally be specified with the separate option
 \fICURLOPT_PROXYPORT\fP.
 \fBNOTE:\fP when you tell the library to use a HTTP proxy, libcurl will
 transparently convert operations to HTTP even if you specify a FTP URL
 etc. This may have an impact on what other features of the library you can
 use, such as CURLOPT_QUOTE and similar FTP specifics that don't work unless
 you tunnel through the HTTP proxy. Such tunneling is activated with
 \fICURLOPT_HTTPPROXYTUNNEL\fP.
 \fBNOTE2:\fP libcurl respects the environment variables \fBhttp_proxy\fP,
 \fBftp_proxy\fP, \fBall_proxy\fP etc, if any of those is set.
 .TP
 .B CURLOPT_PROXYPORT
-Set this long with this option to set the proxy port to use unless it is
+Pass a long with this option to set the proxy port to connect to unless it is
-specified in the proxy string CURLOPT_PROXY.
+specified in the proxy string \fICURLOPT_PROXY\fP.
 .TP
 .B CURLOPT_HTTPPROXYTUNNEL
-Set the parameter to non-zero to get the library to tunnel all non-HTTP
+Set the parameter to non-zero to get the library to tunnel all operations
-operations through the given HTTP proxy. Do note that there is a big
+through a given HTTP proxy. Note that there is a big difference between using
-difference to use a proxy and to tunnel through it. If you don't know what
+a proxy and to tunnel through it. If you don't know what this means, you
-this means, you probably don't want this tunnel option. (Added in libcurl 7.3)
+probably don't want this tunneling option. (Added in libcurl 7.3)
 .TP
 .B CURLOPT_VERBOSE
 Set the parameter to non-zero to get the library to display a lot of verbose
-information about its operations.
+information about its operations. Very useful for libcurl and/or protocol
 debugging and understanding.
 You hardly ever want this set in production use, you will almost always want
 this when you debug/report problems.
 .TP
 .B CURLOPT_HEADER
-A non-zero parameter tells the library to include the header in the
+A non-zero parameter tells the library to include the header in the body
-output. This is only relevant for protocols that actually has a header
+output. This is only relevant for protocols that actually have headers
-preceeding the data (like HTTP).
+preceding the data (like HTTP).
 .TP
 .B CURLOPT_NOPROGRESS
 A non-zero parameter tells the library to shut of the built-in progress meter
-completely. (NOTE: future versions of the lib is likely to not have any
+completely.
-built-in progress meter at all).
+
 \fBNOTE:\fP future versions of libcurl is likely to not have any built-in
 progress meter at all.
 .TP
 .B CURLOPT_NOBODY
 A non-zero parameter tells the library to not include the body-part in the
-output. This is only relevant for protocols that have a separate header and
+output. This is only relevant for protocols that have separate header and body
-body part.
+parts.
 .TP
 .B CURLOPT_FAILONERROR
 A non-zero parameter tells the library to fail silently if the HTTP code
-returned is equal or larger than 300. The default action would be to return
+returned is equal to or larger than 300. The default action would be to return
 the page normally, ignoring that code.
 .TP
 .B CURLOPT_UPLOAD
@@ -150,11 +158,13 @@ CURLOPT_INFILE and CURLOPT_INFILESIZE are also interesting for uploads.
 A non-zero parameter tells the library to do a regular HTTP post. This is a
 normal application/x-www-form-urlencoded kind, which is the most commonly used
 one by HTML forms. See the CURLOPT_POSTFIELDS option for how to specify the
-data to post and CURLOPT_POSTFIELDSIZE in how to set the data size.
+data to post and CURLOPT_POSTFIELDSIZE in how to set the data size. Starting
 with libcurl 7.8, this option is obsolete. Using the CURLOPT_POSTFIELDS option
 will imply this option.
 .TP
 .B CURLOPT_FTPLISTONLY
 A non-zero parameter tells the library to just list the names of an ftp
-directory, instead of doing a full directory listin that would include file
+directory, instead of doing a full directory listing that would include file
 sizes, dates etc.
 .TP
 .B CURLOPT_FTPAPPEND
@@ -162,91 +172,108 @@ A non-zero parameter tells the library to append to the remote file instead of
 overwrite it. This is only useful when uploading to a ftp site.
 .TP
 .B CURLOPT_NETRC
-A non-zero parameter tells the library to scan your
+A non-zero parameter tells the library to scan your \fI~/.netrc\fP file to
-.I ~/.netrc
+find user name and password for the remote site you are about to access. Only
-file to find user name and password for the remote site you are about to
+machine name, user name and password is taken into account (init macros and
-access. Do note that curl does not verify that the file has the correct
+similar things aren't supported).
-properties set (as the standard unix ftp client does), and that only machine
+
-name, user name and password is taken into account (init macros and similar
+\fBNote:\fP libcurl does not verify that the file has the correct properties
-things aren't supported).
+set (as the standard Unix ftp client does). It should only be readable by
 user.
 .TP
 .B CURLOPT_FOLLOWLOCATION
 A non-zero parameter tells the library to follow any Location: header that the
-server sends as part of a HTTP header. NOTE that this means that the library
+server sends as part of a HTTP header.
-will resend the same request on the new location and follow new Location:
+
-headers all the way until no more such headers are returned.
+\fBNOTE:\fP this means that the library will re-send the same request on the
 new location and follow new Location: headers all the way until no more such
 headers are returned. \fICURLOPT_MAXREDIRS\fP can be used to limit the number
 of redirects libcurl will follow.
 .TP
 .B CURLOPT_TRANSFERTEXT
 A non-zero parameter tells the library to use ASCII mode for ftp transfers,
 instead of the default binary transfer. For LDAP transfers it gets the data in
 plain text instead of HTML and for win32 systems it does not set the stdout to
-binary mode. This option can be useable when transfering text data between
+binary mode. This option can be usable when transferring text data between
-system with different views on certain characters, such as newlines or
+systems with different views on certain characters, such as newlines or
 similar.
 .TP
 .B CURLOPT_PUT
-A non-zero parameter tells the library to use HTTP PUT a file. The file to put
+A non-zero parameter tells the library to use HTTP PUT to transfer data. The
-must be set with CURLOPT_INFILE and CURLOPT_INFILESIZE.
+data should be set with CURLOPT_INFILE and CURLOPT_INFILESIZE.
 .TP
 .B CURLOPT_MUTE
 A non-zero parameter tells the library to be completely quiet.
 .TP
 .B CURLOPT_USERPWD
 Pass a char * as parameter, which should be [user name]:[password] to use for
 the connection. If the password is left out, you will be prompted for it.
 \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own prompt function.
 .TP
 .B CURLOPT_PROXYUSERPWD
 Pass a char * as parameter, which should be [user name]:[password] to use for
 the connection to the HTTP proxy. If the password is left out, you will be
-prompted for it.
+prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own
 prompt function.
 .TP
 .B CURLOPT_RANGE
 Pass a char * as parameter, which should contain the specified range you
 want. It should be in the format "X-Y", where X or Y may be left out. HTTP
 transfers also support several intervals, separated with commas as in
-.I "X-Y,N-M"
+\fI"X-Y,N-M"\fP. Using this kind of multiple intervals will cause the HTTP
-. Using this kind of multiple intervals will cause the HTTP server to send the
+server to send the response document in pieces (using standard MIME separation
-response document in pieces.
+techniques).
 .TP
 .B CURLOPT_ERRORBUFFER
 Pass a char * to a buffer that the libcurl may store human readable error
 messages in. This may be more helpful than just the return code from the
 library. The buffer must be at least CURL_ERROR_SIZE big.
 \fBNote:\fP if the library does not return an error, the buffer may not have
 been touched. Do not rely on the contents in those cases.
 .TP
 .B CURLOPT_TIMEOUT
 Pass a long as parameter containing the maximum time in seconds that you allow
-the libcurl transfer operation to take. Do note that normally, name lookups
+the libcurl transfer operation to take. Normally, name lookups can take a
-maky take a considerable time and that limiting the operation to less than a
+considerable time and limiting operations to less than a few minutes risk
-few minutes risk aborting perfectly normal operations. This option will cause
+aborting perfectly normal operations. This option will cause curl to use the
-curl to use the SIGALRM to enable timeouting system calls.
+SIGALRM to enable time-outing system calls.
 \fBNOTE:\fP this does not work in Unix multi-threaded programs, as it uses
 signals.
 .TP
 .B CURLOPT_POSTFIELDS
 Pass a char * as parameter, which should be the full data to post in a HTTP
-post operation. See also the CURLOPT_POST.
+post operation. This is a normal application/x-www-form-urlencoded kind, which
 is the most commonly used one by HTML forms. See also the CURLOPT_POST. Since
 7.8, using CURLOPT_POSTFIELDS implies CURLOPT_POST.
 \fBNote:\fP to make multipart/formdata posts (aka rfc1867-posts), check out
 the \fICURLOPT_HTTPPOST\fP option.
 .TP
 .B CURLOPT_POSTFIELDSIZE
 If you want to post data to the server without letting libcurl do a strlen()
-to measure the data size, this option must be used. Also, when this option is
+to measure the data size, this option must be used. When this option is used
-used, you can post fully binary data which otherwise is likely to fail. If
+you can post fully binary data, which otherwise is likely to fail. If this
-this size is set to zero, the library will use strlen() to get the data
+size is set to zero, the library will use strlen() to get the size. (Added in
-size. (Added in libcurl 7.2)
+libcurl 7.2)
 .TP
 .B CURLOPT_REFERER
 Pass a pointer to a zero terminated string as parameter. It will be used to
-set the referer: header in the http request sent to the remote server. This
+set the Referer: header in the http request sent to the remote server. This
-can be used to fool servers or scripts.
+can be used to fool servers or scripts. You can also set any custom header
 with \fICURLOPT_HTTPHEADER\fP.
 .TP
 .B CURLOPT_USERAGENT
 Pass a pointer to a zero terminated string as parameter. It will be used to
-set the user-agent: header in the http request sent to the remote server. This
+set the User-Agent: header in the http request sent to the remote server. This
-can be used to fool servers or scripts.
+can be used to fool servers or scripts. You can also set any custom header
 with \fICURLOPT_HTTPHEADER\fP.
 .TP
 .B CURLOPT_FTPPORT
 Pass a pointer to a zero terminated string as parameter. It will be used to
 get the IP address to use for the ftp PORT instruction. The PORT instruction
 tells the remote server to connect to our specified IP address. The string may
-be a plain IP address, a host name, an network interface name (under unix) or
+be a plain IP address, a host name, an network interface name (under Unix) or
-just a '-' letter to let the library use your systems default IP address.
+just a '-' letter to let the library use your systems default IP
 address. Default FTP operations are passive, and thus won't use PORT.
 .TP
 .B CURLOPT_LOW_SPEED_LIMIT
 Pass a long as parameter. It contains the transfer speed in bytes per second
@@ -269,97 +296,89 @@ set a cookie in the http request. The format of the string should be
 .TP
 .B CURLOPT_HTTPHEADER
 Pass a pointer to a linked list of HTTP headers to pass to the server in your
-HTTP request. The linked list should be a fully valid list of 'struct
+HTTP request. The linked list should be a fully valid list of \fBstruct
-curl_slist' structs properly filled in. Use
+curl_slist\fP structs properly filled in. Use \fIcurl_slist_append(3)\fP to
-.I curl_slist_append(3)
+create the list and \fIcurl_slist_free_all(3)\fP to clean up an entire
-to create the list and
+list. If you add a header that is otherwise generated and used by libcurl
-.I curl_slist_free_all(3)
+internally, your added one will be used instead. If you add a header with no
-to clean up an entire list. If you add a header that is otherwise generated
+contents as in 'Accept:' (no data on the right side of the colon), the
-and used by libcurl internally, your added one will be used instead. If you
+internally used header will get disabled. Thus, using this option you can add
-add a header with no contents as in 'Accept:', the internally used header will
+new headers, replace internal headers and remove internal headers.
-just get disabled. Thus, using this option you can add new headers, replace
+
-internal headers and remove internal headers.
+\fBNOTE:\fPThe most commonly replaced headers have "shortcuts" in the options
 CURLOPT_COOKIE, CURLOPT_USERAGENT and CURLOPT_REFERER.
 .TP
 .B CURLOPT_HTTPPOST
 Tells libcurl you want a multipart/formdata HTTP POST to be made and you
 instruct what data to pass on to the server.  Pass a pointer to a linked list
 of HTTP post structs as parameter.  The linked list should be a fully valid
 list of 'struct HttpPost' structs properly filled in. The best and most
-elegant way to do this, is to use
+elegant way to do this, is to use \fIcurl_formadd(3)\fP as documented. The
-.I curl_formparse(3)
+data in this list must remained intact until you close this curl handle again
-as documented.
+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 certficicate in PEM format.
+the file name of your certificate in PEM format.
 .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.
+is not supplied, you will be prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can
 be used to set your own prompt function.
 .TP
 .B CURLOPT_CRLF
-Convert unix newlines to CRLF newlines on FTP uploads.
+Convert Unix newlines to CRLF newlines on FTP uploads.
 .TP
 .B CURLOPT_QUOTE
 Pass a pointer to a linked list of FTP commands to pass to the server prior to
 your ftp request. The linked list should be a fully valid list of 'struct
-curl_slist' structs properly filled in. Use
+curl_slist' structs properly filled in. Use \fIcurl_slist_append(3)\fP to
-.I curl_slist_append(3)
+append strings (commands) to the list, and clear the entire list afterwards
-to append strings (commands) to the list, and clear the entire list afterwards
+with \fIcurl_slist_free_all(3)\fP. Disable this operation again by setting a
-with
+NULL to this option.
 .I curl_slist_free_all(3)
 .TP
 .B CURLOPT_POSTQUOTE
 Pass a pointer to a linked list of FTP commands to pass to the server after
 your ftp transfer request. The linked list should be a fully valid list of
 struct curl_slist structs properly filled in as described for
-.I "CURLOPT_QUOTE"
+\fICURLOPT_QUOTE\fP. Disable this operation again by setting a NULL to this
 option.
 .TP
 .B CURLOPT_WRITEHEADER
-Pass a FILE * to be used to write the header part of the received data to. The
+Pass a pointer to be used to write the header part of the received data to. If
-headers are guaranteed to be written one-by-one to this file handle and only
+you don't use your own callback to take care of the writing, this must be a
-complete lines are written. Parsing headers should be easy enough using
+valid FILE *. See also the \fICURLOPT_HEADERFUNCTION\fP option below on how to set a
-this. See also the
+custom get-all-headers callback.
 .I CURLOPT_HEADERFUNCTION
 option.
 .TP
 .B CURLOPT_HEADERFUNCTION
-Function pointer that should match the following prototype:
+Function pointer that should match the following prototype: \fIsize_t
-.BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
+function( void *ptr, size_t size, size_t nmemb, void *stream);\fP. This
-This function gets called by libcurl as soon as there is received header data
+function gets called by libcurl as soon as there is received header data that
-that needs to be written down. The function will be called once for each
+needs to be written down. The headers are guaranteed to be written one-by-one
-header with a complete header line in each invoke. The size of the data
+and only complete lines are written. Parsing headers should be easy enough
-pointed to by
+using this. The size of the data pointed to by \fIptr\fP is \fIsize\fP
-.I ptr 
+multiplied with \fInmemb\fP.  The pointer named \fIstream\fP will be the one
-is
+you passed to libcurl with the \fICURLOPT_WRITEHEADER\fP option.  Return the
-.I size
+number of bytes actually written or return -1 to signal error to the library
-multiplied with
+(it will cause it to abort the transfer with a \fICURLE_WRITE_ERROR\fP return
-.I nmemb.
+code). (Added in libcurl 7.7.2)
 The pointer named
 .I stream
 will be the one you passed to libcurl with the
 .I CURLOPT_WRITEHEADER
 option.
 Return the number of bytes actually written or return -1 to signal error to
 the library (it will cause it to abort the transfer with a
 .I CURLE_WRITE_ERROR
 return code). (Added in libcurl 7.7.2)
 .TP
 .B CURLOPT_COOKIEFILE
 Pass a pointer to a zero terminated string as parameter. It should contain the
-name of your file holding cookie data. The cookie data may be in netscape
+name of your file holding cookie data. The cookie data may be in Netscape /
-cookie data format or just regular HTTP-style headers dumped to a file.
+Mozilla cookie data format or just regular HTTP-style headers dumped to a
 file.
 .TP
 .B CURLOPT_SSLVERSION
 Pass a long as parameter. Set what version of SSL to attempt to use, 2 or
 3. By default, the SSL library will try to solve this by itself although some
-servers make this difficult why you at times will have to use this option.
+servers make this difficult why you at times may have to use this option.
 .TP
 .B CURLOPT_TIMECONDITION
 Pass a long as parameter. This defines how the CURLOPT_TIMEVALUE time value is
 treated. You can set this parameter to TIMECOND_IFMODSINCE or
-TIMECOND_IFUNMODSINCE. This is aa HTTP-only feature. (TBD)
+TIMECOND_IFUNMODSINCE. This is a HTTP-only feature. (TBD)
 .TP
 .B CURLOPT_TIMEVALUE
 Pass a long as parameter. This should be the time in seconds since 1 jan 1970,
@@ -369,8 +388,8 @@ isn't used, it will be TIMECOND_IFMODSINCE by default.
 .B CURLOPT_CUSTOMREQUEST
 Pass a pointer to a zero terminated string as parameter. It will be user
 instead of GET or HEAD when doing the HTTP request. This is useful for doing
-DELETE or other more obscure HTTP requests. Don't do this at will, make sure
+DELETE or other more or less obscure HTTP requests. Don't do this at will,
-your server supports the command first.
+make sure your server supports the command first.
 .TP
 .B CURLOPT_STDERR
 Pass a FILE * as parameter. This is the stream to use instead of stderr
@@ -388,29 +407,18 @@ krb4 awareness.  This is a string, 'clear', 'safe', 'confidential' or
 will be used. Set the string to NULL to disable kerberos4. The kerberos
 support only works for FTP. (Added in libcurl 7.3)
 .TP
 .B CURLOPT_WRITEINFO
 (NOT PRESENT IN 7.4 or later!)
 Pass a pointer to a zero terminated string as parameter. It will be used to
 report information after a successful request. This string may contain
 variables that will be substituted by their contents when output. Described
 elsewhere.
 .TP
 .B CURLOPT_PROGRESSFUNCTION
-Function pointer that should match the
+Function pointer that should match the \fIcurl_progress_callback\fP prototype
-.BI curl_progress_callback
+found in \fI<curl/curl.h>\fP. This function gets called by libcurl instead of
-prototype found in
+its internal equivalent with a frequent interval during data transfer.
-.I <curl/curl.h>
+Unknown/unused argument values will be set to zero (like if you only download
-This function gets called by libcurl instead of its internal
+data, the upload size will remain 0). Returning a non-zero value from this
-equivalent. Unknown/unused argument values will be set to zero (like if you
+callback will cause libcurl to abort the transfer and return
-only download data, the upload size will remain 0). Returning a non-zero value
+\fICURLE_ABORTED_BY_CALLBACK\fP.
 from this callback will cause libcurl to abort the transfer and return
 CURLE_ABORTED_BY_CALLBACK.
 .TP
 .B CURLOPT_PROGRESSDATA
 Pass a pointer that will be untouched by libcurl and passed as the first
-argument in the progress callback set with
+argument in the progress callback set with \fICURLOPT_PROGRESSFUNCTION\fP.
 .I CURLOPT_PROGRESSFUNCTION
 .
 .TP
 .B CURLOPT_SSL_VERIFYPEER
 Pass a long that is set to a non-zero value to make curl verify the peer's
@@ -423,67 +431,66 @@ verify the peer with. This only makes sense when used in combination with the
 CURLOPT_SSL_VERIFYPEER option. (Added in 7.4.2)
 .TP
 .B CURLOPT_PASSWDFUNCTION
-Pass a pointer to a curl_passwd_callback function that will then be called
+Pass a pointer to a \fIcurl_passwd_callback\fP function that will be called
 instead of the internal one if libcurl requests a password. The function must
-match this prototype:
+match this prototype: \fBint my_getpass(void *client, char *prompt, char*
-.BI "int my_getpass(void *client, char *prompt, char* buffer, int buflen );"
+buffer, int buflen );\fP.  If set to NULL, it equals to making the function
-If set to NULL, it equals to making the function always fail. If the function
+always fail. If the function returns a non-zero value, it will abort the
-returns a non-zero value, it will abort the operation and an error
+operation and an error (CURLE_BAD_PASSWORD_ENTERED) will be returned.
-(CURLE_BAD_PASSWORD_ENTERED) will be returned.
+\fIclient\fP is a generic pointer, see \fICURLOPT_PASSWDDATA\fP.  \fIprompt\fP
 .I client
 is a generic pointer, see CURLOPT_PASSWDDATA.
 .I prompt
 is a zero-terminated string that is text that prefixes the input request.
-.I buffer
+\fIbuffer\fP is a pointer to data where the entered password should be stored
-is a pointer to data where the entered password should be stored and
+and \fIbuflen\fP is the maximum number of bytes that may be written in the
-.I buflen
+buffer.  (Added in 7.4.2)
 is the maximum number of bytes that may be written in the buffer.
 (Added in 7.4.2)
 .TP
 .B CURLOPT_PASSWDDATA
 Pass a void * to whatever data you want. The passed pointer will be the first
-argument sent to the specifed CURLOPT_PASSWDFUNCTION function. (Added in
+argument sent to the specifed \fICURLOPT_PASSWDFUNCTION\fP function. (Added in
 7.4.2)
 .TP
 .B CURLOPT_FILETIME
 Pass a long. If it is a non-zero value, libcurl will attempt to get the
 modification date of the remote document in this operation. This requires that
 the remote server sends the time or replies to a time querying command. The
-curl_easy_getinfo() function with the CURLINFO_FILETIME argument can be used
+\fIcurl_easy_getinfo(3)\fP function with the \fICURLINFO_FILETIME\fP argument
-after a transfer to extract the received time (if any). (Added in 7.5)
+can be used after a transfer to extract the received time (if any). (Added in
 7.5)
 .TP
 .B CURLOPT_MAXREDIRS
 Pass a long. The set number will be the redirection limit. If that many
-redirections have been followed, the next redirect will cause an error. This
+redirections have been followed, the next redirect will cause an error
-option only makes sense if the CURLOPT_FOLLOWLOCATION is used at the same
+(\fICURLE_TOO_MANY_REDIRECTS\fP). This option only makes sense if the
-time. (Added in 7.5)
+\fICURLOPT_FOLLOWLOCATION\fP is used at the same time. (Added in 7.5)
 .TP
 .B CURLOPT_MAXCONNECTS
 Pass a long. The set number will be the persistant connection cache size. The
 set amount will be the maximum amount of simultaneous connections that libcurl
 may cache between file transfers. Default is 5, and there isn't much point in
 changing this value unless you are perfectly aware of how this work and
-changes libcurl's behaviour. Note: if you have already performed transfers
+changes libcurl's behaviour.
-with this curl handle, setting a smaller MAXCONNECTS than before may cause
+
-open connections to unnecessarily get closed. (Added in 7.7)
+\fBNOTE:\fP if you already have performed transfers with this curl handle,
 setting a smaller MAXCONNECTS than before may cause open connections to get
 closed unnecessarily. (Added in 7.7)
 .TP
 .B CURLOPT_CLOSEPOLICY
 Pass a long. This option sets what policy libcurl should use when the
 connection cache is filled and one of the open connections has to be closed to
 make room for a new connection. This must be one of the CURLCLOSEPOLICY_*
-defines. Use CURLCLOSEPOLICY_LEAST_RECENTLY_USED to make libcurl close the
+defines. Use \fICURLCLOSEPOLICY_LEAST_RECENTLY_USED\fP to make libcurl close
-connection that was least recently used, that connection is also least likely
+the connection that was least recently used, that connection is also least
-to be capable of re-use. Use CURLCLOSEPOLICY_OLDEST to make libcurl close the
+likely to be capable of re-use. Use \fICURLCLOSEPOLICY_OLDEST\fP to make
-oldest connection, the one that was created first among the ones in the
+libcurl close the oldest connection, the one that was created first among the
-connection cache. The other close policies are not support yet. (Added in 7.7)
+ones in the connection cache. The other close policies are not support
 yet. (Added in 7.7)
 .TP
 .B CURLOPT_FRESH_CONNECT
-Pass a long. Set to non-zero to make the next transfer use a new connection by
+Pass a long. Set to non-zero to make the next transfer use a new (fresh)
-force. If the connection cache is full before this connection, one of the
+connection by force. If the connection cache is full before this connection,
-existinf connections will be closed as according to the set policy. This
+one of the existing connections will be closed as according to the selected or
-option should be used with caution and only if you understand what it
+default policy. This option should be used with caution and only if you
-does. Set to 0 to have libcurl attempt re-use of an existing connection.
+understand what it does. Set this to 0 to have libcurl attempt re-using an
-(Added in 7.7)
+existing connection (default behavior).  (Added in 7.7)
 .TP
 .B CURLOPT_FORBID_REUSE
 Pass a long. Set to non-zero to make the next transfer explicitly close the
@@ -491,7 +498,7 @@ connection when done. Normally, libcurl keep all connections alive when done
 with one transfer in case there comes a succeeding one that can re-use them.
 This option should be used with caution and only if you understand what it
 does. Set to 0 to have libcurl keep the connection open for possibly later
-re-use. (Added in 7.7)
+re-use (default behavior). (Added in 7.7)
 .TP
 .B CURLOPT_RANDOM_FILE
 Pass a char * to a zero terminated file name. The file will be used to read
@@ -507,15 +514,68 @@ Pass a long. It should contain the maximum time in seconds that you allow the
 connection to the server to take.  This only limits the connection phase, once
 it has connected, this option is of no more use. Set to zero to disable
 connection timeout (it will then only timeout on the system's internal
-timeouts). This option doesn't work in win32 systems.  See also the
+timeouts). See also the \fICURLOPT_TIMEOUT\fP option.
-.I CURLOPT_TIMEOUT
+
-option.
+\fBNOTE:\fP this does not work in unix multi-threaded programs, as it uses
 signals.
 .TP
 .B CURLOPT_HTTPGET
 Pass a long. If the long is non-zero, this forces the HTTP request to get back
 to GET. Only really usable if POST, PUT or a custom request have been used
 previously using the same curl handle. (Added in 7.8.1)
 .TP
 .B CURLOPT_SSL_VERIFYHOST
 Pass a long. Set if we should verify the Common name from the peer certificate
 in the SSL handshake, set 1 to check existence, 2 to ensure that it matches
 the provided hostname. (Added in 7.8.1)
 .TP
 .B CURLOPT_COOKIEJAR
 Pass a file name as char *, zero terminated. This will make libcurl dump all
 internally known cookies to the specified file when \fIcurl_easy_cleanup(3)\fP
 is called. If no cookies are known, no file will be created. Specify "-" to
 instead have the cookies written to stdout.
 .TP
 .B CURLOPT_SSL_CIPHER_LIST
 Pass a char *, pointing to a zero terminated string holding the list of
 ciphers to use for the SSL connection. The list must be syntactly correct, it
 consists of one or more cipher strings separated by colons. Commas or spaces
 are also acceptable separators but colons are normally used, \!, \- and \+ can
 be used as operators. Valid examples of cipher lists include 'RC4-SHA',
 \'SHA1+DES\', 'TLSv1' and 'DEFAULT'. The default list is normally set when you
 compile OpenSSL.
 You'll find more details about cipher lists on this URL:
 \fIhttp://www.openssl.org/docs/apps/ciphers.html\fP
 .TP
 .B CURLOPT_HTTP_VERSION
 Pass a long, set to one of the values described below. They force libcurl to
 use the specific HTTP versions. This is not sensible to do unless you have a
 good reason.
 .RS
 .TP 5
 .B CURL_HTTP_VERSION_NONE
 We don't care about what version the library uses. libcurl will use whatever
 it thinks fit.
 .TP
 .B CURL_HTTP_VERSION_1_0
 Enforce HTTP 1.0 requests.
 .TP
 .B CURL_HTTP_VERSION_1_1
 Enforce HTTP 1.1 requests.
 .RE
 .TP
 .B CURLOPT_FTP_USE_EPSV
 Pass a long. If the value is non-zero, it tells curl to use the EPSV command
 when doing passive FTP downloads (which is always does by default). Using EPSV
 means that it will first attempt to use EPSV before using PASV, but if you
 pass FALSE (zero) to this option, it will not try using EPSV, only plain PASV.
 .PP
 .SH RETURN VALUE
-0 means the option was set properly, non-zero means an error as
+CURLE_OK (zero) means that the option was set properly, non-zero means an
-.I <curl/curl.h>
+error occurred as \fI<curl/curl.h>\fP defines.
 defines
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
 .SH BUGS
-Surely there are some, you tell me!
+If you find any bugs, or just have questions, subscribe to one of the mailing
 lists and post. We won't bite.
--- a/docs/curl_escape.3
+++ b/docs/curl_escape.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_escape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
--- a/docs/curl_formadd.3
+++ b/docs/curl_formadd.3
@@ -0,0 +1,165 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_formadd 3 "29 October 2001" "libcurl 7.9.1" "libcurl Manual"
 .SH NAME
 curl_formadd - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "int curl_formadd(struct HttpPost ** " firstitem,
 .BI "struct HttpPost ** " lastitem, " ...);"
 .ad
 .SH DESCRIPTION
 curl_formadd() 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 faster.
 After the \fIlastitem\fP pointer follow the real arguments. (If the following
 description confuses you, jump directly to the examples):
 \fBCURLFORM_COPYNAME\fP or \fBCURLFORM_PTRNAME\fP followed by a string is used
 for the name of the section. Optionally one may use \fBCURLFORM_NAMELENGTH\fP
 to specify the length of the name (allowing null characters within the
 name). All options that use the word COPY in their names copy the given
 contents, while the ones with PTR in their names simply points to the (static)
 data you must make sure remain until curl no longer needs it.
 The four options for providing values are: \fBCURLFORM_COPYCONTENTS\fP,
 \fBCURLFORM_PTRCONTENTS\fP, \fBCURLFORM_FILE\fP, or \fBCURLFORM_FILECONTENT\fP
 followed by a char or void pointer (allowed for PTRCONTENTS).
 \fBCURLFORM_FILECONTENT\fP does a normal post like \fBCURLFORM_COPYCONTENTS\fP
 but the actual value is read from the filename given as a string.
 Other arguments may be \fBCURLFORM_CONTENTTYPE\fP if the user wishes to
 specify one (for FILE if no type is given the library tries to provide the
 correct one; for CONTENTS no Content-Type is sent in this case).
 For \fBCURLFORM_PTRCONTENTS\fP or \fBCURLFORM_COPYNAME\fP the user may also
 add \fBCURLFORM_CONTENTSLENGTH\fP followed by the length as a long (if not
 given the library will use strlen to determine the length).
 For \fBCURLFORM_FILE\fP the user may send multiple files in one section by
 providing multiple \fBCURLFORM_FILE\fP arguments each followed by the filename
 (and each FILE is allowed to have a CONTENTTYPE).
 Another possibility to send single or multiple files in one section is to use
 \fBCURLFORM_ARRAY\fP that gets a struct curl_forms array pointer as its
 value. Each structure element has a CURLformoption and a char pointer. For the
 options only \fBCURLFORM_FILE\fP, \fBCURLFORM_CONTENTTYPE\fP, and
 \fBCURLFORM_END\fP (that is used to determine the end of the array and thus
 must be the option of the last and no other element of the curl_forms array)
 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
 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 except the data pointed to by the
 arguments after \fBCURLFORM_PTRNAME\fP and \fBCURLFORM_PTRCONTENTS\fP 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. If
 you provide a pointer as an arguments after \fBCURLFORM_PTRNAME\fP or
 \fBCURLFORM_PTRCONTENTS\fP you must ensure that the pointer stays valid until
 you call \fIcurl_form_free\fP and \fIcurl_easy_cleanup\fP.
 See example below.
 .SH RETURN VALUE
 Returns non-zero if an error occurs.
 .SH EXAMPLE
 .nf
 HttpPost* post = NULL;
 HttpPost* last = NULL;
 char namebuffer[] = "name buffer";
 long namelength = strlen(namebuffer);
 char buffer[] = "test buffer";
 char htmlbuffer[] = "<HTML>test buffer</HTML>";
 long htmlbufferlength = strlen(htmlbuffer);
 struct curl_forms forms[3];
 char file1[] = "my-face.jpg";
 char file2[] = "your-face.jpg";
 /* add null character into htmlbuffer, to demonstrate that
    transfers of buffers containing null characters actually work
 */
 htmlbuffer[8] = '\\0';
 /* Add simple name/content section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "name",
              CURLFORM_COPYCONTENTS, "content", CURLFORM_END); 
 /* Add simple name/content/contenttype section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "htmlcode",
              CURLFORM_COPYCONTENTS, "<HTML></HTML>",
              CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
 /* Add name/ptrcontent section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "name_for_ptrcontent",
              CURLFORM_PTRCONTENTS, buffer, CURLFORM_END);
 /* Add ptrname/ptrcontent section */
 curl_formadd(&post, &last, CURLFORM_PTRNAME, namebuffer,
 	      CURLFORM_PTRCONTENTS, buffer, CURLFORM_NAMELENGTH,
 	      namelength, CURLFORM_END);
 /* Add name/ptrcontent/contenttype section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "html_code_with_hole",
              CURLFORM_PTRCONTENTS, htmlbuffer,
              CURLFORM_CONTENTSLENGTH, htmlbufferlength,
              CURLFORM_CONTENTTYPE, "text/html", CURLFORM_END);
 /* Add simple file section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "picture",
              CURLFORM_FILE, "my-face.jpg", CURLFORM_END);
 /* Add file/contenttype section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "picture",
              CURLFORM_FILE, "my-face.jpg",
              CURLFORM_CONTENTTYPE, "image/jpeg", CURLFORM_END);
 /* Add two file section */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "pictures",
              CURLFORM_FILE, "my-face.jpg",
              CURLFORM_FILE, "your-face.jpg", CURLFORM_END);
 /* Add two file section using CURLFORM_ARRAY */
 forms[0].option = CURLFORM_FILE;
 forms[0].value  = file1;
 forms[1].option = CURLFORM_FILE;
 forms[1].value  = file2;
 forms[2].option  = CURLFORM_END;
 /* no option needed for the end marker */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "pictures",
              CURLFORM_ARRAY, forms, CURLFORM_END);
 /* Add the content of a file as a normal post text value */
 curl_formadd(&post, &last, CURLFORM_COPYNAME, "filecontent",
              CURLFORM_FILECONTENT, ".bashrc", CURLFORM_END);
 /* Set the form info */
 curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3), "
 .BR curl_formparse "(3) [deprecated], "
 .BR curl_formfree "(3)"
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_formfree.3
+++ b/docs/curl_formfree.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_formfree 3 "6 April 2001" "libcurl 7.7.1" "libcurl Manual"
 .SH NAME
@@ -12,12 +12,14 @@ curl_formfree - free a previously build multipart/formdata HTTP POST chain
 .ad
 .SH DESCRIPTION
 curl_formfree() is used to clean up data previously built/appended with
-curl_formparse(). This must be called when the data has been used, which
+curl_formadd()/curl_formparse(). This must be called when the data has
-typically means after the curl_easy_perform() has been called.
+been used, which typically means after the curl_easy_perform() has
 been called.
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
-.BR curl_formparse "(3) "
+.BR curl_formparse "(3) [deprecated], "
 .BR curl_formadd "(3) "
 .SH BUGS
 libcurl 7.7.1 and earlier versions does not allow a NULL pointer to be used as
 argument.
--- a/docs/curl_formparse.3
+++ b/docs/curl_formparse.3
@@ -1,10 +1,11 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
-.TH curl_formparse 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.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
+curl_formparse - add a section to a multipart/formdata HTTP POST:
 deprecated (use curl_formadd instead)
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
@@ -12,51 +13,6 @@ curl_formparse - add a section to a multipart/formdata HTTP POST
 .BI "struct HttpPost ** " lastitem ");"
 .ad
 .SH DESCRIPTION
-curl_formparse() is used to append sections when building a multipart/formdata
+This has been removed deliberately. The \fBcurl_formadd\fP has been introduced
-HTTP POST. Append one section at a time until you've added all the sections
+to replace this function. Do not use this. Convert to the new function
-you want included and then you pass the
+now. curl_formparse() will be removed from a future version of libcurl.
 .I firstitem
 pointer as parameter to CURLOPT_HTTPPOST.
 .I lastitem
 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.
 .I string
 must be a zero terminated string following the following syntax.
 .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 "SEE ALSO"
 .BR curl_easy_setopt "(3) "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_getdate.3
+++ b/docs/curl_getdate.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_getdate 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
--- a/docs/curl_getenv.3
+++ b/docs/curl_getenv.3
@@ -1,14 +1,14 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
-.TH curl_getenv 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.TH curl_getenv 3 "15 August 2001" "libcurl 7.8.1" "libcurl Manual"
 .SH NAME
 curl_getenv - return value for environment name
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "char *curl_getenv(char *" name ");
+.BI "char *curl_getenv(const char *" name ");
 .ad
 .SH DESCRIPTION
 curl_getenv() is a portable wrapper for the getenv() function, meant to
--- a/docs/curl_global_cleanup.3
+++ b/docs/curl_global_cleanup.3
@@ -0,0 +1,27 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_global_cleanup 3 "28 May 2001" "libcurl 7.8" "libcurl Manual"
 .SH NAME
 curl_global_cleanup - Global libcurl cleanup
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "void curl_global_cleanup(void);"
 .ad
 .SH DESCRIPTION
 curl_global_cleanup must be called once (no matter how many threads or libcurl
 sessions that'll be used) by every application that uses libcurl, after all
 uses of libcurl is complete.
 This is the opposite of \fIcurl_global_init\fP.
 Not calling this function may result in memory leaks.
 This function was added in libcurl 7.8.
 .SH "SEE ALSO"
 .BR curl_global_init "(3), "
 .SH BUGS
 None?
--- a/docs/curl_global_init.3
+++ b/docs/curl_global_init.3
@@ -0,0 +1,49 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_global_init 3 "13 Nov 2001" "libcurl 7.9.1" "libcurl Manual"
 .SH NAME
 curl_global_init - Global libcurl initialisation
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode curl_global_init(long " flags ");"
 .ad
 .SH DESCRIPTION
 This function should only be called once (no matter how many threads or
 libcurl sessions that'll be used) by every application that uses libcurl.
 If this function hasn't been invoked when \fIcurl_easy_init\fP is called, it
 will be done automatically by libcurl.
 The flags option is a bit pattern that tells libcurl exact what features to
 init, as described below. Set the desired bits by ORing the values together.
 You must however \fBalways\fP use the \fIcurl_global_cleanup\fP function, as
 that cannot be called automatically for you by libcurl.
 Calling this function more than once will cause unpredictable results.
 This function was added in libcurl 7.8.
 .SH FLAGS
 .TP 5
 .B CURL_GLOBAL_ALL
 Initialize everything possible. This sets all known bits.
 .TP
 .B CURL_GLOBAL_SSL
 Initialize SSL
 .TP
 .B CURL_GLOBAL_WIN32
 Initialize the Win32 socket libraries. (added in libcurl 7.8.1)
 .TP
 .B CURL_GLOBAL_NOTHING
 Initialise nothing extra. This sets no bit.
 .SH RETURN VALUE
 If this function returns non-zero, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_global_cleanup "(3), "
 .SH BUGS
 None.
--- a/docs/curl_mprintf.3
+++ b/docs/curl_mprintf.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_printf 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
 .SH NAME
--- a/docs/curl_slist_append.3
+++ b/docs/curl_slist_append.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_slist_append 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
@@ -8,7 +8,7 @@ curl_slist_append - add a string to an slist
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "struct curl_slist *curl_slist_append(struct curl_slit *" list,
+.BI "struct curl_slist *curl_slist_append(struct curl_slist *" list,
 .BI "const char * "string ");"
 .ad
 .SH DESCRIPTION
--- a/docs/curl_slist_free_all.3
+++ b/docs/curl_slist_free_all.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_slist_free_all 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
--- a/docs/curl_strequal.3
+++ b/docs/curl_strequal.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_strequal 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
 .SH NAME
@@ -25,6 +25,6 @@ These functions are provided by libcurl to enable applications to compare
 strings in a truly portable manner. There are no standard portable case
 insensitive string comparison functions. These two works on all platforms.
 .SH RETURN VALUE
-A pointer to a zero terminated string.
+Non-zero if the strings are identical. Zero if they're not.
 .SH "SEE ALSO"
 .BR strcmp "(3), " strcasecmp "(3)"
--- a/docs/curl_unescape.3
+++ b/docs/curl_unescape.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_unescape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
--- a/docs/curl_version.3
+++ b/docs/curl_version.3
@@ -1,6 +1,6 @@
 .\" You can view this file with:
 .\" nroff -man [file]
-.\" Written by daniel@haxx.se
+.\" $Id$
 .\"
 .TH curl_version 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -4,9 +4,10 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-EXTRA_DIST = 
+EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit.c postit2.c \
-	README curlgtk.c sepheaders.c simple.c postit.c \
+	     win32sockets.c persistant.c ftpget.c Makefile.example \
-	win32sockets.c persistant.c ftpget.c Makefile.example
+	     multithread.c getinmemory.c ftpupload.c httpput.c \
 	     simplessl.c ftpgetresp.c
 all:
 	@echo "done"
--- a/docs/examples/Makefile.example
+++ b/docs/examples/Makefile.example
@@ -30,6 +30,7 @@ LDFLAGS = -L/home/dast/lib -L/usr/local/ssl/lib
 # We need -lsocket and -lnsl when on Solaris
 # We need -lssl and -lcrypto when using libcurl with SSL support
 # We need -ldl for dlopen() if that is in libdl
 # We need -lpthread for the pthread example
 LIBS = -lcurl -lsocket -lnsl -lssl -lcrypto -dl
 # Link the target with all objects and libraries
--- 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/ftpupload.c
+++ b/docs/examples/ftpupload.c
@@ -0,0 +1,88 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 /*
 * This example shows an FTP upload, with a rename of the file just after
 * a successful upload.
 *
 * Example based on source code provided by Erick Nuwendam. Thanks!
 */
 #define LOCAL_FILE      "/tmp/uploadthis.txt"
 #define UPLOAD_FILE_AS  "while-uploading.txt"
 #define REMOTE_URL      "ftp://localhost/"  UPLOAD_FILE_AS
 #define RENAME_FILE_TO  "renamed-and-fine.txt"
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *ftpfile;
  FILE * hd_src ;
  int hd ;
  struct stat file_info;
  struct curl_slist *headerlist=NULL;
  char buf_1 [] = "RNFR " UPLOAD_FILE_AS;
  char buf_2 [] = "RNTO " RENAME_FILE_TO;
  /* get the file size of the local file */
  hd = open(LOCAL_FILE, O_RDONLY) ;
  fstat(hd, &file_info);
  close(hd) ;
  /* get a FILE * of the same file, could also be made with
     fdopen() from the previous descriptor, but hey this is just 
     an example! */
  hd_src = fopen(LOCAL_FILE, "rb");
  /* In windows, this will init the winsock stuff */
  curl_global_init(CURL_GLOBAL_ALL);
  /* get a curl handle */
  curl = curl_easy_init();
  if(curl) {
    /* build a list of commands to pass to libcurl */
    headerlist = curl_slist_append(headerlist, buf_1);
    headerlist = curl_slist_append(headerlist, buf_2);
    /* enable uploading */
    curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
    /* specify target */
    curl_easy_setopt(curl,CURLOPT_URL, REMOTE_URL);
    /* pass in that last of FTP commands to run after the transfer */
    curl_easy_setopt(curl, CURLOPT_POSTQUOTE, headerlist);
    /* now specify which file to upload */
    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
    /* and give the size of the upload (optional) */
    curl_easy_setopt(curl, CURLOPT_INFILESIZE, file_info.st_size);
    /* Now run off and do what you've been told! */
    res = curl_easy_perform(curl);
    /* clean up the FTP commands list */
    curl_slist_free_all (headerlist);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  fclose(hd_src); /* close the local file */
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/getinmemory.c
+++ b/docs/examples/getinmemory.c
@@ -0,0 +1,80 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * Example source code to show how the callback function can be used to
 * download data into a chunk of memory instead of storing it in a file.
 *
 * 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>
 struct MemoryStruct {
  char *memory;
  size_t size;
 };
 size_t
 WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
 {
  register int realsize = size * nmemb;
  struct MemoryStruct *mem = (struct MemoryStruct *)data;
  mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
  if (mem->memory) {
    memcpy(&(mem->memory[mem->size]), ptr, realsize);
    mem->size += realsize;
    mem->memory[mem->size] = 0;
  }
  return realsize;
 }
 int main(int argc, char **argv)
 {
  CURL *curl_handle;
  struct MemoryStruct chunk;
  chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
  chunk.size = 0;    /* no data at this point */
  /* init the curl session */
  curl_handle = curl_easy_init();
  /* specify URL to get */
  curl_easy_setopt(curl_handle, CURLOPT_URL, "http://cool.haxx.se/");
  /* send all data to this function  */
  curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
  /* we pass our 'chunk' struct to the callback function */
  curl_easy_setopt(curl_handle, CURLOPT_FILE, (void *)&chunk);
  /* get it! */
  curl_easy_perform(curl_handle);
  /* cleanup curl stuff */
  curl_easy_cleanup(curl_handle);
  /*
   * Now, our chunk.memory points to a memory block that is chunk.size
   * bytes big and contains the remote file.
   *
   * Do something nice with it!
   */
  return 0;
 }
--- a/docs/examples/httpput.c
+++ b/docs/examples/httpput.c
@@ -0,0 +1,100 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <curl/curl.h>
 /*
 * This example shows a HTTP PUT operation. PUTs a file given as a command
 * line argument to the URL also given on the command line.
 *
 * This example also uses its own read callback.
 */
 size_t read_callback(void *ptr, size_t size, size_t nmemb, void *stream)
 {
  size_t retcode;
  /* in real-world cases, this would probably get this data differently
     as this fread() stuff is exactly what the library already would do
     by default internally */
  retcode = fread(ptr, size, nmemb, stream);
  fprintf(stderr, "*** We read %d bytes from file\n", retcode);
  return retcode;
 }
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *ftpfile;
  FILE * hd_src ;
  int hd ;
  struct stat file_info;
  char *file;
  char *url;
  if(argc < 3)
    return 1;
  file= argv[1];
  url = argv[2];
  /* get the file size of the local file */
  hd = open(file, O_RDONLY) ;
  fstat(hd, &file_info);
  close(hd) ;
  /* get a FILE * of the same file, could also be made with
     fdopen() from the previous descriptor, but hey this is just 
     an example! */
  hd_src = fopen(file, "rb");
  /* In windows, this will init the winsock stuff */
  curl_global_init(CURL_GLOBAL_ALL);
  /* get a curl handle */
  curl = curl_easy_init();
  if(curl) {
    /* we want to use our own read function */
    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
    /* enable uploading */
    curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
    /* HTTP PUT please */
    curl_easy_setopt(curl, CURLOPT_PUT, TRUE);
    /* specify target */
    curl_easy_setopt(curl,CURLOPT_URL, url);
    /* now specify which file to upload */
    curl_easy_setopt(curl, CURLOPT_INFILE, hd_src);
    /* and give the size of the upload (optional) */
    curl_easy_setopt(curl, CURLOPT_INFILESIZE, file_info.st_size);
    /* Now run off and do what you've been told! */
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  fclose(hd_src); /* close the local file */
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/multithread.c
+++ b/docs/examples/multithread.c
@@ -0,0 +1,70 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 /* A multi-threaded example that uses pthreads extensively to fetch
 * X remote files at once */
 #include <stdio.h>
 #include <pthread.h>
 #include <curl/curl.h>
 /* silly list of test-URLs */
 char *urls[]= {
  "http://curl.haxx.se/",
  "ftp://cool.haxx.se/",
  "http://www.contactor.se/",
  "www.haxx.se"
 };
 void *pull_one_url(void *url)
 {
  CURL *curl;
  curl = curl_easy_init();
  curl_easy_setopt(curl, CURLOPT_URL, url);
  curl_easy_perform(curl);
  curl_easy_cleanup(curl);
  return NULL;
 }
 /* 
   int pthread_create(pthread_t *new_thread_ID,
   const pthread_attr_t *attr,
   void * (*start_func)(void *), void *arg);
 */
 int main(int argc, char **argv)
 {
  pthread_t tid[4];
  int i;
  int error;
  for(i=0; i< 4; i++) {
    error = pthread_create(&tid[i],
                           NULL, /* default attributes please */
                           pull_one_url,
                           urls[i]);
    if(0 != error)
      fprintf(stderr, "Couldn't run thread number %d, errno %d\n", i, error);
    else 
      fprintf(stderr, "Thread %d, gets %s\n", i, urls[i]);
  }
  /* now wait for all threads to terminate */
  for(i=0; i< 4; i++) {
    error = pthread_join(tid[i], NULL);
    fprintf(stderr, "Thread %d terminated\n", i);
  }
  return 0;
 }
--- a/docs/examples/postit2.c
+++ b/docs/examples/postit2.c
@@ -0,0 +1,92 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  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 <string.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 #if LIBCURL_VERSION_NUM < 0x070900
 #error "curl_formadd() is not introduced until libcurl 7.9 and later"
 #endif
 int main(int argc, char *argv[])
 {
  CURL *curl;
  CURLcode res;
  struct HttpPost *formpost=NULL;
  struct HttpPost *lastptr=NULL;
  struct curl_slist *headerlist=NULL;
  char buf[] = "Expect:";
  /* Fill in the file upload field */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "sendfile",
               CURLFORM_FILE, "postit2.c",
               CURLFORM_END);
  /* Fill in the filename field */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "filename",
               CURLFORM_COPYCONTENTS, "postit2.c",
               CURLFORM_END);
  /* Fill in the submit field too, even if this is rarely needed */
  curl_formadd(&formpost,
               &lastptr,
               CURLFORM_COPYNAME, "submit",
               CURLFORM_COPYCONTENTS, "send",
               CURLFORM_END);
  curl = curl_easy_init();
  /* initalize custom header list (stating that Expect: 100-continue is not
     wanted */
  headerlist = curl_slist_append(headerlist, buf);
  if(curl) {
    /* what URL that receives this POST */
    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/examplepost.cgi");
    if ( (argc == 2) && (!strcmp(argv[1], "noexpectheader")) )
      /* only disable 100-continue header if explicitly requested */
      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
    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);
    /* free slist */
    curl_slist_free_all (headerlist);
  }
  return 0;
 }
--- a/docs/examples/sepheaders.c
+++ b/docs/examples/sepheaders.c
@@ -19,9 +19,9 @@
 #include <curl/types.h>
 #include <curl/easy.h>
-size_t  write_data(void *ptr, size_t size, size_t nmemb, FILE *stream)
+size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
 {
-  written = fwrite(ptr,size,nmemb,outfile);
+  written = fwrite(ptr, size, nmemb, (FILE *)stream);
  return written;
 }
--- a/docs/examples/simplessl.c
+++ b/docs/examples/simplessl.c
@@ -0,0 +1,110 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  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 !!
 */
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *headerfile;
  const char *pCertFile = "testcert.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);
       res = curl_easy_perform(curl);
       break;                   /* we are done... */
    }
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/win32sockets.c
+++ b/docs/examples/win32sockets.c
@@ -1,14 +1,23 @@
 /*
 * Note: This is only required if you use curl 7.8 or lower, later 
 * versions provide an option to curl_global_init() that does the
 * win32 initialization for you.
 */
 /*
 * These are example functions doing socket init that Windows
 * require. If you don't use windows, you can safely ignore this crap.
 */
-static void win32_cleanup(void)
+#include <windows.h>
 void win32_cleanup(void)
 {
  WSACleanup();
 }
-static CURLcode win32_init(void)
+int win32_init(void)
 {
  WORD wVersionRequested;  
  WSADATA wsaData; 
--- a/docs/index.html
+++ b/docs/index.html
@@ -0,0 +1,38 @@
 HTML>
 <HEAD>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <TITLE>Index to Curl documentation</TITLE>
 </HEAD>
 <BODY>
 <H1 ALIGN="CENTER">Index to Curl documentation</H1>
 <H2>Programs</H2>
 <P><A HREF="curl-config.html">curl-config.html</A>
 <P><A HREF="curl.html">curl.html</A>
 <H2>Library routines</H2>
 <P><A HREF="libcurl.html">libcurl.html</A>
 <P><A HREF="curl_easy_cleanup.html">curl_easy_cleanup.html</A>
 <P><A HREF="curl_easy_duphandle.html">curl_easy_duphandle.html</A>
 <P><A HREF="curl_easy_getinfo.html">curl_easy_getinfo.html</A>
 <P><A HREF="curl_easy_init.html">curl_easy_init.html</A>
 <P><A HREF="curl_easy_perform.html">curl_easy_perform.html</A>
 <P><A HREF="curl_easy_setopt.html">curl_easy_setopt.html</A>
 <P><A HREF="curl_escape.html">curl_escape.html</A>
 <P><A HREF="curl_formadd.html">curl_formadd.html</A>
 <P><A HREF="curl_formfree.html">curl_formfree.html</A>
 <P><A HREF="curl_formparse.html">curl_formparse.html</A>
 <P><A HREF="curl_getdate.html">curl_getdate.html</A>
 <P><A HREF="curl_getenv.html">curl_getenv.html</A>
 <P><A HREF="curl_global_cleanup.html">curl_global_cleanup.html</A>
 <P><A HREF="curl_global_init.html">curl_global_init.html</A>
 <P><A HREF="curl_mprintf.html">curl_mprintf.html</A>
 <P><A HREF="curl_slist_append.html">curl_slist_append.html</A>
 <P><A HREF="curl_slist_free_all.html">curl_slist_free_all.html</A>
 <P><A HREF="curl_strequal.html">curl_strequal.html</A>
 <P><A HREF="curl_strnequal.html">curl_strnequal.html</A>
 <P><A HREF="curl_unescape.html">curl_unescape.html</A>
 <P><A HREF="curl_version.html">curl_version.html</A>
 </BODY>
 </HTML>
--- a/docs/libcurl.3
+++ b/docs/libcurl.3
@@ -1,8 +1,8 @@
 .\" You can view this file with:
-.\" nroff -man libcurl.5
+.\" nroff -man [file]
-.\" Written by Daniel Stenberg
+.\" $Id$
 .\"
-.TH libcurl 5 "20 April 2001" "libcurl 7.7.2" "libcurl overview"
+.TH libcurl 5 "14 August 2001" "libcurl 7.8.1" "libcurl overview"
 .SH NAME
 libcurl \- client-side URL transfers
 .SH DESCRIPTION
@@ -12,30 +12,30 @@ specific man pages for each function mentioned in here.
 libcurl can also be used directly from within your Java, PHP, Perl, Ruby or
 Tcl programs as well, look elsewhere for documentation on this!
-When using libcurl's easy interface, you init your session and get a handle,
+All applications that use libcurl should call \fIcurl_global_init()\fP exactly
-which you use as input to the following interface functions you use. Use
+once before any libcurl function can be used. After all usage of libcurl is
-.B curl_easy_init()
+complete, it \fBmust\fP call \fIcurl_global_cleanup()\fP. In between those two
 calls, you can use libcurl as described below.
 When using libcurl you init your session and get a handle, which you use as
 input to the following interface functions you use. Use \fIcurl_easy_init()\fP
 to get the handle.
 You continue by setting all the options you want in the upcoming transfer,
 most important among them is the URL itself (you can't transfer anything
 without a specified URL as you may have figured out yourself). You might want
 to set some callbacks as well that will be called from the library when data
-is available etc.
+is available etc.  \fIcurl_easy_setopt()\fP is there for this.
 .B curl_easy_setopt()
 is there for this.
 When all is setup, you tell libcurl to perform the transfer using
-.B curl_easy_perform().
+\fIcurl_easy_perform()\fP.  It will then do the entire operation and won't
-It will then do the entire operation and won't return until it is done
+return until it is done (successfully or not).
 (successfully or not).
 After the transfer has been made, you can set new options and make another
 transfer, or if you're done, cleanup the session by calling
-.B curl_easy_cleanup().
+\fIcurl_easy_cleanup()\fP.  If you want persistant connections, you don't
-If you want persistant connections, you don't cleanup immediately, but instead
+cleanup immediately, but instead run ahead and perform other transfers using
-run ahead and perform other transfers using the same handle. See the chapter
+the same handle. See the chapter below for Persistant Connections.
 below for Persistant Connections.
 There is also a series of other helpful functions to use. They are:
@@ -53,17 +53,26 @@ portable environment variable reader
 .B curl_easy_getinfo()
 get information about a performed transfer
 .TP
-.B curl_formparse()
+.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()
+free a list built with curl_formparse()/curl_formadd()
 .TP
 .B curl_slist_append()
 builds a linked list
 .TP
 .B curl_slist_free_all()
 frees a whole curl_slist
 .TP
 .B curl_mprintf()
 portable printf() functions
 .TP
 .B curl_strequal()
 portable case insensitive string comparisons
 .RE
 .SH "LINKING WITH LIBCURL"
@@ -95,7 +104,7 @@ you to init the winsock stuff before you use the libcurl functions. Details on
 this are noted on the curl_easy_init() man page.
 (*) = it appears as if users of the cygwin environment get this done
-automatically.
+automatically, also libcurl 7.8.1 and later can handle this for you.
 .SH "THREADS"
 Never ever call curl-functions simultaneously using the same handle from
 several threads. libcurl is thread-safe and can be used in any number of
@@ -120,5 +129,5 @@ Note that the options set with curl_easy_setopt() will be used in on every
 repeat curl_easy_perform() call
 .SH "COMPATIBILITY WITH OLDER LIBCURLS"
 Repeated curl_easy_perform() calls on the same handle were not supported in
-pre-7.7 versions, and caused confusion and defined behaviour.
+pre-7.7 versions, and caused confusion and undefined behaviour.
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * 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.
@@ -58,13 +58,20 @@ extern "C" {
 struct HttpPost {
  struct HttpPost *next; /* next entry in the list */
  char *name;     /* pointer to allocated name */
  long namelength; /* length of name length */
  char *contents; /* pointer to allocated data contents */
  long contentslength; /* length of contents field */
  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 */
 #define HTTPPOST_FILENAME (1<<0) /* specified content is a file name */
 #define HTTPPOST_READFILE (1<<1) /* specified content is a file name */
 #define HTTPPOST_PTRNAME (1<<2) /* name is only stored pointer
                                   do not free in formfree */
 #define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
                                       do not free in formfree */
 };
 typedef int (*curl_progress_callback)(void *clientp,
@@ -76,15 +83,15 @@ typedef int (*curl_progress_callback)(void *clientp,
 typedef size_t (*curl_write_callback)(char *buffer,
                                      size_t size,
                                      size_t nitems,
-                                      FILE *outstream);
+                                      void *outstream);
 typedef size_t (*curl_read_callback)(char *buffer,
                                     size_t size,
                                     size_t nitems,
-                                     FILE *instream);
+                                     void *instream);
 typedef int (*curl_passwd_callback)(void *clientp,
-                                    char *prompt,
+                                    const char *prompt,
                                    char *buffer,
                                    int buflen);
@@ -146,11 +153,20 @@ typedef enum {
  CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */
  CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */
  CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */
-  CURLE_ALREADY_COMPLETE,	 /* 50 - file to dowload is already complete */
+  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;
 /* this was the error code 50 in 7.7.3 and a few earlier versions, this
   is no longer used by libcurl but is instead #defined here only to not
   make programs break */
 #define CURLE_ALREADY_COMPLETE 99999
 /* This is just to make older programs not break: */
 #define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
@@ -173,7 +189,7 @@ typedef enum {
 typedef enum {
  CINIT(NOTHING, LONG, 0), /********* the first one is unused ************/
-  /* This is the FILE * the regular output should be written to. */
+  /* This is the FILE * or void * the regular output should be written to. */
  CINIT(FILE, OBJECTPOINT, 1),
  /* The full URL to get/put */
@@ -199,10 +215,8 @@ typedef enum {
     in the CURLOPT_FLAGS to activate this */
  CINIT(RANGE, OBJECTPOINT, 7),
-#if 0
+  /* not used */
-  /* Configuration flags */
+
  CINIT(FLAGS, LONG, 8),
 #endif
  /* Specified file stream to upload from (use as input): */
  CINIT(INFILE, OBJECTPOINT, 9),
@@ -267,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),
@@ -276,20 +292,16 @@ typedef enum {
  /* send linked-list of QUOTE commands */
  CINIT(QUOTE, OBJECTPOINT, 28),
-  /* send FILE * to store headers to */
+  /* send FILE * or void * to store headers to, if you use a callback it
     is simply passed to the callback unmodified */
  CINIT(WRITEHEADER, OBJECTPOINT, 29),
 #ifdef MULTIDOC
  /* send linked list of MoreDoc structs */
  CINIT(MOREDOCS, OBJECTPOINT, 30),
 #endif
  /* point to a file to read the initial cookies from, also enables
     "cookie awareness" */
  CINIT(COOKIEFILE, OBJECTPOINT, 31),
  /* What version to specifly try to use.
-     3 = SSLv3, 2 = SSLv2, all else makes it try v3 first then v2 */
+     See CURL_SSLVERSION defines below. */
  CINIT(SSLVERSION, LONG, 32),
  /* What kind of HTTP time condition to use, see defines */
@@ -312,11 +324,8 @@ typedef enum {
  /* HTTP request, for odd commands like DELETE, TRACE and others */
  CINIT(STDERR, OBJECTPOINT, 37),
-#if 0
+  /* 38 is not used */
-  /* Progress mode set alternative progress mode displays. Alternative
+
     ones should now be made by the client, not the lib! */     
  CINIT(PROGRESSMODE, LONG, 38),
 #endif
  /* send linked-list of post-transfer QUOTE commands */
  CINIT(POSTQUOTE, OBJECTPOINT, 39),
@@ -344,7 +353,8 @@ typedef enum {
  CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
  CINIT(PUT, LONG, 54),          /* PUT the input file */
-  CINIT(MUTE, LONG, 55),         /* force NOPROGRESS */
+
  CINIT(MUTE, LONG, 55),         /* OBSOLETE OPTION, removed in 7.8 */
  /* Function that will be called instead of the internal progress display
   * function. This function should be defined as the curl_progress_callback
@@ -435,9 +445,79 @@ typedef enum {
   * parameters will use fwrite() syntax, make sure to follow them. */
  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
  /* Set this to force the HTTP request to get back to GET. Only really usable
     if POST, PUT or a custom request have been used first.
   */
  CINIT(HTTPGET, LONG, 80),
  /* Set if we should verify the Common name from the peer certificate in ssl
   * handshake, set 1 to check existence, 2 to ensure that it matches the
   * provided hostname. */
  CINIT(SSL_VERIFYHOST, LONG, 81),
  /* Specify which file name to write all known cookies in after completed
     operation. Set file name to "-" (dash) to make it go to stdout. */
  CINIT(COOKIEJAR, OBJECTPOINT, 82),
  /* Specify which SSL ciphers to use */
  CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
  /* Specify which HTTP version to use! This must be set to one of the
     CURL_HTTP_VERSION* enums set below. */
  CINIT(HTTP_VERSION, LONG, 84),
  /* Specificly switch on or off the FTP engine's use of the EPSV command. By
     default, that one will always be attempted before the more traditional
     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),
  CURLOPT_LASTENTRY /* the last unusued */
 } CURLoption;
  /* These enums are for use with the CURLOPT_HTTP_VERSION option. */
 enum {
  CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd
                             like the library to choose the best possible
                             for us! */
  CURL_HTTP_VERSION_1_0,  /* please use HTTP 1.0 in the request */
  CURL_HTTP_VERSION_1_1,  /* please use HTTP 1.1 in the request */
  CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
 };
 enum {
  CURL_SSLVERSION_DEFAULT,
  CURL_SSLVERSION_TLSv1,
  CURL_SSLVERSION_SSLv2,
  CURL_SSLVERSION_SSLv3,
  CURL_SSLVERSION_LAST /* never use, keep last */
 };
 typedef enum {
  TIMECOND_NONE,
@@ -446,7 +526,7 @@ typedef enum {
  TIMECOND_LASTMOD,
  TIMECOND_LAST
-} TimeCond;
+} curl_TimeCond;
 #ifdef __BEOS__
 #include <support/SupportDefs.h>
@@ -470,24 +550,71 @@ int curl_formparse(char *string,
                   struct HttpPost **httppost,
                   struct HttpPost **last_post);
 /* name is uppercase CURLFORM_<name> */
 #ifdef CFINIT
 #undef CFINIT
 #endif
 #define CFINIT(name) CURLFORM_ ## name
 typedef enum {
  CFINIT(NOTHING),        /********* the first one is unused ************/
  /*  */
  CFINIT(COPYNAME),
  CFINIT(PTRNAME),
  CFINIT(NAMELENGTH),
  CFINIT(COPYCONTENTS),
  CFINIT(PTRCONTENTS),
  CFINIT(CONTENTSLENGTH),
  CFINIT(FILECONTENT),
  CFINIT(ARRAY),
  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 */
  CURLFORM_LASTENTRY /* the last unusued */
 } CURLformoption;
 /* structure to be used as parameter for CURLFORM_ARRAY */
 struct curl_forms {
 	CURLformoption		option;
 	const char		*value;
 };
 /* new external form function */
 int curl_formadd(struct HttpPost **httppost,
                 struct HttpPost **last_post,
                 ...);
 /* cleanup a form: */
 void curl_formfree(struct HttpPost *form);
 /* Unix and Win32 getenv function call, this returns a malloc()'ed string that
   MUST be free()ed after usage is complete. */
-char *curl_getenv(char *variable);
+char *curl_getenv(const char *variable);
 /* Returns a static ascii string of the libcurl version. */
 char *curl_version(void);
 /* Escape and unescape URL encoding in strings. The functions return a new
 * allocated string or NULL if an error occurred.  */
-char *curl_escape(char *string, int length);
+char *curl_escape(const char *string, int length);
-char *curl_unescape(char *string, int length);
+char *curl_unescape(const char *string, int length);
 /* curl_global_init() should be invoked exactly once for each application that
   uses libcurl */
 CURLcode curl_global_init(long flags);
 /* curl_global_cleanup() should be invoked exactly once for each application
   that uses libcurl */
 void curl_global_cleanup(void);
 /* This is the version number */
-#define LIBCURL_VERSION "7.7.2"
+#define LIBCURL_VERSION "7.9.3-pre1"
-#define LIBCURL_VERSION_NUM 0x070702
+#define LIBCURL_VERSION_NUM 0x070903
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
@@ -537,7 +664,9 @@ typedef enum {
  CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
  CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
-  CURLINFO_LASTONE          = 17
+  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
  CURLINFO_LASTONE          = 18
 } CURLINFO;
 /* unfortunately, the easy.h include file needs the options and info stuff
@@ -556,6 +685,11 @@ typedef enum {
  CURLCLOSEPOLICY_LAST /* last, never use this */
 } curl_closepolicy;
 #define CURL_GLOBAL_SSL (1<<0)
 #define CURL_GLOBAL_WIN32 (1<<1)
 #define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
 #define CURL_GLOBAL_NOTHING 0
 #define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL
 #ifdef  __cplusplus
 }
--- a/include/curl/easy.h
+++ b/include/curl/easy.h
@@ -46,6 +46,21 @@ void curl_easy_cleanup(CURL *curl);
 */
 CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
 /*
 * NAME curl_easy_duphandle()
 *
 * DESCRIPTION
 *
 * Creates a new curl session handle with the same options set for the handle
 * passed in. Duplicating a handle could only be a matter of cloning data and
 * options, internal state info and things like persistant connections cannot
 * be transfered. It is useful in multithreaded applications when you can run
 * curl_easy_duphandle() for each new thread to avoid a series of identical
 * curl_easy_setopt() invokes in every thread.
 */
 CURL* curl_easy_duphandle(CURL *curl);
 #ifdef  __cplusplus
 }
 #endif
--- a/include/curl/mprintf.h
+++ b/include/curl/mprintf.h
@@ -54,6 +54,7 @@
 #define H_MPRINTF
 #include <stdarg.h>
 #include <stdio.h> /* needed for FILE */
 int curl_mprintf(const char *format, ...);
 int curl_mfprintf(FILE *fd, const char *format, ...);
--- a/java/CurlGlue.java
+++ b/java/CurlGlue.java
@@ -1,134 +0,0 @@
 /**
 * The curl class is a JNI wrapper for libcurl. Please bear with me, I'm no
 * true java dude (yet). Improve what you think is bad and send me the
 * updates!
 * daniel@haxx.se
 *
 * This is meant as a raw, crude and low-level interface to libcurl. If you
 * want fancy stuff, build upon this.
 */
 public class CurlGlue
 {
  // start of imported generated list, make a new list with
  // define2java.pl on demand
  public static final int CURLOPT_NOTHING  = 0;
  public static final int CURLOPT_FILE  = 10001;
  public static final int CURLOPT_URL  = 10002;
  public static final int CURLOPT_PORT  = 3;
  public static final int CURLOPT_PROXY  = 10004;
  public static final int CURLOPT_USERPWD  = 10005;
  public static final int CURLOPT_PROXYUSERPWD  = 10006;
  public static final int CURLOPT_RANGE  = 10007;
  public static final int CURLOPT_INFILE  = 10009;
  public static final int CURLOPT_ERRORBUFFER  = 10010;
  public static final int CURLOPT_WRITEFUNCTION  = 20011;
  public static final int CURLOPT_READFUNCTION  = 20012;
  public static final int CURLOPT_TIMEOUT  = 13;
  public static final int CURLOPT_INFILESIZE  = 14;
  public static final int CURLOPT_POSTFIELDS  = 10015;
  public static final int CURLOPT_REFERER  = 10016;
  public static final int CURLOPT_FTPPORT  = 10017;
  public static final int CURLOPT_USERAGENT  = 10018;
  public static final int CURLOPT_LOW_SPEED_LIMIT  = 19;
  public static final int CURLOPT_LOW_SPEED_TIME  = 20;
  public static final int CURLOPT_RESUME_FROM  = 21;
  public static final int CURLOPT_COOKIE  = 10022;
  public static final int CURLOPT_HTTPHEADER  = 10023;
  public static final int CURLOPT_HTTPPOST  = 10024;
  public static final int CURLOPT_SSLCERT  = 10025;
  public static final int CURLOPT_SSLCERTPASSWD  = 10026;
  public static final int CURLOPT_CRLF  = 27;
  public static final int CURLOPT_QUOTE  = 10028;
  public static final int CURLOPT_WRITEHEADER  = 10029;
  public static final int CURLOPT_COOKIEFILE  = 10031;
  public static final int CURLOPT_SSLVERSION  = 32;
  public static final int CURLOPT_TIMECONDITION  = 33;
  public static final int CURLOPT_TIMEVALUE  = 34;
  public static final int CURLOPT_HTTPREQUEST  = 10035;
  public static final int CURLOPT_CUSTOMREQUEST  = 10036;
  public static final int CURLOPT_STDERR  = 10037;
  public static final int CURLOPT_POSTQUOTE  = 10039;
  public static final int CURLOPT_WRITEINFO  = 10040;
  public static final int CURLOPT_VERBOSE  = 41;
  public static final int CURLOPT_HEADER  = 42;
  public static final int CURLOPT_NOPROGRESS  = 43;
  public static final int CURLOPT_NOBODY  = 44;
  public static final int CURLOPT_FAILONERROR  = 45;
  public static final int CURLOPT_UPLOAD  = 46;
  public static final int CURLOPT_POST  = 47;
  public static final int CURLOPT_FTPLISTONLY  = 48;
  public static final int CURLOPT_FTPAPPEND  = 50;
  public static final int CURLOPT_NETRC  = 51;
  public static final int CURLOPT_FOLLOWLOCATION  = 52;
  public static final int CURLOPT_FTPASCII  = 53;
  public static final int CURLOPT_TRANSFERTEXT  = 53;
  public static final int CURLOPT_PUT  = 54;
  public static final int CURLOPT_MUTE  = 55;
  public static final int CURLOPT_PROGRESSFUNCTION  = 20056;
  public static final int CURLOPT_PROGRESSDATA  = 10057;
  public static final int CURLOPT_AUTOREFERER  = 58;
  public static final int CURLOPT_PROXYPORT  = 59;
  public static final int CURLOPT_POSTFIELDSIZE  = 60;
  public static final int CURLOPT_HTTPPROXYTUNNEL  = 61;
  public static final int CURLOPT_INTERFACE  = 10062;
  public static final int CURLOPT_KRB4LEVEL  = 10063;
  public static final int CURLOPT_SSL_VERIFYPEER  = 64;
  public static final int CURLOPT_CAINFO  = 10065;
  public static final int CURLOPT_PASSWDFUNCTION  = 20066;
  public static final int CURLOPT_PASSWDDATA  = 10067;
  public static final int CURLOPT_MAXREDIRS  = 68;
  public static final int CURLOPT_FILETIME  = 10069;
  public static final int CURLOPT_TELNETOPTIONS  = 10070;
  public static final int CURLOPT_MAXCONNECTS  = 71;
  public static final int CURLOPT_CLOSEPOLICY  = 72;
  public static final int CURLOPT_CLOSEFUNCTION  = 20073;
  public static final int CURLOPT_FRESH_CONNECT  = 74;
  public static final int CURLOPT_FORBID_REUSE  = 75;
  public static final int CURLOPT_RANDOM_FILE  = 10076;
  public static final int CURLOPT_EGDSOCKET  = 10077;
  public static final int CURLOPT_CONNECTTIMEOUT  = 78;
  public static final int CURLOPT_HEADERFUNCTION  = 20079;
  // end of generated list
  public CurlGlue() {
    javacurl_handle = jni_init();
  }
  public void finalize() {
    jni_cleanup(javacurl_handle);
  }
  private int javacurl_handle;
  /* constructor and destructor for the libcurl handle */
  private native int jni_init();
  private native void jni_cleanup(int javacurl_handle);
  private native synchronized int jni_perform(int javacurl_handle);
    // Instead of varargs, we have different functions for each
  // kind of type setopt() can take
  private native int jni_setopt(int libcurl, int option, String value);
  private native int jni_setopt(int libcurl, int option, int value);
  private native int jni_setopt(int libcurl, int option, CurlWrite value);
  public native int getinfo();
  public int perform() {
    return jni_perform(javacurl_handle);
  }
  public int setopt(int option, int value) {
    return jni_setopt(javacurl_handle, option, value);
  }
  public int setopt(int option, String value) {
    return jni_setopt(javacurl_handle, option, value);
  }
  public int setopt(int option, CurlWrite value) {
    return jni_setopt(javacurl_handle, option, value);
  }
  static {
    System.loadLibrary("javacurl");
  }
 }
--- a/java/CurlWrite.java
+++ b/java/CurlWrite.java
@@ -1,9 +0,0 @@
 public interface CurlWrite
 {
  /**
   * handleString gets called by libcurl on each chunk of data
   * we receive from the remote server
   */
  public int handleString(byte s[]);
 }
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,35 +0,0 @@
 TARGET = libjavacurl.so
 OBJS = javacurl.o
 CC = gcc
 CFLAGS = -c
 CPPFLAGS = -I/usr/j2se/include -I/usr/local/include -I/usr/j2se/include/solaris
 # Linux might use -shared -Wl,-soname,libnative.so instead of -G
 LDFLAGS = -G -lcurl -ldl -L/usr/local/ssl/lib -lssl -lcrypto
 all: CurlGlue.h CurlGlue.class javacurl.o $(TARGET) test.class
 test:
 	java test
 javacurl.o: javacurl.c CurlGlue.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) $<
 CurlGlue.h: CurlGlue.java CurlGlue.class
 	javah CurlGlue
 	touch CurlGlue.h
 test.class: CurlGlue.class javacurl.o
 	javac test.java
 CurlGlue.class: CurlGlue.java
 	javac $<
 $(TARGET): $(OBJS)
 	$(CC) -o $(TARGET) $(LDFLAGS) $(OBJS)
 clean:
 	rm -f javacurl.o CurlGlue.h CurlGlue.class
--- a/java/README
+++ b/java/README
@@ -1,13 +0,0 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
                                Java Interface
 This is very much work in progress and it does not work.
 The interface is not set yet, bring your suggestions!
 Feel free to grab the source files in here and help out!
--- a/java/define2java.pl
+++ b/java/define2java.pl
@@ -1,22 +0,0 @@
 #!/usr/bin/perl
 open(GCC, "gcc -E ../include/curl/curl.h|");
 while(<GCC>) {
    if($_ =~ /(CURLOPT_(.*)) += (.*)/) {
        $var= $1;
        $expr = $3;
        $f=$3;
        if($expr =~ / *(\d+) *\+ *(\d+)/) {
            $expr = $1+$2;
        }
        # nah, keep the CURL prefix to make them look like other
        # languages' defines
        # $var =~ s/^CURL//g;
        print "  public static final int $var = $expr;\n";
    }
 }
 close(GCC);
--- a/java/javacurl.c
+++ b/java/javacurl.c
@@ -1,196 +0,0 @@
 #include <curl/curl.h> /* libcurl header */
 #include "CurlGlue.h"  /* the JNI-generated glue header file */
 /*
 * This is a private struct allocated for every 'CurlGlue' object.
 */
 struct javacurl {
  void *libcurl;
  void *whatever;
  struct writecallback {
    jmethodID mid;
    JNIEnv *java;
    jclass cls; /* global reference */
    jobject object;
  } write;
 };
 JNIEXPORT jint JNICALL Java_CurlGlue_jni_1init(JNIEnv *java,
                                               jobject myself)
 {
  void *libhandle;
  struct javacurl *jcurl=NULL;
  libhandle = curl_easy_init();
  if(libhandle) {
    jcurl=(struct javacurl *)malloc(sizeof(struct javacurl));
    if(jcurl) {
      memset(jcurl, 0, sizeof(struct javacurl));
      jcurl->libcurl = libhandle;
    }
    else {
      curl_easy_cleanup(libhandle);
      return (jint)0;
    }
  }
  return (jint) jcurl; /* nasty typecast */
 }
 JNIEXPORT void JNICALL Java_CurlGlue_jni_1cleanup(JNIEnv *java,
                                                  jobject myself,
                                                  jint jcurl)
 {
  struct javacurl *curl = (struct javacurl*)jcurl;
  if(curl->write.cls) {
    /* a global reference we must delete */
    (*java)->DeleteGlobalRef(java, curl->write.cls);
    (*java)->DeleteGlobalRef(java, curl->write.object);
  }
  curl_easy_cleanup(curl->libcurl); /* cleanup libcurl stuff */
  free((void *)curl); /* free the struct too */
 }
 /*
 * setopt() int + string
 */
 JNIEXPORT jint JNICALL Java_CurlGlue_jni_1setopt__IILjava_lang_String_2
  (JNIEnv *java, jobject myself, jint jcurl, jint option, jstring value)
 {
  /* get the actual string C-style */
  const char *str = (*java)->GetStringUTFChars(java, value, 0);
  void *handle = (void *)((struct javacurl*)jcurl)->libcurl;
  puts("setopt int + string");
  return (jint)curl_easy_setopt(handle, (CURLoption)option, str);
 }
 /*
 * setopt() int + int 
 */
 JNIEXPORT jint JNICALL Java_CurlGlue_jni_1setopt__III
  (JNIEnv *java, jobject myself, jint jcurl, jint option, jint value)
 {
  void *handle = (void *)((struct javacurl*)jcurl)->libcurl;
  CURLoption opt = (CURLoption)option;
  puts("setopt int + int");
  switch(opt) {
  case CURLOPT_FILE:
    /* silently ignored, we don't need user-specified callback data when
       we have an object, and besides the CURLOPT_FILE is not exported
       to the java interface */
    return 0;
  }
  return (jint)curl_easy_setopt(handle, (CURLoption)option, value);
 }
 static int javacurl_write_callback(void *ptr,
                                   size_t size,
                                   size_t nmemb,
                                   FILE  *stream)
 {
  struct javacurl *curl = (struct javacurl *)stream;
  size_t realsize = size * nmemb;
  JNIEnv *java = curl->write.java;
  jbyteArray jb=NULL;
  int ret=0;
  fprintf(stderr, "%d bytes data received in callback:\n"
          "ptr=%p, java=%p cls=%p\n",
          realsize, curl, java, curl->write.cls);
  jb=(*java)->NewByteArray(java, realsize);
  (*java)->SetByteArrayRegion(java, jb, 0, 
                              realsize, (jbyte *)ptr);
  fprintf(stderr, "created byte-array\n");
  ret = (*java)->CallIntMethod(java,
                               curl->write.object,
                               curl->write.mid,
                               jb);
  fprintf(stderr, "java-method returned %d\n", ret);
  return realsize;
 }
 /*
 * setopt() int + object
 */
 JNIEXPORT jint JNICALL Java_CurlGlue_jni_1setopt__IILCurlWrite_2
  (JNIEnv *java, jobject myself, jint jcurl, jint option, jobject object)
 {
  jclass cls_local = (*java)->GetObjectClass(java, object);
  jmethodID mid;
  struct javacurl *curl = (struct javacurl *)jcurl;
  jclass cls;
  jobject obj_global;
  switch(option) {
  case CURLOPT_WRITEFUNCTION:
    /* this makes a reference that'll be alive until we kill it! */
    cls = (*java)->NewGlobalRef(java, cls_local);
    printf("setopt int + object, option = %d cls= %p\n",
           option, cls);
    if(!cls) {
      puts("couldn't make local reference global");
      return 0;
    }
    /* this is the write callback */
    mid = (*java)->GetMethodID(java, cls, "handleString", "([B)I");
    if(!mid) {
      puts("no callback method found");
      return 0;
    }
    obj_global = (*java)->NewGlobalRef(java, object);
    curl->write.mid = mid;
    curl->write.cls = cls;
    curl->write.object = obj_global;
    /*curl->write.java = java; stored on perform */
    fprintf(stderr, "setopt write callback and write file pointer %p, java = %p\n",
            curl, java);
    curl_easy_setopt(curl->libcurl, CURLOPT_WRITEFUNCTION,
                     javacurl_write_callback);
    curl_easy_setopt(curl->libcurl, CURLOPT_FILE,
                     curl);
    break;
  }
  return 0;
 }
 JNIEXPORT jint JNICALL Java_CurlGlue_getinfo
  (JNIEnv *java, jobject value)
 {
    return 0;
 }
 JNIEXPORT jint JNICALL Java_CurlGlue_jni_1perform
  (JNIEnv *java, jobject myself, jint jcurl)
 {
  struct javacurl *curl=(struct javacurl*)jcurl;
  curl->write.java = java;
  return (jint)curl_easy_perform(curl->libcurl);
 }
--- a/java/test.java
+++ b/java/test.java
@@ -1,27 +0,0 @@
 import CurlGlue;
 import CurlWrite;
 class test implements CurlWrite {
    public int handleString(byte s[])
    {
        /* output everything */
        System.out.println("IIIIIIIIIII -------------- OOOOOOOOOOOOOOOOOOO");
        try {
          System.out.write(s);
        }
        catch (java.io.IOException moo) {
          // nothing
        }
        return 0;
    }
    public static void main(String[] args)
    {
        CurlGlue cg = new CurlGlue();
        test cw = new test();
        cg.setopt(CurlGlue.CURLOPT_URL, "http://www.contactor.se/");
        cg.setopt(CurlGlue.CURLOPT_WRITEFUNCTION, cw);
        cg.perform();
    }
 }
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -0,0 +1,6 @@
 *.la
 *.lo
 Makefile
 Makefile.in
 .deps
 .libs
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@
 # $Id$
 #
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign no-dependencies
 EXTRA_DIST = getdate.y \
       Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \
@@ -10,13 +10,10 @@ EXTRA_DIST = getdate.y \
 lib_LTLIBRARIES = libcurl.la
 # Some flags needed when trying to cause warnings ;-)
 # CFLAGS = -DMALLOCDEBUG -g # -Wall #-pedantic
 INCLUDES = -I$(top_srcdir)/include
-libcurl_la_LDFLAGS = -version-info 2:0:0
+libcurl_la_LDFLAGS = -no-undefined -version-info 2:2:0
 # This flag accepts an argument of the form current[:revision[:age]]. So,
 # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
 # 1.
@@ -57,9 +54,11 @@ getdate.h      ldap.c         ssluse.c       version.c \
 getenv.c       ldap.h         ssluse.h       \
 escape.c       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
-getinfo.c transfer.c strequal.c strequal.h easy.c \
+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
+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.b32
+++ b/lib/Makefile.b32
@@ -1,4 +1,6 @@
 ############################################################
 # $Id$
 #
 #  Makefile.b32 - Borland's C++ Compiler 5.X
 #
 #  'lib' directory
@@ -21,7 +23,7 @@ INCDIRS    = -I$(CURNTDIR);$(TOPDIR)/include/
 # 'BCCDIR' has to be set up in your c:\autoexec.bat
 # i.e. SET BCCDIR = c:\Borland\BCC55
 # where c:\Borland\BCC55 is the compiler is installed
-LINKLIB	   = $(BCCDIR)/lib/psdk/wsock32.lib
+LINKLIB	   = $(BCCDIR)/lib/psdk/ws2_32.lib
 LIBCURLLIB = libcurl.lib
 .SUFFIXES: .c
@@ -55,7 +57,9 @@ SOURCES	   = \
 	getinfo.c \
 	version.c \
 	easy.c \
-	strequal.c
+	strequal.c \
 	strtok.c \
 	connect.c
 OBJECTS = $(SOURCES:.c=.obj)
--- a/lib/Makefile.b32.resp
+++ b/lib/Makefile.b32.resp
@@ -26,4 +26,6 @@
 +getinfo.obj &
 +version.obj &
 +easy.obj &
-+strequal.obj
+strequal.obj &
 +strtok.obj &
 +connect.obj
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,4 +1,5 @@
 #############################################################
 #
 ## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
 ## optionally OpenSSL (0.9.6)
 ## Use: make -f Makefile.m32
@@ -10,7 +11,7 @@ CC = gcc
 AR = ar
 RANLIB = ranlib
 STRIP = strip -g
-OPENSSL_PATH = ../../openssl-0.9.6
+OPENSSL_PATH = ../../openssl-0.9.6b
 ########################################################
 ## Nothing more to do below this line!
@@ -33,13 +34,15 @@ libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
 	urldata.h transfer.c getdate.h ldap.c ssluse.c version.c transfer.h getenv.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
+	security.c krb4.h krb4.c memdebug.h memdebug.c inet_ntoa_r.h http_chunks.h http_chunks.c \
 	strtok.c connect.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
+	strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \
 	strtok.o connect.o
 LIBRARIES =  $(libcurl_a_LIBRARIES)
 SOURCES = $(libcurl_a_SOURCES)
@@ -58,7 +61,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
 libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
 	-@erase $@
-	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32
+	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32 -lws2_32
 	$(STRIP) $@
 # remove the last line above to keep debug info
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -1,358 +1,219 @@
 #############################################################
-## Makefile for building libcurl.lib with MSVC6
+#
-## Use: nmake -f makefile.vc6 [release | release-ssl | debug]
+# Makefile for building libcurl with MSVC6
-##      (default is release)
+#
-##
+# Usage: see usage message below
-## Comments to: Troy Engel <tengel@sonic.net>
+#        Should be invoked from \lib directory
-## Updated by: Craig Davison <cd@securityfocus.com>
+#        Edit the paths and desired library name
-## Updated by: SM <sm@technologist.com>
+#        SSL path is only required if you intend compiling
 #        with SSL.
 #
 # This make file leaves the result either a .lib or .dll file
 # in the \lib directory. It should be called from the \lib
 # directory.
 #
 # An option would have been to allow the source directory to
 # be specified, but I saw no requirement.
 #
 # Another option would have been to leave the .lib and .dll
 # files in the "cfg" directory, but then the make file
 # in \src would need to be changed.
 #
 ##############################################################
 # CHANGE LOG
 # ------------------------------------------------------------
 # 05.11.2001   John Lask   Initial Release
 #
 #
 ##############################################################
-PROGRAM_NAME = libcurl.lib
+LIB_NAME       = libcurl
-PROGRAM_NAME_DEBUG = libcurld.lib
+LIB_NAME_DEBUG = libcurld
-#OPENSSL_PATH = ../../openssl-0.9.6a
+OPENSSL_PATH   = ../../openssl-0.9.6
-########################################################
+#############################################################
 ## Nothing more to do below this line!
-## Release
+CCNODBG   = cl.exe /MD /O2 /D "NDEBUG"
-CCR = cl.exe /MD /O2 /D "NDEBUG"
+CCDEBUG   = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ
-LINKR = link.exe -lib /out:$(PROGRAM_NAME)
+CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 ## Debug
 CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
 LINKD = link.exe -lib /out:$(PROGRAM_NAME_DEBUG)
 ## SSL Release
 CCRS = cl.exe /MD /O2 /D "NDEBUG" /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 LINKRS = link.exe -lib /out:$(PROGRAM_NAME) /LIBPATH:$(OPENSSL_PATH)/out32dll
 CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
 LNKDLL    = link.exe /DLL  /def:libcurl.def
 LNKLIB    = link.exe -lib
 LFLAGS    = /nologo
-LINKLIBS = wsock32.lib
+LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
-LINKSLIBS = libeay32.lib ssleay32.lib RSAglue.lib
+LINKLIBS  = ws2_32.lib
 SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib
 CFGSET    = FALSE
-RELEASE_OBJS= \
+######################
-	base64r.obj \
+# release
 	cookier.obj \
 	transferr.obj \
 	escaper.obj \
 	formdatar.obj \
 	ftpr.obj \
 	httpr.obj \
 	http_chunksr.obj \
 	ldapr.obj \
 	dictr.obj \
 	telnetr.obj \
 	getdater.obj \
 	getenvr.obj \
 	getpassr.obj \
 	hostipr.obj \
 	if2ipr.obj \
 	mprintfr.obj \
 	netrcr.obj \
 	progressr.obj \
 	sendfr.obj \
 	speedcheckr.obj \
 	ssluser.obj \
 	timevalr.obj \
 	urlr.obj \
 	filer.obj \
 	getinfor.obj \
 	versionr.obj \
 	easyr.obj \
 	strequalr.obj
-DEBUG_OBJS= \
+!IF "$(CFG)" == "release"
-	base64d.obj \
+TARGET =$(LIB_NAME).lib
-	cookied.obj \
+DIROBJ =.\$(CFG)
-	transferd.obj \
+LNK    = $(LNKLIB) /out:$(TARGET)
-	escaped.obj \
+CC     = $(CCNODBG)
-	formdatad.obj \
+CFGSET = TRUE
-	ftpd.obj \
+!ENDIF
 	httpd.obj \
 	http_chunksd.obj \
 	ldapd.obj \
 	dictd.obj \
 	telnetd.obj \
 	getdated.obj \
 	getenvd.obj \
 	getpassd.obj \
 	hostipd.obj \
 	if2ipd.obj \
 	mprintfd.obj \
 	netrcd.obj \
 	progressd.obj \
 	sendfd.obj \
 	speedcheckd.obj \
 	sslused.obj \
 	timevald.obj \
 	urld.obj \
 	filed.obj \
 	getinfod.obj \
 	versiond.obj  \
 	easyd.obj \
 	strequald.obj
-RELEASE_SSL_OBJS= \
+######################
-	base64rs.obj \
+# release-dll
 	cookiers.obj \
 	transferrs.obj \
 	escapers.obj \
 	formdatars.obj \
 	ftprs.obj \
 	httprs.obj \
 	http_chunksrs.obj \
 	ldaprs.obj \
 	dictrs.obj \
 	telnetrs.obj \
 	getdaters.obj \
 	getenvrs.obj \
 	getpassrs.obj \
 	hostiprs.obj \
 	if2iprs.obj \
 	mprintfrs.obj \
 	netrcrs.obj \
 	progressrs.obj \
 	sendfrs.obj \
 	speedcheckrs.obj \
 	sslusers.obj \
 	timevalrs.obj \
 	urlrs.obj \
 	filers.obj \
 	getinfors.obj \
 	versionrs.obj \
 	easyrs.obj \
 	strequalrs.obj
-LINK_OBJS= \
+!IF "$(CFG)" == "release-dll"
-	base64.obj \
+TARGET =$(LIB_NAME).dll
-	cookie.obj \
+DIROBJ =.\$(CFG)
-	transfer.obj \
+LNK    = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
-	escape.obj \
+CC     = $(CCNODBG)
-	formdata.obj \
+CFGSET = TRUE
-	ftp.obj \
+!ENDIF
 	http.obj \
 	http_chunks.obj \
 	ldap.obj \
 	dict.obj \
 	telnet.obj \
 	getdate.obj \
 	getenv.obj \
 	getpass.obj \
 	hostip.obj \
 	if2ip.obj \
 	mprintf.obj \
 	netrc.obj \
 	progress.obj \
 	sendf.obj \
 	speedcheck.obj \
 	ssluse.obj \
 	timeval.obj \
 	url.obj \
 	file.obj \
 	getinfo.obj \
 	version.obj \
 	easy.obj \
 	strequal.obj
-all : release
+######################
 # release-ssl
-release: $(RELEASE_OBJS)
+!IF "$(CFG)" == "release-ssl"
-	$(LINKR) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
+TARGET   =$(LIB_NAME).lib
 DIROBJ   =.\$(CFG)
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC       = $(CCNODBG) $(CFLAGSSSL)
 CFGSET   = TRUE
 !ENDIF
-debug: $(DEBUG_OBJS)
+######################
-	$(LINKD) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
+# release-ssl-dll
-release-ssl: $(RELEASE_SSL_OBJS)
+!IF "$(CFG)" == "release-ssl-dll"
-	$(LINKRS) $(LFLAGS) $(LINKLIBS) $(LINKSLIBS) $(LINK_OBJS)
+TARGET   =$(LIB_NAME).dll
-
+DIROBJ   =.\$(CFG)
-## Release
+LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
-base64r.obj: base64.c
+LINKLIBS = $(LINKLIBS) $(SSLLIBS)
-	$(CCR) $(CFLAGS) base64.c
+CC       = $(CCNODBG)  $(CFLAGSSSL)
-cookier.obj: cookie.c
+CFGSET   = TRUE
-	$(CCR) $(CFLAGS) cookie.c
+!ENDIF
 transferr.obj: transfer.c
 	$(CCR) $(CFLAGS) transfer.c
 escaper.obj: escape.c
 	$(CCR) $(CFLAGS) escape.c
 formdatar.obj: formdata.c
 	$(CCR) $(CFLAGS) formdata.c
 ftpr.obj: ftp.c
 	$(CCR) $(CFLAGS) ftp.c
 httpr.obj: http.c
 	$(CCR) $(CFLAGS) http.c
 http_chunksr.obj: http_chunks.c
 	$(CCR) $(CFLAGS) http_chunks.c
 ldapr.obj: ldap.c
 	$(CCR) $(CFLAGS) ldap.c
 dictr.obj: dict.c
 	$(CCR) $(CFLAGS) dict.c
 telnetr.obj: telnet.c
 	$(CCR) $(CFLAGS) telnet.c
 getdater.obj: getdate.c
 	$(CCR) $(CFLAGS) getdate.c
 getenvr.obj: getenv.c
 	$(CCR) $(CFLAGS) getenv.c
 getpassr.obj: getpass.c
 	$(CCR) $(CFLAGS) getpass.c
 hostipr.obj: hostip.c
 	$(CCR) $(CFLAGS) hostip.c
 if2ipr.obj: if2ip.c
 	$(CCR) $(CFLAGS) if2ip.c
 mprintfr.obj: mprintf.c
 	$(CCR) $(CFLAGS) mprintf.c
 netrcr.obj: netrc.c
 	$(CCR) $(CFLAGS) netrc.c
 progressr.obj: progress.c
 	$(CCR) $(CFLAGS) progress.c
 sendfr.obj: sendf.c
 	$(CCR) $(CFLAGS) sendf.c
 speedcheckr.obj: speedcheck.c
 	$(CCR) $(CFLAGS) speedcheck.c
 ssluser.obj: ssluse.c
 	$(CCR) $(CFLAGS) ssluse.c
 timevalr.obj: timeval.c
 	$(CCR) $(CFLAGS) timeval.c
 urlr.obj: url.c
 	$(CCR) $(CFLAGS) url.c
 filer.obj: file.c
 	$(CCR) $(CFLAGS) file.c
 getinfor.obj: getinfo.c
 	$(CCR) $(CFLAGS) getinfo.c
 versionr.obj: version.c
 	$(CCR) $(CFLAGS) version.c
 easyr.obj: easy.c
 	$(CCR) $(CFLAGS) easy.c
 strequalr.obj: strequal.c
 	$(CCR) $(CFLAGS) strequal.c
 ## Debug
 base64d.obj: base64.c
 	$(CCD) $(CFLAGS) base64.c
 cookied.obj: cookie.c
 	$(CCD) $(CFLAGS) cookie.c
 transferd.obj: transfer.c
 	$(CCD) $(CFLAGS) transfer.c
 escaped.obj: escape.c
 	$(CCD) $(CFLAGS) escape.c
 formdatad.obj: formdata.c
 	$(CCD) $(CFLAGS) formdata.c
 ftpd.obj: ftp.c
 	$(CCD) $(CFLAGS) ftp.c
 httpd.obj: http.c
 	$(CCD) $(CFLAGS) http.c
 http_chunksd.obj: http_chunks.c
 	$(CCD) $(CFLAGS) http_chunks.c
 ldapd.obj: ldap.c
 	$(CCD) $(CFLAGS) ldap.c
 dictd.obj: dict.c
 	$(CCD) $(CFLAGS) dict.c
 telnetd.obj: telnet.c
 	$(CCD) $(CFLAGS) telnet.c
 getdated.obj: getdate.c
 	$(CCD) $(CFLAGS) getdate.c
 getenvd.obj: getenv.c
 	$(CCD) $(CFLAGS) getenv.c
 getpassd.obj: getpass.c
 	$(CCD) $(CFLAGS) getpass.c
 hostipd.obj: hostip.c
 	$(CCD) $(CFLAGS) hostip.c
 if2ipd.obj: if2ip.c
 	$(CCD) $(CFLAGS) if2ip.c
 mprintfd.obj: mprintf.c
 	$(CCD) $(CFLAGS) mprintf.c
 netrcd.obj: netrc.c
 	$(CCD) $(CFLAGS) netrc.c
 progressd.obj: progress.c
 	$(CCD) $(CFLAGS) progress.c
 sendfd.obj: sendf.c
 	$(CCD) $(CFLAGS) sendf.c
 speedcheckd.obj: speedcheck.c
 	$(CCD) $(CFLAGS) speedcheck.c
 sslused.obj: ssluse.c
 	$(CCD) $(CFLAGS) ssluse.c
 timevald.obj: timeval.c
 	$(CCD) $(CFLAGS) timeval.c
 urld.obj: url.c
 	$(CCD) $(CFLAGS) url.c
 filed.obj: file.c
 	$(CCD) $(CFLAGS) file.c
 getinfod.obj: getinfo.c
 	$(CCD) $(CFLAGS) getinfo.c
 versiond.obj: version.c
 	$(CCD) $(CFLAGS) version.c
 easyd.obj: easy.c
 	$(CCD) $(CFLAGS) easy.c
 strequald.obj: strequal.c
 	$(CCD) $(CFLAGS) strequal.c
 ## Release SSL
 base64rs.obj: base64.c
 	$(CCRS) $(CFLAGS) base64.c
 cookiers.obj: cookie.c
 	$(CCRS) $(CFLAGS) cookie.c
 transferrs.obj: transfer.c
 	$(CCRS) $(CFLAGS) transfer.c
 escapers.obj: escape.c
 	$(CCRS) $(CFLAGS) escape.c
 formdatars.obj: formdata.c
 	$(CCRS) $(CFLAGS) formdata.c
 ftprs.obj: ftp.c
 	$(CCRS) $(CFLAGS) ftp.c
 httprs.obj: http.c
 	$(CCR) $(CFLAGS) http.c
 http_chunksrs.obj: http_chunks.c
 	$(CCRS) $(CFLAGS) http_chunks.c
 ldaprs.obj: ldap.c
 	$(CCRS) $(CFLAGS) ldap.c
 dictrs.obj: dict.c
 	$(CCRS) $(CFLAGS) dict.c
 telnetrs.obj: telnet.c
 	$(CCRS) $(CFLAGS) telnet.c
 getdaters.obj: getdate.c
 	$(CCRS) $(CFLAGS) getdate.c
 getenvrs.obj: getenv.c
 	$(CCRS) $(CFLAGS) getenv.c
 getpassrs.obj: getpass.c
 	$(CCRS) $(CFLAGS) getpass.c
 hostiprs.obj: hostip.c
 	$(CCRS) $(CFLAGS) hostip.c
 if2iprs.obj: if2ip.c
 	$(CCRS) $(CFLAGS) if2ip.c
 mprintfrs.obj: mprintf.c
 	$(CCRS) $(CFLAGS) mprintf.c
 netrcrs.obj: netrc.c
 	$(CCRS) $(CFLAGS) netrc.c
 progressrs.obj: progress.c
 	$(CCRS) $(CFLAGS) progress.c
 sendfrs.obj: sendf.c
 	$(CCRS) $(CFLAGS) sendf.c
 speedcheckrs.obj: speedcheck.c
 	$(CCRS) $(CFLAGS) speedcheck.c
 sslusers.obj: ssluse.c
 	$(CCRS) $(CFLAGS) ssluse.c
 timevalrs.obj: timeval.c
 	$(CCRS) $(CFLAGS) timeval.c
 urlrs.obj: url.c
 	$(CCRS) $(CFLAGS) url.c
 filers.obj: file.c
 	$(CCRS) $(CFLAGS) file.c
 getinfors.obj: getinfo.c
 	$(CCRS) $(CFLAGS) getinfo.c
 versionrs.obj: version.c
 	$(CCRS) $(CFLAGS) version.c
 easyrs.obj: easy.c
 	$(CCRS) $(CFLAGS) easy.c
 strequalrs.obj: strequal.c
 	$(CCRS) $(CFLAGS) strequal.c
 ######################
 # debug
 !IF "$(CFG)" == "debug"
 TARGET =$(LIB_NAME_DEBUG).lib
 DIROBJ =.\$(CFG)
 LNK    = $(LNKLIB) /out:$(TARGET)
 CC     = $(CCDEBUG)
 CFGSET = TRUE
 !ENDIF
 ######################
 # debug-dll
 !IF "$(CFG)" == "debug-dll"
 TARGET =$(LIB_NAME_DEBUG).dll
 DIROBJ =.\$(CFG)
 LNK    = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib"
 CC     = $(CCDEBUG)
 CFGSET = TRUE
 !ENDIF
 ######################
 # debug-ssl
 #todo
 !IF "$(CFG)" == "debug-ssl"
 TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   =.\$(CFG)
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC       = $(CCDEBUG) $(CFLAGSSSL)
 CFGSET   = TRUE
 !ENDIF
 ######################
 # debug-ssl-dll
 !IF "$(CFG)" == "debug-ssl-dll"
 TARGET   =$(LIB_NAME_DEBUG).dll
 DIROBJ   =.\$(CFG)
 LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib"
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC       = $(CCDEBUG) $(CFLAGSSSL)
 CFGSET   = TRUE
 !ENDIF
 #######################
 # Usage
 #
 !IF "$(CFGSET)" == "FALSE"
 !MESSAGE Usage: nmake -f makefile.vc6 CFG=<config> <target>
 !MESSAGE where <config> is one of:
 !MESSAGE   release          - release static library
 !MESSAGE   release-dll      - release dll
 !MESSAGE   release-ssl      - release static library with ssl
 !MESSAGE   release-ssl-dll  - release dll library with ssl
 !MESSAGE   debug            - debug static library
 !MESSAGE   debug-dll        - debug dll
 !MESSAGE   debug-ssl        - debug static library with ssl
 !MESSAGE   debug-ssl-dll    - debug dll library with ssl
 !MESSAGE <target> can be left blank in which case all is assumed
 !ERROR please choose a valid configuration "$(CFG)"
 !ENDIF
 #######################
 #
 X_OBJS= \
 	$(DIROBJ)\base64.obj \
 	$(DIROBJ)\cookie.obj \
 	$(DIROBJ)\transfer.obj \
 	$(DIROBJ)\escape.obj \
 	$(DIROBJ)\formdata.obj \
 	$(DIROBJ)\ftp.obj \
 	$(DIROBJ)\http.obj \
 	$(DIROBJ)\http_chunks.obj \
 	$(DIROBJ)\ldap.obj \
 	$(DIROBJ)\dict.obj \
 	$(DIROBJ)\telnet.obj \
 	$(DIROBJ)\getdate.obj \
 	$(DIROBJ)\getenv.obj \
 	$(DIROBJ)\getpass.obj \
 	$(DIROBJ)\hostip.obj \
 	$(DIROBJ)\if2ip.obj \
 	$(DIROBJ)\mprintf.obj \
 	$(DIROBJ)\netrc.obj \
 	$(DIROBJ)\progress.obj \
 	$(DIROBJ)\sendf.obj \
 	$(DIROBJ)\speedcheck.obj \
 	$(DIROBJ)\ssluse.obj \
 	$(DIROBJ)\timeval.obj \
 	$(DIROBJ)\url.obj \
 	$(DIROBJ)\file.obj \
 	$(DIROBJ)\getinfo.obj \
 	$(DIROBJ)\version.obj \
 	$(DIROBJ)\easy.obj \
 	$(DIROBJ)\strequal.obj \
 	$(DIROBJ)\strtok.obj \
 	$(DIROBJ)\connect.obj \
 	$(DIROBJ)\hash.obj \
 	$(DIROBJ)\llist.obj
 all : $(TARGET)
 $(TARGET): $(X_OBJS)
 	$(LNK) $(LFLAGS) $(LINKLIBS) $(X_OBJS)
 $(X_OBJS): $(DIROBJ)
 $(DIROBJ):
 	@if not exist "$(DIROBJ)" mkdir $(DIROBJ)
 .SUFFIXES: .c .obj
 {.\}.c{$(DIROBJ)\}.obj:
 	$(CC) $(CFLAGS) /Fo"$@"  $<
 clean:
-	-@erase *.obj
+	-@erase $(DIROBJ)\*.obj
 	-@erase vc60.idb
 	-@erase vc60.pch
 distrib: clean
 	-@erase $(PROGRAM_NAME)
--- a/lib/arpa_telnet.h
+++ b/lib/arpa_telnet.h
@@ -1,321 +1,101 @@
-/*
+#ifndef __ARPA_TELNET_H
- * Copyright (c) 1983, 1993
+#define __ARPA_TELNET_H
- *	The Regents of the University of California.  All rights reserved.
+/*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Redistribution and use in source and binary forms, with or without
+ * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *	This product includes software developed by the University of
 *	California, Berkeley and its contributors.
 * 4. Neither the name of the University nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * In order to be useful for every potential user, curl and libcurl are
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
+ * 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
-#ifndef _ARPA_TELNET_H
+ * licenses. You may pick one of these licenses.
-#define _ARPA_TELNET_H
+ *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 /*
- * Definitions for the TELNET protocol.
+ * Telnet option defines. Add more here if in need.
 */
-#define	IAC	255		/* interpret as command: */
+#define TELOPT_BINARY   0  /* binary 8bit data */
-#define	DONT	254		/* you are not to use option */
+#define TELOPT_SGA      3  /* Supress Go Ahead */
-#define	DO	253		/* please, you use option */
+#define TELOPT_EXOPL  255  /* EXtended OPtions List */
-#define	WONT	252		/* I won't use option */
+#define TELOPT_TTYPE   24  /* Terminal TYPE */
-#define	WILL	251		/* I will use option */
+#define TELOPT_XDISPLOC 35 /* X DISPlay LOCation */
 #define	SB	250		/* interpret as subnegotiation */
 #define	GA	249		/* you may reverse the line */
 #define	EL	248		/* erase the current line */
 #define	EC	247		/* erase the current character */
 #define	AYT	246		/* are you there */
 #define	AO	245		/* abort output--but let prog finish */
 #define	IP	244		/* interrupt process--permanently */
 #define	BREAK	243		/* break */
 #define	DM	242		/* data mark--for connect. cleaning */
 #define	NOP	241		/* nop */
 #define	SE	240		/* end sub negotiation */
 #define EOR     239             /* end of record (transparent mode) */
 #define	ABORT	238		/* Abort process */
 #define	SUSP	237		/* Suspend process */
 #define	xEOF	236		/* End of file: EOF is already used... */
-#define SYNCH	242		/* for telfunc calls */
+#define TELOPT_NEW_ENVIRON 39  /* NEW ENVIRONment variables */
 #ifdef TELCMDS
 static
 char *telcmds[] = {
 	"EOF", "SUSP", "ABORT", "EOR",
 	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
 	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC", 0,
 };
 #else
 extern char *telcmds[];
 #endif
 #define	TELCMD_FIRST	xEOF
 #define	TELCMD_LAST	IAC
 #define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
 			 (unsigned int)(x) >= TELCMD_FIRST)
 #define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
 /* telnet options */
 #define TELOPT_BINARY	0	/* 8-bit data path */
 #define TELOPT_ECHO	1	/* echo */
 #define	TELOPT_RCP	2	/* prepare to reconnect */
 #define	TELOPT_SGA	3	/* suppress go ahead */
 #define	TELOPT_NAMS	4	/* approximate message size */
 #define	TELOPT_STATUS	5	/* give status */
 #define	TELOPT_TM	6	/* timing mark */
 #define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
 #define TELOPT_NAOL 	8	/* negotiate about output line width */
 #define TELOPT_NAOP 	9	/* negotiate about output page size */
 #define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
 #define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
 #define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
 #define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
 #define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
 #define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
 #define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
 #define TELOPT_XASCII	17	/* extended ascic character set */
 #define	TELOPT_LOGOUT	18	/* force logout */
 #define	TELOPT_BM	19	/* byte macro */
 #define	TELOPT_DET	20	/* data entry terminal */
 #define	TELOPT_SUPDUP	21	/* supdup protocol */
 #define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
 #define	TELOPT_SNDLOC	23	/* send location */
 #define	TELOPT_TTYPE	24	/* terminal type */
 #define	TELOPT_EOR	25	/* end or record */
 #define	TELOPT_TUID	26	/* TACACS user identification */
 #define	TELOPT_OUTMRK	27	/* output marking */
 #define	TELOPT_TTYLOC	28	/* terminal location number */
 #define	TELOPT_3270REGIME 29	/* 3270 regime */
 #define	TELOPT_X3PAD	30	/* X.3 PAD */
 #define	TELOPT_NAWS	31	/* window size */
 #define	TELOPT_TSPEED	32	/* terminal speed */
 #define	TELOPT_LFLOW	33	/* remote flow control */
 #define TELOPT_LINEMODE	34	/* Linemode option */
 #define TELOPT_XDISPLOC	35	/* X Display Location */
 #define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
 #define	TELOPT_AUTHENTICATION 37/* Authenticate */
 #define	TELOPT_ENCRYPT	38	/* Encryption option */
 #define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
 #define	TELOPT_EXOPL	255	/* extended-options-list */
 #define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
 #ifdef TELOPTS
 static
 char *telopts[NTELOPTS+1] = {
 	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
 	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
 	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
 	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
 	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
 	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
 	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
 	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
 	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
 	"ENCRYPT", "NEW-ENVIRON",
 	0,
 };
 #define	TELOPT_FIRST	TELOPT_BINARY
 #define	TELOPT_LAST	TELOPT_NEW_ENVIRON
 #define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
 #define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
 #endif
 /* sub-option qualifiers */
 #define	TELQUAL_IS	0	/* option is... */
 #define	TELQUAL_SEND	1	/* send option */
 #define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
 #define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
 #define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
 #define	LFLOW_OFF		0	/* Disable remote flow control */
 #define	LFLOW_ON		1	/* Enable remote flow control */
 #define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
 #define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
 /*
 * LINEMODE suboptions
 */
 #define	LM_MODE		1
 #define	LM_FORWARDMASK	2
 #define	LM_SLC		3
 #define	MODE_EDIT	0x01
 #define	MODE_TRAPSIG	0x02
 #define	MODE_ACK	0x04
 #define MODE_SOFT_TAB	0x08
 #define MODE_LIT_ECHO	0x10
 #define	MODE_MASK	0x1f
 /* Not part of protocol, but needed to simplify things... */
 #define MODE_FLOW		0x0100
 #define MODE_ECHO		0x0200
 #define MODE_INBIN		0x0400
 #define MODE_OUTBIN		0x0800
 #define MODE_FORCE		0x1000
 #define	SLC_SYNCH	1
 #define	SLC_BRK		2
 #define	SLC_IP		3
 #define	SLC_AO		4
 #define	SLC_AYT		5
 #define	SLC_EOR		6
 #define	SLC_ABORT	7
 #define	SLC_EOF		8
 #define	SLC_SUSP	9
 #define	SLC_EC		10
 #define	SLC_EL		11
 #define	SLC_EW		12
 #define	SLC_RP		13
 #define	SLC_LNEXT	14
 #define	SLC_XON		15
 #define	SLC_XOFF	16
 #define	SLC_FORW1	17
 #define	SLC_FORW2	18
 #define	NSLC		18
 /*
 * For backwards compatability, we define SLC_NAMES to be the
 * list of names if SLC_NAMES is not defined.
 */
 #define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \
 			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \
 			"LNEXT", "XON", "XOFF", "FORW1", "FORW2", 0,
 #ifdef	SLC_NAMES
 char *slc_names[] = {
 	SLC_NAMELIST
 };
 #else
 extern char *slc_names[];
 #define	SLC_NAMES SLC_NAMELIST
 #endif
 #define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
 #define SLC_NAME(x)	slc_names[x]
 #define	SLC_NOSUPPORT	0
 #define	SLC_CANTCHANGE	1
 #define	SLC_VARIABLE	2
 #define	SLC_DEFAULT	3
 #define	SLC_LEVELBITS	0x03
 #define	SLC_FUNC	0
 #define	SLC_FLAGS	1
 #define	SLC_VALUE	2
 #define	SLC_ACK		0x80
 #define	SLC_FLUSHIN	0x40
 #define	SLC_FLUSHOUT	0x20
 #define	OLD_ENV_VAR	1
 #define	OLD_ENV_VALUE	0
 #define NEW_ENV_VAR   0
 #define NEW_ENV_VALUE 1
 #define	ENV_ESC		2
 #define	ENV_USERVAR	3
 /*
- * AUTHENTICATION suboptions
+ * The telnet options represented as strings
 */
-
+static const char *telnetoptions[]=
-/*
+{
- * Who is authenticating who ...
+  "BINARY",      "ECHO",           "RCP",           "SUPPRESS GO AHEAD",
- */
+  "NAME",        "STATUS",         "TIMING MARK",   "RCTE",
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
+  "NAOL",        "NAOP",           "NAOCRD",        "NAOHTS",
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
+  "NAOHTD",      "NAOFFD",         "NAOVTS",        "NAOVTD",
-#define	AUTH_WHO_MASK		1
+  "NAOLFD",      "EXTEND ASCII",   "LOGOUT",        "BYTE MACRO",
-
+  "DE TERMINAL", "SUPDUP",         "SUPDUP OUTPUT", "SEND LOCATION",
-/*
+  "TERM TYPE",   "END OF RECORD",  "TACACS UID",    "OUTPUT MARKING",
- * amount of authentication done
+  "TTYLOC",      "3270 REGIME",    "X3 PAD",        "NAWS",
- */
+  "TERM SPEED",  "LFLOW",          "LINEMODE",      "XDISPLOC",
-#define	AUTH_HOW_ONE_WAY	0
+  "OLD-ENVIRON", "AUTHENTICATION", "ENCRYPT",       "NEW-ENVIRON"
 #define	AUTH_HOW_MUTUAL		2
 #define	AUTH_HOW_MASK		2
 #define	AUTHTYPE_NULL		0
 #define	AUTHTYPE_KERBEROS_V4	1
 #define	AUTHTYPE_KERBEROS_V5	2
 #define	AUTHTYPE_SPX		3
 #define	AUTHTYPE_MINK		4
 #define	AUTHTYPE_CNT		5
 #define	AUTHTYPE_TEST		99
 #ifdef	AUTH_NAMES
 char *authtype_names[] = {
 	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", 0,
 };
-#else
+
-extern char *authtype_names[];
+#define TELOPT_MAXIMUM TELOPT_NEW_ENVIRON
 #define TELOPT_OK(x) ((x) <= TELOPT_MAXIMUM)
 #define TELOPT(x)    telnetoptions[x]
 #define NTELOPTS 40 
 /*
 * First some defines
 */
 #define xEOF 236 /* End Of File */ 
 #define SE   240 /* Sub negotiation End */
 #define NOP  241 /* No OPeration */
 #define DM   242 /* Data Mark */
 #define GA   249 /* Go Ahead, reverse the line */
 #define SB   250 /* SuBnegotiation */
 #define WILL 251 /* Our side WILL use this option */
 #define WONT 252 /* Our side WON'T use this option */
 #define DO   253 /* DO use this option! */
 #define DONT 254 /* DON'T use this option! */
 #define IAC  255 /* Interpret As Command */
 /*
 * Then those numbers represented as strings:
 */
 static const char *telnetcmds[]=
 {
  "EOF",  "SUSP",  "ABORT", "EOR",  "SE",
  "NOP",  "DMARK", "BRK",   "IP",   "AO",
  "AYT",  "EC",    "EL",    "GA",   "SB",
  "WILL", "WONT",  "DO",    "DONT", "IAC"
 };
 #define TELCMD_MINIMUM xEOF /* the first one */
 #define TELCMD_MAXIMUM  IAC  /* surprise, 255 is the last one! ;-) */
 #define TELQUAL_IS   0
 #define TELQUAL_SEND 1
 #define TELQUAL_INFO 2
 #define TELQUAL_NAME 3
 #define TELCMD_OK(x) ( ((unsigned int)(x) >= TELCMD_MINIMUM) && \
                       ((unsigned int)(x) <= TELCMD_MAXIMUM) )
 #define TELCMD(x)    telnetcmds[(x)-TELCMD_MINIMUM]
 #endif
 #define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
 #define	AUTHTYPE_NAME(x)	authtype_names[x]
 /*
 * ENCRYPTion suboptions
 */
 #define	ENCRYPT_IS		0	/* I pick encryption type ... */
 #define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
 #define	ENCRYPT_REPLY		2	/* Initial setup response */
 #define	ENCRYPT_START		3	/* Am starting to send encrypted */
 #define	ENCRYPT_END		4	/* Am ending encrypted */
 #define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
 #define	ENCRYPT_REQEND		6	/* Request you send encrypting */
 #define	ENCRYPT_ENC_KEYID	7
 #define	ENCRYPT_DEC_KEYID	8
 #define	ENCRYPT_CNT		9
 #define	ENCTYPE_ANY		0
 #define	ENCTYPE_DES_CFB64	1
 #define	ENCTYPE_DES_OFB64	2
 #define	ENCTYPE_CNT		3
 #ifdef	ENCRYPT_NAMES
 char *encrypt_names[] = {
 	"IS", "SUPPORT", "REPLY", "START", "END",
 	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
 	0,
 };
 char *enctype_names[] = {
 	"ANY", "DES_CFB64",  "DES_OFB64",  0,
 };
 #else
 extern char *encrypt_names[];
 extern char *enctype_names[];
 #endif
 #define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
 #define	ENCRYPT_NAME(x)		encrypt_names[x]
 #define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
 #define	ENCTYPE_NAME(x)		enctype_names[x]
 #endif /* _ARPA_TELNET_H */
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -1,152 +1,270 @@
-/*
+/*****************************************************************************
- * Copyright (c) 1995 - 1999 Kungliga Tekniska H<>gskolan
+ *                                  _   _ ____  _     
- * (Royal Institute of Technology, Stockholm, Sweden).
+ *  Project                     ___| | | |  _ \| |    
- * All rights reserved.
+ *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Redistribution and use in source and binary forms, with or without
+ * Copyright (C) 2001, Andrew Francis and Daniel Stenberg
 * modification, are permitted provided that the following conditions
 * are met:
 *
- * 1. Redistributions of source code must retain the above copyright
+ * In order to be useful for every potential user, curl and libcurl are
- *    notice, this list of conditions and the following disclaimer.
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *
- * 2. Redistributions in binary form must reproduce the above copyright
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- *    notice, this list of conditions and the following disclaimer in the
+ * copies of the Software, and permit persons to whom the Software is
- *    documentation and/or other materials provided with the distribution.
+ * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
- * 3. Neither the name of the Institute nor the names of its contributors
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- *    may be used to endorse or promote products derived from this software
+ * KIND, either express or implied.
 *    without specific prior written permission.
 *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * $Id$
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *****************************************************************************/
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+/* Base64 encoding/decoding
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * Test harnesses down the bottom - compile with -DTEST_ENCODE for
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * a program that will read in raw data from stdin and write out
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * a base64-encoded version to stdout, and the length returned by the
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * encoding function to stderr. Compile with -DTEST_DECODE for a program that
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * will go the other way.
- * SUCH DAMAGE.
+ * 
 * This code will break if int is smaller than 32 bits
 */
-#ifdef HAVE_CONFIG_H
+#include "setup.h"
-#include <config.h>
+
 #endif
 #include <stdlib.h>
 #include <string.h>
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "base64.h"
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
-static char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static void decodeQuantum(unsigned char *dest, char *src)
 static int pos(char c)
 {
-  char *p;
+  unsigned int x = 0;
  for(p = base64; *p; p++)
    if(*p == c)
      return p - base64;
  return -1;
 }
 #if 1
 int Curl_base64_encode(const void *data, int size, char **str)
 {
  char *s, *p;
  int i;
-  int c;
+  for(i = 0; i < 4; i++) {
-  const unsigned char *q;
+    if(src[i] >= 'A' && src[i] <= 'Z')
      x = (x << 6) + (unsigned int)(src[i] - 'A' + 0);
    else if(src[i] >= 'a' && src[i] <= 'z')
      x = (x << 6) + (unsigned int)(src[i] - 'a' + 26);
    else if(src[i] >= '0' && src[i] <= '9') 
      x = (x << 6) + (unsigned int)(src[i] - '0' + 52);
    else if(src[i] == '+')
      x = (x << 6) + 62;
    else if(src[i] == '/')
      x = (x << 6) + 63;
  }
-  p = s = (char*)malloc(size*4/3+4);
+  dest[2] = (unsigned char)(x & 255); x >>= 8;
-  if (p == NULL)
+  dest[1] = (unsigned char)(x & 255); x >>= 8;
  dest[0] = (unsigned char)(x & 255); x >>= 8;
 }
 /* base64Decode
 * Given a base64 string at src, decode it into the memory pointed
 * to by dest. If rawLength points to a valid address (ie not NULL),
 * store the length of the decoded data to it.
 */
 static void base64Decode(unsigned char *dest, char *src, int *rawLength)
 {
  int length = 0;
  int equalsTerm = 0;
  int i;
  unsigned char lastQuantum[3];
  while((src[length] != '=') && src[length])
    length++;
  while(src[length+equalsTerm] == '=')
    equalsTerm++;
  if(rawLength)
    *rawLength = (length * 3 / 4) - equalsTerm;
  for(i = 0; i < length/4 - 1; i++) {
    decodeQuantum(dest, src);
    dest += 3; src += 4;
  }
  decodeQuantum(lastQuantum, src);
  for(i = 0; i < 3 - equalsTerm; i++) dest[i] = lastQuantum[i];
 }
 /* ---- Base64 Encoding --- */
 static char table64[]=
  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 /*
 * Curl_base64_encode()
 *
 * Returns the length of the newly created base64 string. The third argument
 * is a pointer to an allocated area holding the base64 data. If something
 * went wrong, -1 is returned.
 *
 */
 int Curl_base64_encode(const void *inp, int insize, char **outptr)
 {
  unsigned char ibuf[3];
  unsigned char obuf[4];
  int i;
  int inputparts;
  char *output;
  char *base64data;
  char *indata = (char *)inp;
  if(0 == insize)
    insize = strlen(indata);
  base64data = output = (char*)malloc(insize*4/3+4);
  if(NULL == output)
    return -1;
-  q = (const unsigned char*)data;
+
-  i=0;
+  while(insize > 0) {
-  for(i = 0; i < size;){
+    for (i = inputparts = 0; i < 3; i++) { 
-    c=q[i++];
+      if(*indata) {
-    c*=256;
+        inputparts++;
-    if(i < size)
+        ibuf[i] = *indata;
-      c+=q[i];
+        indata++;
-    i++;
+        insize--;
    c*=256;
    if(i < size)
      c+=q[i];
    i++;
    p[0]=base64[(c&0x00fc0000) >> 18];
    p[1]=base64[(c&0x0003f000) >> 12];
    p[2]=base64[(c&0x00000fc0) >> 6];
    p[3]=base64[(c&0x0000003f) >> 0];
    if(i > size)
      p[3]='=';
    if(i > size+1)
      p[2]='=';
    p+=4;
      }
-  *p=0;
+      else
-  *str = s;
+        ibuf[i] = 0;
  return strlen(s);
    }
-#endif
+                       
    obuf [0] = (ibuf [0] & 0xFC) >> 2;
    obuf [1] = ((ibuf [0] & 0x03) << 4) | ((ibuf [1] & 0xF0) >> 4);
    obuf [2] = ((ibuf [1] & 0x0F) << 2) | ((ibuf [2] & 0xC0) >> 6);
    obuf [3] = ibuf [2] & 0x3F;
    switch(inputparts) {
    case 1: /* only one byte read */
      sprintf(output, "%c%c==", 
              table64[obuf[0]],
              table64[obuf[1]]);
      break;
    case 2: /* two bytes read */
      sprintf(output, "%c%c%c=", 
              table64[obuf[0]],
              table64[obuf[1]],
              table64[obuf[2]]);
      break;
    default:
      sprintf(output, "%c%c%c%c", 
              table64[obuf[0]],
              table64[obuf[1]],
              table64[obuf[2]],
              table64[obuf[3]] );
      break;
    }
    output += 4;
  }
  *output=0;
  *outptr = base64data; /* make it return the actual data memory */
  return strlen(base64data); /* return the length of the new data */
 }
 /* ---- End of Base64 Encoding ---- */
 int Curl_base64_decode(const char *str, void *data)
 {
-  const char *p;
+  int ret;
  unsigned char *q;
  int c;
  int x;
  int done = 0;
  q=(unsigned char*)data;
  for(p=str; *p && !done; p+=4){
    x = pos(p[0]);
    if(x >= 0)
      c = x;
    else{
      done = 3;
      break;
    }
    c*=64;
-    x = pos(p[1]);
+  base64Decode((unsigned char *)data, (char *)str, &ret);
-    if(x >= 0)
+  return ret;
-      c += x;
+}
    else
      return -1;
    c*=64;
-    if(p[2] == '=')
+/************* TEST HARNESS STUFF ****************/
      done++;
    else{
      x = pos(p[2]);
      if(x >= 0)
 	c += x;
      else
 	return -1;
    }
    c*=64;
    if(p[3] == '=')
      done++;
    else{
      if(done)
 	return -1;
      x = pos(p[3]);
      if(x >= 0)
 	c += x;
      else
 	return -1;
    }
    if(done < 3)
      *q++=(c&0x00ff0000)>>16;
-    if(done < 2)
+#ifdef TEST_ENCODE
-      *q++=(c&0x0000ff00)>>8;
+/* encoding test harness. Read in standard input and write out the length
-    if(done < 1)
+ * returned by Curl_base64_encode, followed by the base64'd data itself
-      *q++=(c&0x000000ff)>>0;
+ */
 #include <stdio.h>
 #define TEST_NEED_SUCK
 void *suck(int *);
 int main(int argc, char **argv, char **envp) {
 	char *base64;
 	int base64Len;
 	unsigned char *data;
 	int dataLen;
 	data = (unsigned char *)suck(&dataLen);
 	base64Len = Curl_base64_encode(data, dataLen, &base64);
 	fprintf(stderr, "%d\n", base64Len);
 	fprintf(stdout, "%s",   base64);
 	free(base64); free(data);
 	return 0;
 }
-  return q - (unsigned char*)data;
+#endif
 #ifdef TEST_DECODE
 /* decoding test harness. Read in a base64 string from stdin and write out the 
 * length returned by Curl_base64_decode, followed by the decoded data itself
 */
 #include <stdio.h>
 #define TEST_NEED_SUCK
 void *suck(int *);
 int main(int argc, char **argv, char **envp) {
 	char *base64;
 	int base64Len;
 	unsigned char *data;
 	int dataLen;
 	base64 = (char *)suck(&base64Len);
 	data = (unsigned char *)malloc(base64Len * 3/4 + 8);
 	dataLen = Curl_base64_decode(base64, data);
 	fprintf(stderr, "%d\n", dataLen);
 	fwrite(data,1,dataLen,stdout);
 	free(base64); free(data);
 	return 0;
 }
 #endif
 #ifdef TEST_NEED_SUCK
 /* this function 'sucks' in as much as possible from stdin */
 void *suck(int *lenptr) {
 	int cursize = 8192;
 	unsigned char *buf = NULL;
 	int lastread;
 	int len = 0;
 	do {
 		cursize *= 2;
 		buf = (unsigned char *)realloc(buf, cursize);
 		memset(buf + len, 0, cursize - len);
 		lastread = fread(buf + len, 1, cursize - len, stdin);
 		len += lastread;
 	} while(!feof(stdin));
 	lenptr[0] = len;
 	return (void *)buf;
 }
 #endif
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -1,40 +1,27 @@
 /*
 * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan
 * (Royal Institute of Technology, Stockholm, Sweden).
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
 * 3. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 */
 #ifndef __BASE64_H
 #define __BASE64_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$
 *****************************************************************************/
 int Curl_base64_encode(const void *data, int size, char **str);
 int Curl_base64_decode(const char *str, void *data);
 #endif
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -0,0 +1,570 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  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"
 #ifndef WIN32
 /* headers for non-win32 */
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h> /* required for free() prototype, without it, this crashes
                       on macos 68K */
 #endif
 #endif
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #ifndef TRUE
 #define TRUE 1
 #define FALSE 0
 #endif
 #ifdef WIN32
 #define HAVE_IOCTLSOCKET
 #include <windows.h>
 #include <winsock.h>
 #define EINPROGRESS WSAEINPROGRESS
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define EISCONN     WSAEISCONN
 #endif
 #include "urldata.h"
 #include "sendf.h"
 #include "if2ip.h"
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
 static
 int geterrno(void)
 {
 #ifdef WIN32
  return (int)GetLastError();
 #else
  return errno;
 #endif
 }
 /*************************************************************************
 * Curl_nonblock
 *
 * Description:
 *  Set the socket to either blocking or non-blocking mode.
 */
 int Curl_nonblock(int socket,    /* operate on this */
                  int nonblock   /* TRUE or FALSE */)
 {
 #undef SETBLOCK
 #ifdef HAVE_O_NONBLOCK
  int flags;
  flags = fcntl(socket, F_GETFL, 0);
  if (TRUE == nonblock)
    return fcntl(socket, F_SETFL, flags | O_NONBLOCK);
  else
    return fcntl(socket, F_SETFL, flags & (~O_NONBLOCK));
 #define SETBLOCK 1
 #endif
 #ifdef HAVE_FIONBIO
  int flags;
  flags = nonblock;
  return ioctl(socket, FIONBIO, &flags);
 #define SETBLOCK 2
 #endif
 #ifdef HAVE_IOCTLSOCKET
  int flags;
  flags = nonblock;
  return ioctlsocket(socket, FIONBIO, &flags);
 #define SETBLOCK 3
 #endif
 #ifdef HAVE_IOCTLSOCKET_CASE
  return IoctlSocket(socket, FIONBIO, (long)nonblock);
 #define SETBLOCK 4
 #endif
 #ifdef HAVE_DISABLED_NONBLOCKING
  return 0; /* returns success */
 #define SETBLOCK 5
 #endif
 #ifndef SETBLOCK
 #error "no non-blocking method was found/used/set"
 #endif
 }
 /*
 * Return 0 on fine connect, -1 on error and 1 on timeout.
 */
 static
 int waitconnect(int sockfd, /* socket */
                int timeout_msec)
 {
  fd_set fd;
  fd_set errfd;
  struct timeval interval;
  int rc;
  /* now select() until we get connect or timeout */
  FD_ZERO(&fd);
  FD_SET(sockfd, &fd);
  FD_ZERO(&errfd);
  FD_SET(sockfd, &errfd);
  interval.tv_sec = timeout_msec/1000;
  timeout_msec -= interval.tv_sec*1000;
  interval.tv_usec = timeout_msec*1000;
  rc = select(sockfd+1, NULL, &fd, &errfd, &interval);
  if(-1 == rc)
    /* error, no connect here, try next */
    return -1;
  else if(0 == rc)
    /* timeout, no connect today */
    return 1;
  if(FD_ISSET(sockfd, &errfd)) {
    /* error condition caught */
    return 2;
  }
  /* we have a connect! */
  return 0;
 }
 #ifndef ENABLE_IPV6
 static CURLcode bindlocal(struct connectdata *conn,
                          int sockfd)
 {
 #if !defined(WIN32)||defined(__CYGWIN32__)
  /* We don't generally like checking for OS-versions, we should make this
     HAVE_XXXX based, although at the moment I don't have a decent test for
     this! */
 #ifdef HAVE_INET_NTOA
 #ifndef INADDR_NONE
 #define INADDR_NONE (in_addr_t) ~0
 #endif
  struct SessionHandle *data = conn->data;
  /*************************************************************
   * Select device to bind socket to
   *************************************************************/
  if (strlen(data->set.device)<255) {
    struct sockaddr_in sa;
    struct hostent *h=NULL;
    char *hostdataptr=NULL;
    size_t size;
    char myhost[256] = "";
    in_addr_t in;
    if(Curl_if2ip(data->set.device, myhost, sizeof(myhost))) {
      h = Curl_resolv(data, myhost, 0, &hostdataptr);
    }
    else {
      if(strlen(data->set.device)>1) {
        h = Curl_resolv(data, data->set.device, 0, &hostdataptr);
      }
      if(h) {
        /* we know data->set.device is shorter than the myhost array */
        strcpy(myhost, data->set.device);
      }
    }
    if(! *myhost) {
      /* need to fix this
         h=Curl_gethost(data,
         getmyhost(*myhost,sizeof(myhost)),
         hostent_buf,
         sizeof(hostent_buf));
      */
      return CURLE_HTTP_PORT_FAILED;
    }
    infof(data, "We bind local end to %s\n", myhost);
    in=inet_addr(myhost);
    if (INADDR_NONE != in) {
      if ( h ) {
        memset((char *)&sa, 0, sizeof(sa));
        memcpy((char *)&sa.sin_addr,
               h->h_addr,
               h->h_length);
        sa.sin_family = AF_INET;
        sa.sin_addr.s_addr = in;
        sa.sin_port = 0; /* get any port */
        if( bind(sockfd, (struct sockaddr *)&sa, sizeof(sa)) >= 0) {
          /* we succeeded to bind */
          struct sockaddr_in add;
          size = sizeof(add);
          if(getsockname(sockfd, (struct sockaddr *) &add,
                         (socklen_t *)&size)<0) {
            failf(data, "getsockname() failed");
            return CURLE_HTTP_PORT_FAILED;
          }
        }
        else {
          switch(errno) {
          case EBADF:
            failf(data, "Invalid descriptor: %d", errno);
            break;
          case EINVAL:
            failf(data, "Invalid request: %d", errno);
            break;
          case EACCES:
            failf(data, "Address is protected, user not superuser: %d", errno);
            break;
          case ENOTSOCK:
            failf(data,
                  "Argument is a descriptor for a file, not a socket: %d",
                  errno);
            break;
          case EFAULT:
            failf(data, "Inaccessable memory error: %d", errno);
            break;
          case ENAMETOOLONG:
            failf(data, "Address too long: %d", errno);
            break;
          case ENOMEM:
            failf(data, "Insufficient kernel memory was available: %d", errno);
            break;
          default:
            failf(data, "errno %d", errno);
            break;
          } /* end of switch(errno) */
          return CURLE_HTTP_PORT_FAILED;
        } /* end of else */
      } /* end of if  h */
      else {
 	failf(data,"could't find my own IP address (%s)", myhost);
 	return CURLE_HTTP_PORT_FAILED;
      }
    } /* end of inet_addr */
    else {
      failf(data, "could't find my own IP address (%s)", myhost);
      return CURLE_HTTP_PORT_FAILED;
    }
    return CURLE_OK;
  } /* end of device selection support */
 #endif /* end of HAVE_INET_NTOA */
 #endif /* end of not WIN32 */
  return CURLE_HTTP_PORT_FAILED;
 }
 #endif /* end of ipv4-specific section */
 static
 int socketerror(int sockfd)
 {
  int err = 0;
  socklen_t errSize = sizeof(err);
  if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
                       (void *)&err, &errSize))
    err = geterrno();
  return err;
 }
 /*
 * TCP connect to the given host with timeout, proxy or remote doesn't matter.
 * There might be more than one IP address to try out. Fill in the passed
 * pointer with the connected socket.
 */
 CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
                          Curl_addrinfo *remotehost, /* use one in here */
                          int port,                  /* connect to this */
                          int *sockconn,             /* the connected socket */
                          Curl_ipconnect **addr)     /* the one we used */
 {
  struct SessionHandle *data = conn->data;
  int rc;
  int sockfd=-1;
  int aliasindex=0;
  struct timeval after;
  struct timeval before = Curl_tvnow();
  /*************************************************************
   * Figure out what maximum time we have left
   *************************************************************/
  long timeout_ms=300000; /* milliseconds, default to five minutes */
  if(data->set.timeout || data->set.connecttimeout) {
    double has_passed;
    /* Evaluate in milliseconds how much time that has passed */
    has_passed = Curl_tvdiff(Curl_tvnow(), data->progress.start);
 #ifndef min
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 #endif
    /* get the most strict timeout of the ones converted to milliseconds */
    if(data->set.timeout &&
       (data->set.timeout>data->set.connecttimeout))
      timeout_ms = data->set.timeout*1000;
    else
      timeout_ms = data->set.connecttimeout*1000;
    /* subtract the passed time */
    timeout_ms -= (long)has_passed;
    if(timeout_ms < 0)
      /* a precaution, no need to continue if time already is up */
      return CURLE_OPERATION_TIMEOUTED;
  }
 #ifdef ENABLE_IPV6
  /*
   * Connecting with IPv6 support is so much easier and cleanly done
   */
  {
    struct addrinfo *ai;
    port =0; /* prevent compiler warning */
    for (ai = remotehost; ai; ai = ai->ai_next, aliasindex++) {
      sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
      if (sockfd < 0)
        continue;
      /* set socket non-blocking */
      Curl_nonblock(sockfd, TRUE);
      rc = connect(sockfd, ai->ai_addr, ai->ai_addrlen);
      if(-1 == rc) {
        int error=geterrno();
        switch (error) {
        case EINPROGRESS:
        case EWOULDBLOCK:
 #if defined(EAGAIN) && EAGAIN != EWOULDBLOCK
          /* On some platforms EAGAIN and EWOULDBLOCK are the
           * same value, and on others they are different, hence
           * the odd #if
           */
        case EAGAIN:
 #endif
        case EINTR:
          /* asynchronous connect, wait for connect or timeout */
          rc = waitconnect(sockfd, timeout_ms);
          break;
        case ECONNREFUSED: /* no one listening */
        default:
          /* unknown error, fallthrough and try another address! */
          failf(data, "Failed to connect");
          break;
        }
      }
      if(0 == rc) {
        /* we might be connected, if the socket says it is OK! Ask it! */
        int err;
        err = socketerror(sockfd);
        if ((0 == err) || (EISCONN == err)) {
          /* we are connected, awesome! */
          break;
 	}
        /* we are _not_ connected, it was a false alert, continue please */
      }
      /* connect failed or timed out */
      sclose(sockfd);
      sockfd = -1;
      /* get a new timeout for next attempt */
      after = Curl_tvnow();
      timeout_ms -= Curl_tvdiff(after, before);
      if(timeout_ms < 0) {
        failf(data, "connect() timed out!");
        return CURLE_OPERATION_TIMEOUTED;
      }
      before = after;
      continue;
    }
    if (sockfd < 0) {
      failf(data, "connect() failed");
      return CURLE_COULDNT_CONNECT;
    }
    /* leave the socket in non-blocking mode */
    if(addr)
      *addr = ai; /* the address we ended up connected to */
  }
 #else
  /*
   * Connecting with IPv4-only support
   */
  if(!remotehost->h_addr_list[0]) {
    /* If there is no addresses in the address list, then we return
       error right away */
    failf(data, "no address available");
    return CURLE_COULDNT_CONNECT;
  }
  /* create an IPv4 TCP socket */
  sockfd = socket(AF_INET, SOCK_STREAM, 0);
  if(-1 == sockfd) {
    failf(data, "couldn't create socket");
    return CURLE_COULDNT_CONNECT; /* big time error */
  }
  if(conn->data->set.device) {
    /* user selected to bind the outgoing socket to a specified "device"
       before doing connect */
    CURLcode res = bindlocal(conn, sockfd);
    if(res)
      return res;
  }
  /* Convert socket to non-blocking type */
  Curl_nonblock(sockfd, TRUE);
  /* This is the loop that attempts to connect to all IP-addresses we
     know for the given host. One by one. */
  for(rc=-1, aliasindex=0;
      rc && (struct in_addr *)remotehost->h_addr_list[aliasindex];
      aliasindex++) {
    struct sockaddr_in serv_addr;
    /* do this nasty work to do the connect */
    memset((char *) &serv_addr, '\0', sizeof(serv_addr));
    memcpy((char *)&(serv_addr.sin_addr),
           (struct in_addr *)remotehost->h_addr_list[aliasindex],
           sizeof(struct in_addr));
    serv_addr.sin_family = remotehost->h_addrtype;
    serv_addr.sin_port = htons(port);
    rc = connect(sockfd, (struct sockaddr *)&serv_addr,
                 sizeof(serv_addr));
    if(-1 == rc) {
      int error=geterrno();
      switch (error) {
      case EINPROGRESS:
      case EWOULDBLOCK:
 #if defined(EAGAIN) && EAGAIN != EWOULDBLOCK
        /* On some platforms EAGAIN and EWOULDBLOCK are the
         * same value, and on others they are different, hence
         * the odd #if
         */
      case EAGAIN:
 #endif
        /* asynchronous connect, wait for connect or timeout */
        rc = waitconnect(sockfd, timeout_ms);
        break;
      default:
        /* unknown error, fallthrough and try another address! */
        failf(data, "Failed to connect to IP number %d", aliasindex+1);
        break;
      }
    }
    if(0 == rc) {
      int err = socketerror(sockfd);
      if ((0 == err) || (EISCONN == err)) {
        /* we are connected, awesome! */
        break;
      }
      /* nope, not connected for real */
      rc = -1;
    }
    if(0 != rc) {
      /* get a new timeout for next attempt */
      after = Curl_tvnow();
      timeout_ms -= Curl_tvdiff(after, before);
      if(timeout_ms < 0) {
        failf(data, "Connect timeout on IP number %d", aliasindex+1);
        break;
      }
      before = after;
      continue; /* try next address */
    }
    break;
  }
  if(0 != rc) {
    /* no good connect was made */
    sclose(sockfd);
    *sockconn = -1;
    failf(data, "Couldn't connect to host");
    return CURLE_COULDNT_CONNECT;
  }
  /* leave the socket in non-blocking mode */
  if(addr)
    /* this is the address we've connected to */
    *addr = (struct in_addr *)remotehost->h_addr_list[aliasindex];
 #endif
  /* allow NULL-pointers to get passed in */
  if(sockconn)
    *sockconn = sockfd;    /* the socket descriptor we've connected */
  return CURLE_OK;
 }
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -0,0 +1,35 @@
 #ifndef __CONNECT_H
 #define __CONNECT_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$
 *****************************************************************************/
 int Curl_nonblock(int socket,    /* operate on this */
                  int nonblock   /* TRUE or FALSE */);
 CURLcode Curl_connecthost(struct connectdata *conn,
                          Curl_addrinfo *host, /* connect to this */
                          int port,       /* connect to this port number */
                          int *sockconn,  /* not set if error is returned */
                          Curl_ipconnect **addr /* the one we used */
                          ); /*  index we used */
 #endif
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -5,7 +5,7 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * 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.
@@ -86,6 +86,7 @@ Example set of cookies:
 #include "cookie.h"
 #include "getdate.h"
 #include "strequal.h"
 #include "strtok.h"
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
@@ -94,7 +95,7 @@ Example set of cookies:
 /****************************************************************************
 *
- * cookie_add()
+ * Curl_cookie_add()
 *
 * Add a single cookie line to the cookie keeping object.
 *
@@ -103,7 +104,8 @@ Example set of cookies:
 struct Cookie *
 Curl_cookie_add(struct CookieInfo *c,
                bool httpheader, /* TRUE if HTTP header-style line */
-                char *lineptr) /* first non-space of the line */
+                char *lineptr,   /* first non-space of the line */
                char *domain)    /* default domain */
 {
  struct Cookie *clist;
  char what[MAX_COOKIE_LINE];
@@ -111,6 +113,7 @@ Curl_cookie_add(struct CookieInfo *c,
  char *ptr;
  char *semiptr;
  struct Cookie *co;
  struct Cookie *lastc=NULL;
  time_t now = time(NULL);
  bool replace_old = FALSE;
@@ -128,13 +131,11 @@ Curl_cookie_add(struct CookieInfo *c,
    semiptr=strchr(lineptr, ';'); /* first, find a semicolon */
    ptr = lineptr;
    do {
      if(semiptr)
        *semiptr='\0'; /* zero terminate for a while */
      /* we have a <what>=<this> pair or a 'secure' word here */
      if(strchr(ptr, '=')) {
        name[0]=what[0]=0; /* init the buffers */
        if(1 <= sscanf(ptr, "%" MAX_NAME_TXT "[^=]=%"
-                       MAX_COOKIE_LINE_TXT "[^\r\n]",
+                       MAX_COOKIE_LINE_TXT "[^;\r\n]",
                       name, what)) {
          /* this is a legal <what>=<this> pair */
          if(strequal("path", name)) {
@@ -168,8 +169,8 @@ Curl_cookie_add(struct CookieInfo *c,
            co->name = strdup(name);
            co->value = strdup(what);
          }
-          else
+          /*
-            ;/* this is the second (or more) name we don't know
+            else this is the second (or more) name we don't know
            about! */
        }
        else {
@@ -177,28 +178,38 @@ Curl_cookie_add(struct CookieInfo *c,
        }
      }
      else {
-        if(sscanf(ptr, "%" MAX_COOKIE_LINE_TXT "[^\r\n]",
+        if(sscanf(ptr, "%" MAX_COOKIE_LINE_TXT "[^;\r\n]",
                  what)) {
          if(strequal("secure", what))
            co->secure = TRUE;
-          else
+          /* else,
-            ; /* unsupported keyword without assign! */
+             unsupported keyword without assign! */
        }
      }
      if(!semiptr)
        continue; /* we already know there are no more cookies */
      *semiptr=';'; /* put the semicolon back */
      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=ptr;
    } while(semiptr);
    if(NULL == co->domain)
      /* no domain given in the header line, set the default now */
      co->domain=domain?strdup(domain):NULL;
  }
  else {
    /* This line is NOT a HTTP header style line, we do offer support for
       reading the odd netscape cookies-file format here */
    char *firstptr;
    char *tok_buf;
    int fields;
    if(lineptr[0]=='#') {
@@ -214,7 +225,7 @@ Curl_cookie_add(struct CookieInfo *c,
    if(ptr)
      *ptr=0; /* clear it */
-    firstptr=strtok(lineptr, "\t"); /* first tokenize it on the TAB */
+    firstptr=strtok_r(lineptr, "\t", &tok_buf); /* first tokenize it on the TAB */
    /* Here's a quick check to eliminate normal HTTP-headers from this */
    if(!firstptr || strchr(firstptr, ':')) {
@@ -224,17 +235,39 @@ Curl_cookie_add(struct CookieInfo *c,
    /* Now loop through the fields and init the struct we already have
       allocated */
-    for(ptr=firstptr, fields=0; ptr; ptr=strtok(NULL, "\t"), fields++) {
+    for(ptr=firstptr, fields=0; ptr; ptr=strtok_r(NULL, "\t", &tok_buf), fields++) {
      switch(fields) {
      case 0:
        co->domain = strdup(ptr);
        break;
      case 1:
-        /* what _is_ this field for? */
+        /* This field got its explanation on the 23rd of May 2001 by
           Andr<64>s Garc<72>a:
           flag: A TRUE/FALSE value indicating if all machines within a given
           domain can access the variable. This value is set automatically by
           the browser, depending on the value you set for the domain.
           As far as I can see, it is set to true when the cookie says
           .domain.com and to false when the domain is complete www.domain.com
           We don't currently take advantage of this knowledge.
        */
        co->field1=strequal(ptr, "TRUE")+1; /* store information */
        break;
      case 2:
        /* It turns out, that sometimes the file format allows the path
           field to remain not filled in, we try to detect this and work
           around it! Andr<64>s Garc<72>a made us aware of this... */
        if (strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) {
          /* only if the path doesn't look like a boolean option! */
          co->path = strdup(ptr);
          break;
        }
        /* this doesn't look like a path, make one up! */
        co->path = strdup("/");
        fields++; /* add a field and fall down to secure */
        /* FALLTHROUGH */
      case 3:
        co->secure = strequal(ptr, "TRUE");
        break;
@@ -269,6 +302,8 @@ Curl_cookie_add(struct CookieInfo *c,
  }
  co->livecookie = c->running;
  /* now, we have parsed the incoming line, we must now check if this
     superceeds an already existing cookie, which it may if the previous have
     the same domain and path as this */
@@ -303,6 +338,26 @@ Curl_cookie_add(struct CookieInfo *c,
      }
      if(replace_old && !co->livecookie && clist->livecookie) {
        /* Both cookies matched fine, except that the already present
           cookie is "live", which means it was set from a header, while
           the new one isn't "live" and thus only read from a file. We let
           live cookies stay alive */
        /* Free the newcomer and get out of here! */
        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(replace_old) {
        co->next = clist->next; /* get the next-pointer first */
@@ -324,44 +379,66 @@ Curl_cookie_add(struct CookieInfo *c,
          free(clist->maxage);
        *clist = *co;  /* then store all the new data */
      }
        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;
  }
  if(!replace_old) {
-
+    /* then make the last item point on this new one */
-    /* first, point to our "next" */
+    if(lastc)
-    co->next = c->cookies;
+      lastc->next = co;
-    /* then make ourselves first in the list */
+    else
      c->cookies = co;
  }
  c->numcookies++; /* one more cookie in the jar */
  return co;
 }
 /*****************************************************************************
 *
- * cookie_init()
+ * Curl_cookie_init()
 *
 * Inits a cookie struct to read data from a local file. This is always
 * called before any cookies are set. File may be NULL.
 *
 ****************************************************************************/
-struct CookieInfo *Curl_cookie_init(char *file)
+struct CookieInfo *Curl_cookie_init(char *file, struct CookieInfo *inc)
 {
  char line[MAX_COOKIE_LINE];
  struct CookieInfo *c;
  FILE *fp;
  bool fromfile=TRUE;
  if(NULL == inc) {
    /* we didn't get a struct, create one */
    c = (struct CookieInfo *)malloc(sizeof(struct CookieInfo));
    if(!c)
      return NULL; /* failed to get memory */
    memset(c, 0, sizeof(struct CookieInfo));
    c->filename = strdup(file?file:"none"); /* copy the name just in case */
  }
  else {
    /* we got an already existing one, use that */
    c = inc;
  }
  c->running = FALSE; /* this is not running, this is init */
-  if(strequal(file, "-")) {
+  if(file && strequal(file, "-")) {
    fp = stdin;
    fromfile=FALSE;
  }
@@ -369,34 +446,35 @@ struct CookieInfo *Curl_cookie_init(char *file)
    fp = file?fopen(file, "r"):NULL;
  if(fp) {
    char *lineptr;
    bool headerline;
    while(fgets(line, MAX_COOKIE_LINE, fp)) {
      if(strnequal("Set-Cookie:", line, 11)) {
        /* This is a cookie line, get it! */
-        char *lineptr=&line[11];
+        lineptr=&line[11];
-        while(*lineptr && isspace((int)*lineptr))
+        headerline=TRUE;
          lineptr++;
        Curl_cookie_add(c, TRUE, lineptr);
      }
      else {
-        /* This might be a netscape cookie-file line, get it! */
+        lineptr=line;
-        char *lineptr=line;
+        headerline=FALSE;
      }
      while(*lineptr && isspace((int)*lineptr))
        lineptr++;
-        Curl_cookie_add(c, FALSE, lineptr);
+      Curl_cookie_add(c, headerline, lineptr, NULL);
      }
    }
    if(fromfile)
      fclose(fp);
  }
  c->running = TRUE; /* now, we're running */
  return c;
 }
 /*****************************************************************************
 *
- * cookie_getlist()
+ * Curl_cookie_getlist()
 *
 * For a given host and path, return a linked list of cookies that the
 * client should send to the server if used now. The secure boolean informs
@@ -468,9 +546,9 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c,
 /*****************************************************************************
 *
- * cookie_freelist()
+ * Curl_cookie_freelist()
 *
- * Free a list previously returned by cookie_getlist();
+ * Free a list of cookies previously returned by Curl_cookie_getlist();
 *
 ****************************************************************************/
@@ -489,7 +567,7 @@ void Curl_cookie_freelist(struct Cookie *co)
 /*****************************************************************************
 *
- * cookie_cleanup()
+ * Curl_cookie_cleanup()
 *
 * Free a "cookie object" previous created with cookie_init().
 *
@@ -528,3 +606,101 @@ void Curl_cookie_cleanup(struct CookieInfo *c)
   }
 }
 /*
 * Curl_cookie_output()
 *
 * Writes all internally known cookies to the specified file. Specify
 * "-" as file name to write to stdout.
 *
 * The function returns non-zero on write failure.
 */
 int Curl_cookie_output(struct CookieInfo *c, char *dumphere)
 {
  struct Cookie *co;
  FILE *out;
  bool use_stdout=FALSE;
  if((NULL == c) || (0 == c->numcookies))
    /* If there are no known cookies, we don't write or even create any
       destination file */
    return 0;
  if(strequal("-", dumphere)) {
    /* use stdout */
    out = stdout;
    use_stdout=TRUE;
  }
  else {
    out = fopen(dumphere, "w");
    if(!out)
      return 1; /* failure */
  }
  if(c) {
    fputs("# Netscape HTTP Cookie File\n"
          "# http://www.netscape.com/newsref/std/cookie_spec.html\n"
          "# This file was generated by libcurl! Edit at your own risk.\n\n",
          out);
    co = c->cookies;
    while(co) {
      fprintf(out,
              "%s\t" /* domain */
              "%s\t" /* field1 */
              "%s\t" /* path */
              "%s\t" /* secure */
              "%u\t" /* expires */
              "%s\t" /* name */
              "%s\n", /* value */
              co->domain?co->domain:"unknown",
              co->field1==2?"TRUE":"FALSE",
              co->path?co->path:"/",
              co->secure?"TRUE":"FALSE",
              (unsigned int)co->expires,
              co->name,
              co->value?co->value:"");
      co=co->next;
    }
  }
  if(!use_stdout)
    fclose(out);
  return 0;
 }
 #ifdef CURL_COOKIE_DEBUG
 /*
 * On my Solaris box, this command line builds this test program:
 *
 * gcc -g -o cooktest -DCURL_COOKIE_DEBUG -DHAVE_CONFIG_H -I.. -I../include cookie.c strequal.o getdate.o memdebug.o mprintf.o strtok.o -lnsl -lsocket
 *
 */
 int main(int argc, char **argv)
 {
  struct CookieInfo *c=NULL;
  if(argc>1) {
    c = Curl_cookie_init(argv[1], c);
    Curl_cookie_add(c, TRUE, "PERSONALIZE=none;expires=Monday, 13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/ftgw; secure");
    Curl_cookie_add(c, TRUE, "foobar=yes; domain=.haxx.se; path=/looser;");
    c = Curl_cookie_init(argv[1], c);
    Curl_cookie_output(c);
    Curl_cookie_cleanup(c);
    return 0;
  }
  return 1;
 }
 #endif
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -41,11 +41,14 @@ struct Cookie {
  time_t expires;    /* expires = <this> */
  char *expirestr;   /* the plain text version */
  char field1;       /* read from a cookie file, 1 => FALSE, 2=> TRUE */
  /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */
  char *version;     /* Version = <value> */
  char *maxage;      /* Max-Age = <value> */
  bool secure;       /* whether the 'secure' keyword was used */
  bool livecookie;   /* updated from a server, not a stored file */
 };
 struct CookieInfo {
@@ -53,6 +56,8 @@ struct CookieInfo {
  struct Cookie *cookies;
  char *filename; /* file we read from/write to */
  bool running;   /* state info, for cookie adding information */
  long numcookies; /* number of cookies in the "jar" */
 };
 /* This is the maximum line length we accept for a cookie line */
@@ -63,10 +68,17 @@ struct CookieInfo {
 #define MAX_NAME 256
 #define MAX_NAME_TXT "255"
-struct Cookie *Curl_cookie_add(struct CookieInfo *, bool, char *);
+/*
-struct CookieInfo *Curl_cookie_init(char *);
+ * Add a cookie to the internal list of cookies. The domain argument is only
 * used if the header boolean is TRUE.
 */
 struct Cookie *Curl_cookie_add(struct CookieInfo *, bool header, char *line,
                               char *domain);
 struct CookieInfo *Curl_cookie_init(char *, struct CookieInfo *);
 struct Cookie *Curl_cookie_getlist(struct CookieInfo *, char *, char *, bool);
 void Curl_cookie_freelist(struct Cookie *);
 void Curl_cookie_cleanup(struct CookieInfo *);
 int Curl_cookie_output(struct CookieInfo *, char *);
 #endif
--- a/lib/curllib.dsp
+++ b/lib/curllib.dsp
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib wsock32.lib /nologo /dll /machine:I386 /out:"Release/curl.dll"
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libcurl.dll"
 !ELSEIF  "$(CFG)" == "curllib - Win32 Debug"
@@ -69,7 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /FR /FD /GZ /c
 # SUBTRACT CPP /WX /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/curl.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libcurl.dll" /pdbtype:sept
 # SUBTRACT LINK32 /nodefaultlib
 !ENDIF 
@@ -97,6 +99,10 @@ SOURCE=.\base64.c
 # End Source File
 # Begin Source File
 SOURCE=.\connect.c
 # End Source File
 # Begin Source File
 SOURCE=.\cookie.c
 # End Source File
 # Begin Source File
@@ -145,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
@@ -173,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
@@ -209,6 +223,10 @@ SOURCE=.\strequal.c
 # End Source File
 # Begin Source File
 SOURCE=.\strtok.c
 # End Source File
 # Begin Source File
 SOURCE=.\telnet.c
 # End Source File
 # Begin Source File
@@ -241,6 +259,10 @@ SOURCE=.\base64.h
 # End Source File
 # Begin Source File
 SOURCE=.\connect.h
 # End Source File
 # Begin Source File
 SOURCE=.\cookie.h
 # End Source File
 # Begin Source File
@@ -341,6 +363,10 @@ SOURCE=.\strequal.h
 # End Source File
 # Begin Source File
 SOURCE=.\strtok.h
 # End Source File
 # Begin Source File
 SOURCE=.\telnet.h
 # End Source File
 # Begin Source File
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -80,11 +80,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 CURLcode Curl_dict_done(struct connectdata *conn)
 {
  return CURLE_OK;
 }
 CURLcode Curl_dict(struct connectdata *conn)
 {
  int nth;
@@ -95,7 +90,7 @@ CURLcode Curl_dict(struct connectdata *conn)
  char *nthdef = NULL; /* This is not part of the protocol, but required
                          by RFC 2229 */
  CURLcode result=CURLE_OK;
-  struct UrlData *data=conn->data;
+  struct SessionHandle *data=conn->data;
  char *path = conn->path;
  long *bytecount = &conn->bytecount;
@@ -126,13 +121,13 @@ 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 = "!";
+      database = (char *)"!";
    }
    if ((strategy == NULL) || (*strategy == (char)0)) {
-      strategy = ".";
+      strategy = (char *)".";
    }
    if ((nthdef == NULL) || (*nthdef == (char)0)) {
      nth = 0;
@@ -141,7 +136,7 @@ CURLcode Curl_dict(struct connectdata *conn)
      nth = atoi(nthdef);
    }
-    Curl_sendf(conn->firstsocket, conn,
+    result = Curl_sendf(conn->firstsocket, conn,
                        "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
                        "MATCH "
                        "%s "    /* database */
@@ -153,13 +148,13 @@ CURLcode Curl_dict(struct connectdata *conn)
                        strategy,
                        word
                        );
-    
+    if(result)
      failf(data, "Failed sending DICT request");
    else
      result = Curl_Transfer(conn, conn->firstsocket, -1, FALSE, bytecount,
                             -1, NULL); /* no upload */      
    if(result)
      return result;
  }
  else if (strnequal(path, DICT_DEFINE, sizeof(DICT_DEFINE)-1) ||
           strnequal(path, DICT_DEFINE2, sizeof(DICT_DEFINE2)-1) ||
@@ -179,10 +174,10 @@ 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 = "!";
+      database = (char *)"!";
    }
    if ((nthdef == NULL) || (*nthdef == (char)0)) {
      nth = 0;
@@ -191,17 +186,17 @@ CURLcode Curl_dict(struct connectdata *conn)
      nth = atoi(nthdef);
    }
-    Curl_sendf(conn->firstsocket, conn,
+    result = Curl_sendf(conn->firstsocket, conn,
                        "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
                        "DEFINE "
                        "%s "     /* database */
                        "%s\n"    /* word */
                        "QUIT\n",
                        database,
-               word
+                        word);
-               );
+    if(result)
-    
+      failf(data, "Failed sending DICT request");
    else
      result = Curl_Transfer(conn, conn->firstsocket, -1, FALSE, bytecount,
                             -1, NULL); /* no upload */
@@ -220,20 +215,27 @@ CURLcode Curl_dict(struct connectdata *conn)
        if (ppath[i] == ':')
          ppath[i] = ' ';
      }
-      Curl_sendf(conn->firstsocket, conn,
+      result = Curl_sendf(conn->firstsocket, conn,
                          "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
                          "%s\n"
-                 "QUIT\n",
+                          "QUIT\n", ppath);
-                 ppath);
+      if(result)
-      
+        failf(data, "Failed sending DICT request");
      else
        result = Curl_Transfer(conn, conn->firstsocket, -1, FALSE, bytecount,
                               -1, NULL);
      if(result)
        return result;
    }
  }
  return CURLE_OK;
 }
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/dllinit.c
+++ b/lib/dllinit.c
@@ -1,3 +1,4 @@
 #ifdef WIN32
 /* dllinit.c -- Portable DLL initialization. 
   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
   Contributed by Mumit Khan (khan@xraylith.wisc.edu).
@@ -80,3 +81,12 @@ DllMain (
    }
  return TRUE;
 }
 #endif
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -73,24 +73,122 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "transfer.h"
-#include <curl/types.h>
+#include "ssluse.h"
 #include "url.h"
 #include "getinfo.h"
 #include "hostip.h"
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 /* Silly win32 socket initialization functions */
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 static void win32_cleanup(void)
 {
  WSACleanup();
 }
 static CURLcode win32_init(void)
 {
  WORD wVersionRequested;  
  WSADATA wsaData; 
  int err; 
  wVersionRequested = MAKEWORD(2, 0); 
  err = WSAStartup(wVersionRequested, &wsaData); 
  if (err != 0) 
    /* Tell the user that we couldn't find a useable */ 
    /* winsock.dll.     */ 
    return CURLE_FAILED_INIT; 
  /* Confirm that the Windows Sockets DLL supports 2.0.*/ 
  /* Note that if the DLL supports versions greater */ 
  /* than 2.0 in addition to 2.0, it will still return */ 
  /* 2.0 in wVersion since that is the version we */ 
  /* requested. */ 
  if ( LOBYTE( wsaData.wVersion ) != 2 || 
       HIBYTE( wsaData.wVersion ) != 0 ) { 
    /* Tell the user that we couldn't find a useable */ 
    /* winsock.dll. */ 
    WSACleanup(); 
    return CURLE_FAILED_INIT; 
  }
  return CURLE_OK;
 }
 /* The Windows Sockets DLL is acceptable. Proceed. */ 
 #else
 /* These functions exist merely to prevent compiler warnings */
 static CURLcode win32_init(void) { return CURLE_OK; }
 static void win32_cleanup(void) { }
 #endif
 /* true globals -- for curl_global_init() and curl_global_cleanup() */
 static unsigned int  initialized = 0;
 static long          init_flags  = 0;
 /**
 * Globally initializes cURL given a bitwise set of 
 * the different features to initialize.
 */
 CURLcode curl_global_init(long flags)
 {
  if (initialized)
    return CURLE_OK;
  if (flags & CURL_GLOBAL_SSL)
    Curl_SSL_init();
  if (flags & CURL_GLOBAL_WIN32)
    if (win32_init() != CURLE_OK)
      return CURLE_FAILED_INIT;
  initialized = 1;
  init_flags  = flags;
  return CURLE_OK;
 }
 /**
 * Globally cleanup cURL, uses the value of "init_flags" to determine
 * what needs to be cleaned up and what doesn't
 */
 void curl_global_cleanup(void)
 {
  if (!initialized)
    return;
  Curl_global_host_cache_dtor();
  if (init_flags & CURL_GLOBAL_SSL)
    Curl_SSL_cleanup();
  if (init_flags & CURL_GLOBAL_WIN32)
    win32_cleanup();
  initialized = 0;
  init_flags  = 0;
 }
 CURL *curl_easy_init(void)
 {
  CURLcode res;
-  struct UrlData *data;
+  struct SessionHandle *data;
  /* Make sure we inited the global SSL stuff */
  if (!initialized)
    curl_global_init(CURL_GLOBAL_DEFAULT);
  /* We use curl_open() with undefined URL so far */
-  res = Curl_open((CURL **)&data, NULL);
+  res = Curl_open(&data);
  if(res != CURLE_OK)
    return NULL;
  /* SAC */
  data->device = NULL;
  return data;
 }
@@ -101,7 +199,7 @@ CURLcode curl_easy_setopt(CURL *curl, CURLoption tag, ...)
  func_T param_func = (func_T)0;
  long param_long = 0;
  void *param_obj = NULL;
-  struct UrlData *data = curl;
+  struct SessionHandle *data = curl;
  va_start(arg, tag);
@@ -133,20 +231,110 @@ CURLcode curl_easy_setopt(CURL *curl, CURLoption tag, ...)
 CURLcode curl_easy_perform(CURL *curl)
 {
-  return Curl_perform(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)
 {
-  Curl_close(curl);
+  struct SessionHandle *data = (struct SessionHandle *)curl;
  if (!Curl_global_host_cache_use(data)) {
    curl_hash_destroy(data->hostcache);
  }
  Curl_close(data);
 }
 CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...)
 {
  va_list arg;
  void *paramp;
  struct SessionHandle *data = (struct SessionHandle *)curl;
  va_start(arg, info);
  paramp = va_arg(arg, void *);
-  return Curl_getinfo(curl, info, paramp);
+  return Curl_getinfo(data, info, paramp);
 }
 CURL *curl_easy_duphandle(CURL *incurl)
 {
  struct SessionHandle *data=(struct SessionHandle *)incurl;
  struct SessionHandle *outcurl = (struct SessionHandle *)
    malloc(sizeof(struct SessionHandle));
  if(NULL == outcurl)
    return NULL; /* failure */
  /* start with clearing the entire new struct */
  memset(outcurl, 0, sizeof(struct SessionHandle));
  /*
   * We setup a few buffers we need. We should probably make them
   * get setup on-demand in the code, as that would probably decrease
   * the likeliness of us forgetting to init a buffer here in the future.
   */
  outcurl->state.headerbuff=(char*)malloc(HEADERSIZE);
  if(!outcurl->state.headerbuff) {
    free(outcurl); /* free the memory again */
    return NULL;
  }
  outcurl->state.headersize=HEADERSIZE;
  /* copy all userdefined values */
  outcurl->set = data->set;
  outcurl->state.numconnects = data->state.numconnects;
  outcurl->state.connects = (struct connectdata **)
      malloc(sizeof(struct connectdata *) * outcurl->state.numconnects);
  if(!outcurl->state.connects) {
    free(outcurl->state.headerbuff);
    free(outcurl);
    return NULL;
  }
  memset(outcurl->state.connects, 0,
         sizeof(struct connectdata *)*outcurl->state.numconnects);
  outcurl->progress.flags    = data->progress.flags;
  outcurl->progress.callback = data->progress.callback;
  if(data->cookies)
    /* If cookies are enabled in the parent handle, we enable them
       in the clone as well! */
    outcurl->cookies = Curl_cookie_init(data->cookies->filename,
                                        outcurl->cookies);
  /* duplicate all values in 'change' */
  if(data->change.url) {
    outcurl->change.url = strdup(data->change.url);
    outcurl->change.url_alloc = TRUE;
  }
  if(data->change.proxy) {
    outcurl->change.proxy = strdup(data->change.proxy);
    outcurl->change.proxy_alloc = TRUE;
  }
  if(data->change.referer) {
    outcurl->change.referer = strdup(data->change.referer);
    outcurl->change.referer_alloc = TRUE;
  }
  return outcurl;
 }
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -37,9 +37,9 @@
 #include "memdebug.h"
 #endif
-char *curl_escape(char *string, int length)
+char *curl_escape(const char *string, int length)
 {
-  int alloc = (length?length:strlen(string))+1;  
+  int alloc = (length?length:(int)strlen(string))+1;  
  char *ns = malloc(alloc);
  unsigned char in;
  int newlen = alloc;
@@ -54,19 +54,6 @@ char *curl_escape(char *string, int length)
            !(in >= 'A' && in <= 'Z') &&
            !(in >= '0' && in <= '9')) {
      /* encode it */
      if(('%' == in) &&
         (length>=2) &&
         isxdigit((int)string[1]) &&
         isxdigit((int)string[2]) ) {
        /*
         * This is an already encoded letter, leave it!
         */
        memcpy(&ns[index], string, 3);
        string+=2;
      }
      else {
        /* encode this now */
      newlen += 2; /* the size grows with two, since this'll become a %XX */
      if(newlen > alloc) {
        alloc *= 2;
@@ -75,7 +62,7 @@ char *curl_escape(char *string, int length)
          return NULL;
      }
      sprintf(&ns[index], "%%%02X", in);
-      }
+
      index+=3;
    }
    else {
@@ -88,9 +75,9 @@ char *curl_escape(char *string, int length)
  return ns;
 }
-char *curl_unescape(char *string, int length)
+char *curl_unescape(const char *string, int length)
 {
-  int alloc = (length?length:strlen(string))+1;
+  int alloc = (length?length:(int)strlen(string))+1;
  char *ns = malloc(alloc);
  unsigned char in;
  int index=0;
@@ -123,3 +110,11 @@ char *curl_unescape(char *string, int length)
  return ns;
 }
 /*
 * local variables:
 * eval: (load-file "../curl-mode.el")
 * end:
 * vim600: fdm=marker
 * vim: et sw=2 ts=2 sts=2 tw=78
 */
--- a/Show More
+++ b/Show More