7.9.3-pre2

--cc and working non-blocking sockets uploads
- shrunk the BUFSIZE define from 50K to 20K
2002-01-16 15:12:12 +00:00 · 2002-01-16 15:04:37 +00:00 · 2002-01-16 14:53:19 +00:00 · 2002-01-16 14:50:53 +00:00 · 2002-01-16 14:49:51 +00:00 · 2002-01-16 14:49:08 +00:00
335 changed files with 49562 additions and 13426 deletions
--- a/3639
+++ b/3639
--- a/CHANGES.0
+++ b/CHANGES.0
@@ -0,0 +1,786 @@
 Version 5.3a (win32 only)
 Troy Engel
 - Corrected a win32 bug in the environment variable part.
 Version 5.3
 Gilbert Ramirez Jr. (21 Dec 1998)
 - I have implemented the "quote" function of FTP clients. It allows you to
   send arbitrary commands to the remote FTP server. I chose the -Q/--quote
   command-line arguments.
   You can have more than one quoted string, and curl will apply them in
   order.  This is what I use for my MVS upload:
  curl -B --crlf -Q "site lrecl=80" -Q "site blk=8000" -T file ftp://os390/test
   Curl will send the two quoted "site" commands in the proper order.
 - Made it compile smoothly on AIX.
 Gilbert Ramirez Jr. (18 Dec 1998)
 - Brought an MVS patch: -3/--mvs, for ftp upload to the MVS ftp server.
 Troy Engel (17 Dec 1998)
 - Brought a correction that fixes the win32 curl bug.
 Daniel Stenberg
 - A bug, pointed out to me by Dr H. T. Leung, caused curl to crash on the -A
   flag on certain systems. Actually, all systems should've!
 - Added a few defines to make directories/file names get build nicer (with _
   instead of . and \ instead of / in win32).
 - steve <fisk at polar.bowdoin.edu> reported a weird bug that occured if the
   ftp server response line had a parenthesis on the line before the (size)
   info. I hope it works better now!
 Version 5.2.1
 Steven G. Johnson (Dec 14, 1998)
 - Brought a fix that corrected a crash in 5.2 due to bad treatment of the
   environment variables.
 Version 5.2
 Daniel Stenberg (Dec 14, 1998)
 - Rewrote the mkhelp script and now, the mkhelp.pl script generates the
   hugehelp.c file from the README *and* the man page file curl.1. By using
   both files, I no longer need to have double information in both the man
   page and the README as well. So, win32-users will only have the hugehelp.c
   file for all info, but then, they download the plain binary most times
   anyway.
 - gcc2.8.1 with the -Wall flag complaints a lot on subscript has type `char'
   if I don't explicitly typecast the argument to isdigit() or isspace() to
   int. So I did to compile warning free with that too.
 - Added checks for 'long double' and 'long long' in the configure script. I
   need those for the mprintf.c source to compile well on non long long
   comforming systems!
 Version 5.1 (not publicly released)
 Daniel Stenberg (Dec 10, 1998)
 - I got a request for a pre-compiled NT Alpha version. Anyone?
 - Added Lynx/CERN www lib proxy environment variable support. That means curl
   now reads and understands the following environment variables:
 	HTTP_PROXY, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY
   They should be set for protocol-specific proxies. General proxy should be
   set with
 	ALL_PROXY
   And a comma-separated list of host names that shouldn't go through any
   proxy is set in (only an asterisk, '*' matches all hosts).
 	NO_PROXY
   The usage of the -x/--proxy flag overrides the environment variables.
 - Proxy can now be specified with a procotol:// prefix.
 - Wrote the curl.1 man page.
 - Introduced a whole new dynamic buffer system for all sprintf()s. It is
   based on the *printf() package by yours truly and Bjorn Reese. Hopefully,
   there aren't that many buffer overflow risks left now.
 - Ah, I should mention I've compiled and built curl successfully under
   solaris 2.6 with gcc now, gcc 2.7.2 won't work but 2.8.1 did ok.
 Oren Tirosh (Dec 3, 1998)
 - Brought two .spec files, to use when creating (Linux) Redhat style RPM
   packages. They're named curl.spec and curl-ssl.spec.
 Troy Engel
 - Supplied the src/Makefile.vc6 for easy compiling with VC++ under Win32.
 Version 5.0
 Daniel Stenberg (Dec 1, 1998)
 - Not a single bug report in ages.
 - Corrected getpass.c and main.c to compile warning and error free with the
   Win32 VC++ crap.
 Version 5.0 beta 24
 Daniel Stenberg (Nov 20, 1998)
 HOW TO BUILD A RELEASE ARCHIVE:
 * Pre-requisite software:
   What		     To build what             Reads data from
   ====              =============             ===============
   GNU automake      Makefile.in, aclocal.m4   configure.in
     GNU make(1)      - " -
     GNU gcc(1)       - " -
   GNU autoconf      configure                 configure.in
   GNU autoheader(2) config.h.in	       configure.in, acconfig.h
 * Make sure all files that should be part of the archive are put in FILES.
 * Run './maketgz' and enter version number of the new to become archive.
   maketgz does:
   - Enters the newly created version number in url.h.
   - (If you don't have automake, this script will warn about that, but unless
     you have changed the Makefile.am files, that is nothing to care about.)
     If you have it, it'll run it.
   - If you have autoconf, the configure.in will be edited to get the newly
     created version number and autoconf will be run.
   - Creates a new directory named curl-<version>. (Actually, it uses the base
     name of the current directory up to the first '-'.)
   - Copies all files mentioned in FILES to the new directory. Saving
     permissions and directory structure.
   - Uses tar to create an archive of it all, named curl-<version>.tar.gz
   - gzips the archive
   - Removes the new directory and all its contents.
 * When done, you have an archive stored in your directory named
   curl-<version>.tar.gz.
   Done!
   (1) They're required to make automake run properly.
   (2) It is distributed as a part of the GNU autoconf archive.
 Daniel Stenberg (Nov 18, 1998)
 - I changed the TAG-system. If you ever used urlget() from this package in
   another product, you need to recompile with the new headers. I did this
   new stuff to better deal with different compilers and system with different
   variable sizes. I think it makes it a little more portable. This proves
   to compile warning free with the problematic IRIX compiler!
 - Win32 compiled with a silly error. Corrected now.
 - Brian Chaplin reported yet another problem in
   multiline FTP responses. I've tried to correct it. I mailed him a new
   version and I hope he gets back soon with positive feedback!
 - Improved the 'maketgz' to create a temporary directory tree which it makes
   an archive from instead of the previous renaming of the current one.
 - Mailing list opened (see README).
 - Made -v more verbose on the PASV section of ftp transfers. Now it tells
   host name and IP of the new host (and port number). I also added a section
   about PORT vs PASV in the README.
 Version 5.0 beta 21
 Angus Mackay (Nov 15, 1998)
 - Introduced automake stuff.
 Daniel Stenberg (Nov 13, 1998)
 - Just made a successful GET of a document from an SSL-server using my own
   private certificate for authentication! The certificate has to be in PEM
   format. You do that the easiest way (although not *that* easy) by
   downloading the SSLyeay PKCS#12-patch by Dr Stephen N. Henson from his site
   at: http://www.drh-consultancy.demon.co.uk/. Using his tool, you can
   convert any modern Netscape or (even) MSIE certificate to PEM-format.  Use
   it with 'curl -E <certificate:password> https://site.com'.  If this isn't a
   cool feature, then I don't know what cool features look like! ;-)
 - Working slowly on telnet connections. #define TRY_TELNET to try it out.
   (curl -u user:passwd "telnet://host.com/cat .login" is one example) I do
   have problem to define how it should work. The prime purpose for this must
   be to get (8bit clean) files via telnet, and it really isn't that easy to
   get files this way. Still having problems with \n being converted to \r\n.
 Angus Mackay (Nov 12, 1998)
 - Corrected another bug in the long parameter name parser.
 - Modified getpass.c (NOTE: see the special licensing in the top of that
   source file).
 Daniel Stenberg (Nov 12, 1998)
 - We may have removed the silly warnings from url.c when compiled under IRIX.
   Thanks again to Bjorn Reese and Martin Staael.
 - Wrote formfind.pl which is a new perl script intended to help you find out
   how a FORM submission should be done. This needs a little more work to get
   really good.
 Daniel Stenberg (Nov 11, 1998)
 - Made the HTTP header-checker accept white spaces before the HTTP/1.? line.
   Appearantly some proxies/sites add such at times (my test proxy did when I
   downloaded a gopher page with it)!
 - Moved the former -h to -M and made -h show the short help text instead. I
   had to enable a forced help text option. Now an even shorter help text will
   be presented when an unknown option and similar, is used.
 - stdcheaders.h didn't work with IRIX 6.4 native cc compiler. I hope my
   changes don't make other versions go nuts instead.
 Daniel Stenberg (Nov 10, 1998)
 - Added a weird check in the configure script to check for the silly AIX
   warnings about my #define strcasecmp() stuff. I do that define to prevent
   me and other contributors to accidentaly use that function name instead
   of strequal()...
 - I bugfixed Angus's getpass.c very little.
 - Fixed the verbose flag names to getopt-style, i.e 'curl --loc' will be
   sufficient instead of --location as "loc" is a unique prefix. Also, anything
   after a '--' is treated as an URL. So if you do have a host with a weeeird
   name you can do 'curl -- -host.com'.
 - Another getopt-adjust; curl now accepts flags after the URL on the command
   line. 'curl www.foo.com -O' is perfectly valid.
 - Corrected the .curlrc parser so that strtok() is no longer used and I
   believe it works better. Even URLs can be specified in it now.
 Angus Mackay (Nov 9, 1998)
 - Replaced getpass.c with a newly written one, not under GPL license
 - Changed OS to a #define in config.h instead of compiler flag
 - Makefile now uses -DHAVE_CONFIG_H
 Daniel Stenberg (Nov 9, 1998)
 - Ok, I expanded the tgz-target to update the version string on each occation
   I build a release archive!
 - I reacted on Angus Mackay's initiative and remade the parameter parser to
   be more getopt compliant. Curl now supports "merged" flags as in 
 	curl -lsv ftp.site.com
   Do note that I had to move three short-names of the options. Parameters
   that needs an additional string such as -x must be stand-alone or the
   last in a merged sequence:
 	curl -lsx my-proxy ftp.site.com
   is ok, but using the flags in a different order like '-lxs' would cause
   unexpected results (as the 's' option would be skipped).
 - I've changed the headers in all files that are subject to the MozPL
   license, as they are supposed to look like when conforming.
 - Made the configure script make the config.h. The former config.h is now
   setup.h.
 - The RESOURCES and TODO files have been added to the archive.
 Angus Mackay (Nov 5, 1998)
 - Fixed getpass.c and various configure stuff
 Daniel Stenberg (Nov 3, 1998)
 - Use -H/--header for custom HTTP-headers. Lets you pass on your own
   specified headers to the remote server. I wouldn't recommend trying to use
   a header with a defined usage according to standards. Use this flag once
   for every custom header you want to add.
 - Use -B/--ftp-ascii to force ftp to use ASCII mode when transfering files.
 - Corrected the 'getlinks.pl' script, I accidentally left my silly proxy
   usage in there! Since the introduction of the .curlrc file, it is easier to
   write scripts that use curl since proxies and stuff should be in the
   .curlrc file anyway.
 - Introducing the new -F flag for HTTP POST. It supports multipart/form-data
   which means it is gonna be possible to upload files etc through HTTP POST.
   Shiraz Kanga asked for the feature and my brother,
   Bj<42>rn Stenberg helped me design the user
   interface for this beast.  This feature requires quite some docs,
   since it has turned out not only quite capable, but also complicated! :-)
 - A note here, since I've received mail about it. SSLeay versions prior to
   0.8 will *not* work with curl!
 - Wil Langford reported a bug that occurred since curl
   did not properly use CRLF when issuing ftp commands. I fixed it.
 - Rearranged the order config files are read. .curlrc is now *always* read
   first and before the command line flags. -K config files then act as
   additional config items.
 - Use -q AS THE FIRST OPTION specified to prevent .curlrc from being read.
 - You can now disable a proxy by using -x "". Useful if the .curlrc file
   specifies a proxy and you wanna fetch something without going through
   that.
 - I'm thinking of dropping the -p support. Its really not useful since ports
   could (and should?) be specified as :<port> appended on the host name
   instead, both in URLs and to proxy host names.
 - Martin Staael reports curl -L bugs under Windows NT
   (test with URL http://come.to/scsde). This bug is not present in this
   version anymore.
 - Added support for the weird FTP URL type= thing. You can download a file
   using ASCII transfer by appending ";type=A" to the right of it. Other
   available types are type=D for dir-list (NLST) and type=I for binary
   transfer. I can't say I've ever seen anyone use this kind of URL though!
   :-)
 - Troy Engel pointed out a bug in my getenv("HOME")
   usage for win32 systems. I introduce getenv.c to better cope with
   this. Mr Engel helps me with the details around that...
 - A little note to myself and others, I should make the win32-binary built
   with SSL support...
 - Ryan Nelson sent me comments about building curl
   with SSL under FreeBSD. See the Makefile for details. Using the configure
   script, it should work better and automatically now...
 - Cleaned up in the port number mess in the source. No longer stores and uses
   proxy port number separate from normal port number.
 - 'configure' script working. Confirmed compiles on:
    Host         SSL  Compiler
    SunOS 5.5    no   gcc
    SunOS 5.5.1  yes  gcc
    SunOS 5.6    no   cc  (with gcc, it has the "gcc include files" problem)
    SunOS 4.1.3  no   gcc (without ANSI C headers)
    SunOS 4.1.2  no   gcc (native compiler failed)
    Linux 2.0.18 no   gcc
    Linux 2.0.32 yes  gcc
    Linux 2.0.35 no   gcc (with glibc)
    IRIX 6.2     no   gcc (cc compiles generate a few warnings)
    IRIX 6.4     no   cc  (generated warnings though)
    Win32        no   Borland
    OSF4.0	 no   ?
 - Ooops. The 5beta (and 4.10) under win32 failed if the HOME variable wasn't
   set.
 - When using a proxy, curl now guesses and uses the protocol part in cases
   like:
 	curl -x proxy:80 www.site.com
   Proxies normally go nuts unless http:// is prepended to the host name, so
   if curl is used like this, it guesses protocol and appends the protocol
   string before passing it to the proxy. It already did this when used
   without proxy.
 - Better port usage with SSL through proxy now. If you specified a different
   https-port when accessing through a proxy, it didn't use that number
   correctly. I also rewrote the code that parses the stuff read from the
   proxy when you wanna connect through it with SSL.
 - Bjorn Reese helped me work around one of the compiler
   warnings on IRIX native cc compiles.
 Version 4.10 (Oct 26, 1998)
 Daniel Stenberg
 - John A. Bristor suggested a config file switch,
   and since I've been having that idea kind of in the background for a long
   time I rewrote the parameter parsing function a little and now I introduce
   the -K/--config flag. I also made curl *always* (unless -K is used) try to
   load the .curlrc file for command line parameters. The syntax for the
   config file is the standard command line argument style. Details in 'curl
   -h' or the README.
 - I removed the -k option. Keep-alive isn't really anything anyone would
   want to enable with curl anyway.
 - Martin Staael helped me add the 'irix' target. Now
   "make irix" should build curl successfully on non-gcc SGI machines.
 - Single switches now toggle behaviours. I.e if you use -v -v the second
   will switch off the verbose mode the first one enabled. This is so that
   you can disable a default setting a .curlrc file enables etc.
 Version 4.9 (Oct 7, 1998)
 Daniel Stenberg
 - Martin Staael suggested curl would support cookies.
   I added -b/--cookie to enable free-text cookie data to be passed. There's
   also a little blurb about general cookie stuff in the README/help text.
 - dmh <dmh at jet.es> suggested HTTP resume capabilities. Although you could
   manually get curl to resume HTTP documents, I made the -c resume flag work
   for HTTP too (unless -r is used too, which would be very odd anyway).
 - Added checklinks.pl to the archive. It is a still experimental perl script
   that checks all links of a web page by using curl.
 - Rearranged the archive hierarchy a little. Build the executable in the
   src/ dir from now on!
 - Version 4.9 and hereafter, is no longer released under the GPL license.
   I have now updated the LEGAL file etc and now this is released using the
   Mozilla Public License to avoid the plague known as "the GPL virus". You
   must make the source available if you decide to change and/or redistribute
   curl, but if you decide to use curl within something else you do not need
   to offer the world the source to that too.
 - Curl did not like HTTP servers that sent no headers at all on a GET
   request.  It is a violation of RFC2068 but appearantly some servers do
   that anyway.  Thanks to Gordon Beaton for the report!
 - -L/--location was added after a suggestion from Martin Staael. This makes
   curl ATTEMPT to follow the Location: redirect if one is present in the HTTP
   headers. If -i or -I is used with this flag, you will see headers from all
   sites the Location: points to. Do note that the first server can point to a
   second that points to a third etc. It seems the Location: parameter (said
   to be an AbsoluteURI in RFC2068) isn't always absolute.. :-/ Anyway, I've
   made curl ATTEMPT to do the best it can to deal with the reality.
 - Added getlinks.pl to the archive. getlinks.pl selectively downloads
   files that a web page links to.
 Version 4.8.4
 Daniel Stenberg
 - As Julian Romero Nieto reported, curl reported wrong version number.
 - As Teemu Yli-Elsila pointed out, the win32 version of 4.8 (and probably all
   other versions for win32) didn't work with binary files since I'm too used
   to the UNIX style fopen() where binary and text don't differ...
 - Ralph Beckmann brought me some changes that lets curl compile error and
   warning free with -Wall -pedantic with g++. I also took the opportunity to
   clean off some unused variables and similar.
 - Ralph Beckmann made me aware of a really odd bug now corrected. When curl
   read a set of headers from a HTTP server, divided into more than one read
   and the first read showed a full line *exactly* (i.e ending with a
   newline), curl did not behave well.
 Version 4.8.3
 Daniel Stenberg
 - I was too quick to release 4.8.2 with too little testing. One of the
   changes is now reverted slightly to the 4.8.1 way since 4.8.2 couldn't
   upload files. I still think both problems corrected in 4.8.2 remain
   corrected.  Reported by Julian Romero Nieto.
 Version 4.8.2
 Daniel Stenberg
 - Bernhard Iselborn reported two FTP protocol errors curl did. They're now
   corrected. Both appeared when getting files from a MS FTP server! :-)
 Version 4.8.1
 Daniel Stenberg
 - Added a last update of the progress meter when the transfer is done. The
   final output on the screen didn't have to be the final size transfered
   which made it sometimes look odd.
 - Thanks to David Long I got rid of a silly bug that happened if a HTTP-page
   had nothing but header. Appearantly Solaris deals with negative sizes in
   fwrite() calls a lot better than Linux does... =B-]
 Version 4.8
 Daniel Stenberg
 - Continue FTP file transfer. -c is the switch. Note that you need to
   specify a file name if you wanna resume a download (you can't resume a
   download sent to stdout). Resuming upload may be limited by the server
   since curl is then using the non-RFC959 command SIZE to get the size of
   the target file before upload begins (to figure out which offset to
   use). Use -C to specify the offset yourself! -C is handy if you're doing
   the output to something else but a plain file or when you just want to get
   the end of a file.
 - recursiveftpget.pl now features a maximum recursive level argument.
 Version 4.7
 Daniel Stenberg
 - Added support to abort a download if the speed is below a certain amount
   (speed-limit) bytes per second for a certain (speed-time) time.
 - Wrote a perl script 'recursiveftpget.pl' to recursively use curl to get a
   whole ftp directory tree. It is meant as an example of how curl can be
   used.  I agree it isn't the wisest thing to do to make a separate new
   connection for each file and directory for this.
 Version 4.6
 Daniel Stenberg
 - Added a first attempt to optionally parse the .netrc file for login user
   and password. If used with http, it enables user authentication. -n is
   the new switch.
 - Removed the extra newlines on the default user-agent string.
 - Corrected the missing ftp upload error messages when it failed without the
   verbose flag set. Gary W. Swearingen found it.
 - Now using alarm() to enable second-precision timeout even on the name
   resolving/connecting phase. The timeout is although reset after that first
   sequence. (This should be corrected.) Gary W. Swearingen reported.
 - Now spells "Unknown" properly, as in "Unknown option 'z'"... :-)
 - Added bug report email address in the README.
 - Added a "current speed" field to the progress meter. It shows the average
   speed the last 5 seconds. The other speed field shows the average speed of
   the entire transfer so far.
 Version 4.5.1
 Linas Vepstas
 - SSL through proxy fix
 - Added -A to allow User-Agent: changes
 Daniel Stenberg 
 - Made the -A work when SSL-through-proxy.
 Version 4.5
 Linas Vepstas
 - More SSL corrections
 - I've added a port to AIX.
 - running SSL through a proxy causes a chunk of code to be executred twice.
   one of those blocks needs to be deleted.
 Daniel Stenberg
 - Made -i and -I work again
 Version 4.4
 Linas Vepstas
 - -x can now also specify proxyport when used as in 'proxyhost:proxyport'
 - SSL fixes
 Version 4.3
 Daniel Stenberg
 - Adjusted to compile under win32 (VisualC++ 5). The -P switch does not
   support network interface names in win32. I couldn't figure out how!
 Version 4.2
 Linas Vepstas / Sampo Kellomaki
 - Added SSL / SSLeay support (https://)
 - Added the -T usage for HTTP POST.
 Daniel Stenberg
 - Bugfixed the SSL implementation.
 - Made -P a lot better to use other IP addresses. It now accepts a following
   parameter that can be either
        interface - i.e "eth0" to specify which interface's IP address you
                    want to use
        IP address - i.e "192.168.10.1" to specify exact IP number
        host name - i.e "my.host.domain" to specify machine
        "-"       - (any single-letter string) to make it pick the machine's
                    default
 - The Makefile is now ready to compile for solaris, sunos4 and linux right
   out of the box.
 - Better generated version string seen with 'curl -V'
 Version 4.1
 Daniel Stenberg
 - The IP number returned by the ftp server as a reply to PASV does no longer
   have to DNS resolve. In fact, no IP-number-only addresses have to anymore.
 - Binds better to available port when -P is used.
 - Now LISTs ./ instead of / when used as in ftp://ftp.funet.fi/. The reason
   for this is that exactly that site, ftp.funet.fi, does not allow LIST /
   while LIST ./ is fine. Any objections?
 Version 4 (1998-03-20)
 Daniel Stenberg
 - I took another huge step and changed both version number and project name!
   The reason for the new name is that there are just one too many programs
   named urlget already and this program already can a lot more than merely
   getting URLs, and the reason for the version number is that I did add the
   pretty big change in -P and since I changed name I wanted to start with
   something fresh!
 - The --style flags are working better now.
 - Listing directories with FTP often reported that the file transfer was
   incomplete. Wrong assumptions were too common for directories, why no
   size will be attempted to get compared on them from now on.
 - Implemented the -P flag that let's the ftp control issue a PORT command
   instead of the standard PASV.
 - -a for appending FTP uploads works.
 ***************************************************************************
 Version 3.12 (14 March 1998)
 Daniel Stenberg
 - End-of-header tracking still lacked support for \r\n or just \n at the
   end of the last header line.
 Sergio Barresi
 - Added PROXY authentication.
 Rafael Sagula
 - Fixed some little bugs.
 Version 3.11
 Daniel Stenberg
 - The header parsing was still not correct since the 3.2 modification...
 Version 3.10
 Daniel Stenberg
 - 3.7 and 3.9 were simultaneously developed and merged into this version.
 - FTP upload did not work correctly since 3.2.
 Version 3.9
 Rafael Sagula
 - Added the "-e <url> / --referer <url>" option where we can specify
   the referer page. Obviously, this is necessary only to fool the
   server, but...
 Version 3.7
 Daniel Stenberg
 - Now checks the last error code sent from the ftp server after a file has
   been received or uploaded. Wasn't done previously.
 - When 'urlget <host>' is used without a 'protocol://' first in the host part,
   it now checks for host names starting with ftp or gopher and if it does,
   it uses that protocol by default instead of http.
 Version 3.6
 Daniel Stenberg
 - Silly mistake made the POST bug. This has now also been tested to work with
   proxy.
 Version 3.5
 Daniel Stenberg
 - Highly inspired by Rafael Sagula's changes to the 3.1 that added an almost
   functional POST, I applied his changes into this version and made them work.
   (It seems POST requires the Content-Type and Content-Length headers.) It is
   now usable with the -d switch.
 Version 3.3 - 3.4
 Passed to avoid confusions
 Version 3.2
 Daniel Stenberg
 - Major rewrite of two crucial parts of this code: upload and download.
   They are both now using a select() switch, that allows much better
   progress meter and time control. 
 - alarm() usage removed completely
 - FTP get can now list directory contents if the path ends with a slash '/'.
   Urlget on a ftp-path that doesn't end with a slash means urlget will
   attempt getting it as a file name.
 - FTP directory view supports -l for "list-only" which lists the file names
   only.
 - All operations support -m for max time usage in seconds allowed.
 - FTP upload now allows the size of the uploaded file to be provided, and
   thus it can better check it actually uploaded the whole file. It also
   makes the progress meter for uploads much better!
 - Made the parameter parsing fail in cases like 'urlget -r 900' which
   previously tried to connect to the host named '900'.
 Version 3.1
 Kjell Ericson
 - Pointed out how to correct the 3 warnings in win32-compiles.
 Daniel Stenberg
 - Removed all calls to exit().
 - Made the short help text get written to stdout instead of stderr.
 - Made this file instead of keeping these comments in the source.
 - Made two callback hooks, that enable external programs to use urlget()
   easier and to grab the output/offer the input easier.
 - It is evident that Win32-compiles are painful. I watched the output from
   the Borland C++ v5 and it was awful. Just ignore all those warnings.
 Version 3.0
 Daniel Stenberg
 - Added FTP upload capabilities. The name urlget gets a bit silly now
   when we can put too... =)
 - Restructured the source quite a lot.
   Changed the urlget() interface. This way, we will survive changes much
   better. New features can come and old can be removed without us needing
   to change the interface. I've written a small explanation in urlget.h
   that explains it.
 - New flags include -t, -T, -O and -h. The -h text is generated by the new
   mkhelp script.
 Version 2.9
 Remco van Hooff
 - Added a fix to make it compile smoothly on Amiga using the SAS/C
   compiler.
 Daniel Stenberg
 - Believe it or not, but the STUPID Novell web server seems to require
   that the Host: keyword is used, so well I use it and I (re-introduce) the
   urlget User-Agent:. I still have to check that this Host: usage works with
   proxies... 'Host:' is required for HTTP/1.1 GET according to RFC2068.
 Version 2.8
 Rafael Sagula
 - some little modifications
 Version 2.7
 Daniel Stenberg
 - Removed the -l option and introduced the -f option instead. Now I'll
   rewrite the former -l kludge in an external script that'll use urlget to
   fetch multipart files like that.
 - '-f' is introduced, it means Fail without output in case of HTTP server
   errors (return code >=300).
 - Added support for -r, ranges. Specify which part of a document you 
   want, and only that part is returned. Only with HTTP/1.1-servers.
 - Split up the source in 3 parts. Now all pure URL functions are in
   urlget.c and stuff that deals with the stand-alone program is in main.c.
 - I took a few minutes and wrote an embryo of a README file to explain
   a few things.
 Version 2.6
 Daniel Stenberg
 - Made the -l (loop) thing use the new CONF_FAILONERROR which makes
   urlget() return error code if non-successful. It also won't output anything
   then. Now finally removed the HTTP 1.0 and error 404 dependencies.
 - Added -I which uses the HEAD request to get the header only from a
   http-server.
 Version 2.5
 Rafael Sagula
 - Made the progress meter use HHH:MM:SS instead of only seconds.
 Version 2.4
 Daniel Stenberg
 - Added progress meter. It appears when downloading > BUFFER SIZE and
   mute is not selected. I found out that when downloading large files from
   really really slow sites, it is desirable to know the status of the
   download. Do note that some downloads are done unawaring of the size, which
   makes the progress meter less thrilling ;) If the output is sent to a tty,
   the progress meter is shut off.
 - Increased buffer size used for reading.
 - Added length checks in the user+passwd parsing.
 - Made it grok user+passwd for HTTP fetches. The trick is to base64
   encode the user+passwd and send an extra header line. Read chapter 11.1 in
   RFC2068 for details. I added it to be used just like the ftp one.  To get a
   http document from a place that requires user and password, use an URL
   like:
        http://user:passwd@www.site.to.leach/doc.html
   I also added the -u flag, since WHEN USING A PROXY YOU CAN'T SPECIFY THE
   USER AND PASSWORD WITH HTTP LIKE THAT. The -u flag works for ftp too, but
   not if used with proxy. To do the same as the above one, you can invoke:
        urlget -u user:passwd http://www.site.to.leach/doc.html
 Version 2.3
 Rafael Sagula
 - Added "-o" option (output file)
 - Added URG_HTTP_NOT_FOUND return code.
   (Daniel's note:)
   Perhaps we should detect all kinds of errors and instead of writing that
   custom string for the particular 404-error, use the error text we actually
   get from the server. See further details in RFC2068 (HTTP 1.1
   definition). The current way also relies on a HTTP/1.0 reply, which newer
   servers might not do.
 - Looping mode ("-l" option). It's easier to get various split files.
   (Daniel's note:)
   Use it like 'urlget -l 1 http://from.this.site/file%d.html', which will
   make urlget to attempt to fetch all files named file1.html, file2.html etc
   until no more files are found. This is only a modification of the
   STAND_ALONE part, nothing in the urlget() function was modfified for this.
 Daniel Stenberg
 - Changed the -h to be -i instead. -h should be preserved to help use.
 - Bjorn Reese indicated that Borland _might_ use '_WIN32' instead of the
   VC++ WIN32 define and therefore I added a little fix for that.
 Version 2.2
 Johan Andersson
 - The urlget function didn't set the path to url when using proxy.
 - Fixed bug with IMC proxy. Now using (almost) complete GET command.
 Daniel Stenberg
 - Made it compile on Solaris. Had to reorganize the includes a bit.
   (so Win32, Linux, SunOS 4 and Solaris 2 compile fine.)
 - Made Johan's keepalive keyword optional with the -k flag (since it
   makes a lot of urlgets take a lot longer time).
 - Made a '-h' switch in case you want the HTTP-header in the output.
 Version 2.1
 Daniel Stenberg and Kjell Ericson
 - Win32-compilable
 - No more global variables
 - Mute option (no output at all to stderr)
 - Full range of return codes from urlget(), which is now written to be a
   function for easy-to-use in [other] programs.
 - Define STAND_ALONE to compile the stand alone urlget program
 - Now compiles with gcc options -ansi -Wall -pedantic ;)
 Version 2.0
 - Introducing ftp GET support. The FTP URL type is recognized and used.
 - Renamed the project to 'urlget'.
 - Supports the user+passwd in the FTP URL (otherwise it tries anonymous
   login with a weird email address as password).
 Version 1.5
 Daniel Stenberg
 - The skip_header() crap messed it up big-time. By simply removing that
   one we can all of a sudden download anything ;)
 - No longer requires a trailing slash on the URLs.
 - If the given URL isn't prefixed with 'http://', HTTP is assumed and
   given a try!
 - 'void main()' is history.
 Version 1.4
 Daniel Stenberg
 - The gopher source used the ppath variable instead of path which could
   lead to disaster.
 Version 1.3
 Daniel Stenberg
 - Well, I added a lame text about the time it took to get the data. I also
   fought against Johan to prevent his -f option (to specify a file name
   that should be written instead of stdout)! =)
 - Made it write 'connection refused' for that particular connect()
   problem.
 - Renumbered the version. Let's not make silly 1.0.X versions, this is
   a plain 1.3 instead.
 Version 1.2
 Johan Andersson
 - Discovered and fixed the problem with getting binary files. puts() is
   now replaced with fwrite(). (Daniel's note: this also fixed the buffer
   overwrite problem I found in the previous version.)
 Rafael Sagula
 - Let "-p" before "-x".
 Daniel Stenberg
 - Bugfixed the proxy usage. It should *NOT* use nor strip the port number
   from the URL but simply pass that information to the proxy. This also
   made the user/password fields possible to use in proxy [ftp-] URLs.
   (like in ftp://user:password@ftp.my.site:8021/README)
 Johan Andersson
 - Implemented HTTP proxy support.
 - Receive byte counter added.
 Bjorn Reese
 - Implemented URLs (and skipped the old syntax).
 - Output is written to stdout, so to achieve the above example, do:
   httpget http://143.54.10.6/info_logo.gif > test.gif
 Version 1.1
 Daniel Stenberg
 - Adjusted it slightly to accept named hosts on the command line. We
   wouldn't wanna use IP numbers for the rest of our lifes, would we?
 Version 1.0
  Rafael Sagula
  - Wrote the initial httpget, which started all this!
--- 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/74
+++ b/74
@@ -1,74 +0,0 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 CONTRIBUTE
 To Think About When Contributing Source Code
 This document is intended to offer some guidelines that can be useful to
 keep 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.
 Naming
 Try using a non-confusing naming scheme for your new functions and variable
 names. It doesn't necessarily have to mean that you should use the same as
 in other places of the code, just that the names should be logical,
 understandable and be named according to what they're used for.
 Indenting
 Please try using the same indenting levels and bracing method as all the
 other code already does. It makes the source code a lot easier to follow if
 all of it is written using the same style. I don't ask you to like it, I
 just ask you to follow the tradition! ;-)
 Commenting
 Comment your source code extensively. I don't see myself as a very good
 source commenter, but I try to become one. Commented code is quality code
 and enables future modifications much more. Uncommented code much more risk
 being completely replaced when someone wants to extend things, since other
 persons' source code can get quite hard to read.
 General Style
 Keep your functions small. If they're small you avoid a lot of mistakes and
 you don't accidentaly mix up variables.
 Non-clobbering All Over
 When you write new functionality or fix bugs, it is important that you
 don't fiddle all over the source files and functions. Remember that it is
 likely that other people have done changes in the same source files as you
 have and possibly even in the same functions. If you bring completely new
 functionality, try writing it in a new source file. If you fix bugs, try to
 fix one bug at a time and send them as separate patches.
 Separate Patches Doing Different Things
 It is annoying when you get a huge patch from someone that is said to fix 511
 odd problems, but discussions and opinions don't agree with 510 of them - or
 509 of them were already fixed in a different way. Then the patcher needs to
 extract the single interesting patch from somewhere within the huge pile of
 source, and that gives a lot of extra work. Preferably, all fixes that
 correct different problems should be in their own patch with an attached
 description exactly what they correct so that all patches can be selectively
 applied by the maintainer or other interested parties.
 Document
 Writing docs is dead boring and one of the big problems with many open
 source projects. Someone's gotta do it. It makes it a lot easier if you
 submit a small description of your fix or your new features with every
 contribution so that it can be swiftly added to the package documentation.
 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.
--- a/59
+++ b/59
@@ -0,0 +1,59 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 CVS-INFO
 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/         is a subdirectory with various perl scripts
 To build after having extracted everything from CVS, do this:
 ./buildconf
 ./configure
 make
 REQUIREMENTS
 You need the following software installed:
 o autoconf 2.50 (or later)
 o automake 1.5 (or later)
 o libtool  1.4 (or later)
 o GNU m4 (required by autoconf)
 o nroff + perl (if you don't have nroff and perl and you for some reason
   don't want to install them, you can rename the source file
   src/hugehelp.c.cvs to src/hugehelp.c and avoid having to generate this
   file. This will of course give you an older version of the file that isn't
   up-to-date. That file was checked in once and won't be updated very
   regularly.)
 MAC OS X
 For Mac OS X users, Guido Neitzer write down the following step-by-step guide:
 1. Install fink (http://fink.sourceforge.net)
 2. Update fink to the newest version (with the installed fink)
 3. Install the latest version of autoconf, automake and m4 with fink
 4. Install version 1.4.1 of libtool - you find it in the "unstable" section
    (read the manual to see how to get unstable versions)
 5. Get cURL from the cvs
 6. Build cURL with "./buildconf", "./configure", "make", "sudo make install"
--- a/59
+++ b/59
@@ -1,59 +0,0 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 FAQ
 Problems connecting to SSL servers.
 ===================================
  It took a very long time before I could sort out why curl had problems
  to connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.
  The error sometimes showed up similar to:
  16570:error:1407D071:SSL routines:SSL2_READ:bad mac decode:s2_pkt.c:233:
  It turned out to be because many older SSL servers don't deal with SSLv3
  requests properly. To correct this problem, tell curl to select SSLv2 from
  the command line (-2/--sslv2).
  I have also seen examples where the remote server didn't like the SSLv2
  request and instead you had to force curl to use SSLv3 with -3/--sslv3.
 Does curl support resume?
 =========================
  Yes. Both ways on FTP, download ways on HTTP.
 Is libcurl thread safe?
 =======================
  Yes, as far as curl's own code goes. It does use system calls that often
  aren't thread safe in most environments, such as gethostbyname().
  I am very interested in once and for all getting some kind of report or
  README file from those who have used libcurl in a threaded environment,
  since I haven't and I get this question more and more frequently!
 Why doesn't my posting using -F work?
 =====================================
  You can't simply use -F or -d at your choice. The web server that will
  receive your post assumes one of the formats. If the form you're trying to
  "fake" sets the type to 'multipart/form-data', than and only then you must
  use the -F type. In all the most common cases, you should use -d which then
  causes a posting with the type 'application/x-www-form-urlencoded'.
 Does curl support custom FTP commands?
 ======================================
  Yes it does, you can tell curl to perform optional commands both before
  and/or after a file transfer. Study the -Q/--quote option.
  Since curl is used for file transfers, you don't use curl to just perform
  ftp commands without transfering anything. Therefore you must always specify
  a URL to transfer to/from even when doing custom FTP commands.
--- a/47
+++ b/47
@@ -1,47 +0,0 @@
 BUGS
 CHANGES
 CONTRIBUTE
 FEATURES
 FAQ
 FILES
 INSTALL
 LEGAL
 MPL-1.0.txt
 README
 README.curl
 README.libcurl
 curl.1
 *spec
 RESOURCES
 TODO
 maketgz
 Makefile.in
 Makefile.am
 acconfig.h
 aclocal.m4
 config.guess
 config.h.in
 config-win32.h
 config.sub
 configure
 configure.in
 install-sh
 missing
 mkinstalldirs
 reconf
 stamp-h.in
 src/*.[ch]
 src/*in
 src/*am
 src/mkhelp.pl
 src/Makefile.vc6
 src/*m32
 lib/getdate.y
 lib/*.[ch]
 lib/*in
 lib/*am
 lib/Makefile.vc6
 lib/*m32
 include/README
 include/curl/*.h
--- a/256
+++ b/256
@@ -1,256 +0,0 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
                                How To Compile
 Curl has been compiled and built on numerous different operating systems. The
 way to proceed is mainly devided in two different ways: the unix way or the
 windows way.
 If you're using Windows (95, 98, NT) or OS/2, you should continue reading from
 the Win32 header below. All other systems should be capable of being installed
 as described un the the UNIX header.
 PORTS
 =====
   Just to show off, this is a probably incomplete list of known hardware and
   operating systems that curl has been compiled for:
        Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7
        Sparc SunOS 4.1.*
        i386 Linux 1.3, 2.0, 2.2
        MIPS IRIX 6.2, 6.5
        HP-PA HP-UX
        Alpha DEC OSF 4
        i386 Solaris 2.7
        PowerPC Mac OS X
        Power AIX 4.3.1
        - Ultrix
        i386 FreeBSD
        i386 NetBSD
        i386 OpenBSD
        m68k OpenBSD
        i386 Windows 95, 98, NT
        i386 OS/2
        m68k AmigaOS 3
 UNIX
 ====
   The configure script *always* tries to find a working SSL library unless
   explicitely told not to.  If you have SSLeay or OpenSSL installed in the
   default search path for your compiler/linker, you don't need to do anything
   special.
   If you have SSLeay or OpenSSL installed in /usr/local/ssl, you can
   run configure like so:
 	./configure --with-ssl
   If you have SSLeay or OpenSSL installed somewhere else (for example,
   /opt/OpenSSL,) you can run configure like this:
 	./configure --with-ssl=/opt/OpenSSL
   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:
        ./configure --without-ssl
   If you have SSLeay or OpenSSL installed, but with the libraries in
   one place and the header files somewhere else, you'll have to set the
   LDFLAGS and CPPFLAGS environment variables prior to running configure.
   Something like this should work:
     (with the Bourne shell and its clones):
       CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
           ./configure
     (with csh, tcsh and their clones):
       env CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
       ./configure
   If your SSL library was compiled with rsaref (usually for use in
   the United States), you may also need to set:
     LIBS=-lRSAglue -lrsaref
     (from Doug Kaufman <dkaufman@rahul.net>)
   Without SSL support, just run:
     ./configure
   Then run:
     make
   Use the executable `curl` in src/ directory.
   'make install' copies the curl file to /usr/local/bin/ (or $prefix/bin
   if you used the --prefix option to configure) and copies the curl.1
   man page to a suitable place too.
   KNOWN PROBLEMS
     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 commands: (from Ralph Beckmann <rabe@uni-paderborn.de>)
       ./configure [...]
       cd lib; make; cd ..
       cd src; make; cd ..
       cp src/curl elsewhere/bin/
   OPTIONS
     Remember, to force configure to use the standard cc compiler if both
     cc and gcc are present, run configure like
       CC=cc ./configure
         or
       env Cc=cc ./configure
 Win32
 =====
   Without SSL:
      MingW32 (GCC-2.95) style
      ------------------------
        Run the 'mingw32.bat' file to get the proper environment variables
        set, then run 'make -f Makefile.m32' in the lib/ dir and then
        'make -f Makefile.m32' in the src/ dir.
        If you have any problems linking libraries or finding header files,
        be sure to look at the provided "Makefile.m32" files for the proper
        paths, and adjust as necessary.
      Cygwin style
      ------------
        Almost identical to the unix installation. Run the configure script
        in the curl root with 'sh configure'. Make sure you have the sh
        executable in /bin/ or you'll see the configure fail towards the
        end.
        Run 'make'
      Microsoft command line style
      ----------------------------
        Run the 'vcvars32.bat' file to get the proper environment variables
        set, then run 'nmake -f Makefile.vc6' in the lib/ dir and then
        'nmake -f Makefile.vc6' in the src/ dir.
      IDE-style
      -------------------------
        If you use VC++, Borland or similar compilers. Include all lib source
        files in a static lib "project" (all .c and .h files that is).
        (you should name it libcurl or similar)
        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!
        Borland seems to do that itself magically. Of course you have to
        make sure it links with the libcurl too!
        For VC++ 6, there's an included Makefile.vc6 that should be possible
        to use out-of-the-box.
        Microsoft note: add /Zm200 to the compiler options, as the hugehelp.c
        won't compile otherwise due to "too long puts string" or something
        like that!
   With SSL:
      MingW32 (GCC-2.95) style
      ------------------------
        Run the 'mingw32.bat' file to get the proper environment variables
        set, then run 'make -f Makefile.m32 SSL=1' in the lib/ dir and then
        'make -f Makefile.m32 SSL=1' in the src/ dir.
        If you have any problems linking libraries or finding header files,
        be sure to look at the provided "Makefile.m32" files for the proper
        paths, and adjust as necessary.
      Cygwin style
      ------------
        Haven't done, nor got any reports on how to do. It should although be
        identical to the unix setup for the same purpose. See above.
      Microsoft command line style
      ----------------------------
        Run the 'vcvars32.bat' file to get the proper environment variables
        set, then run 'nmake -f Makefile.vc6 release-ssl' in the lib/ dir and
        then 'nmake -f Makefile.vc6' in the src/ dir.
      Microsoft / Borland style
      -------------------------
        If you have OpenSSL/SSLeay, and want curl to take advantage of it,
        edit your project properties to use the SSL include path, link with
        the SSL libs and define the USE_SSLEAY symbol.
 IBM OS/2
 ========
   Building under OS/2 is not much different from building under unix.
   You need:
      - emx 0.9d
      - GNU make
      - GNU patch
      - ksh
      - GNU bison
      - GNU file utilities
      - GNU sed
      - autoconf 2.13
   If you want to build with OpenSSL, SSLeay, 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
   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__
   in your definitions.
   If everything seems to work fine but there's no curl.exe, you need to add
   -Zexe to your linker flags.
   If you're getting huge binaries, probably your makefiles have the -g in
   CFLAGS.
 OpenSSL/SSLeay
 ==============
   You'll find OpenSSL information at:
      http://www.openssl.org
 MingW32/Cygwin
 ==============
   You'll find MingW32 and Cygwin information at:
      http://www.xraylith.wisc.edu/~khan/software/gnu-win32/index.html
 OpenLDAP
 ========
   You'll find OpenLDAP information at:
      http://www.openldap.org
   You need to install it with shared libraries, which is enabled when running
   the ldap configure script with "--enable-shared". With my linux 2.0.36
   kernel I also had to disable using threads (with --without-threads),
   because the configure script couldn't figure out my system.
--- a/34
+++ b/34
@@ -1,21 +1,25 @@
-Part of this software is distributed under the Mozilla Public License
+ Copyright (C) 1998-2001, Daniel Stenberg, <daniel@haxx.se>, et al.
 version 1.0, which is part of this distribution (MPL-1.0.txt) and
 available on-line at http://www.mozilla.org/MPL/
-The terminology used here is described in the Mozilla Public License.
+ Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
-In accordance with section "4. Inability to Comply Due to Statute or
+ In order to be useful for every potential user, the curl and libcurl are
-Regulation" the following exemptions apply to this software:
+ dual-licensed under the MPL and the MIT/X-derivate licenses.
- * The Initial Developer has the right, regardless of the citizenship
+ You may opt to use, copy, modify, merge, publish, distribute and/or sell
-   of any involved party, to choose the location for settling disputes
+ copies of the Software, and permit persons to whom the Software is furnished
-   as refered to under section "11. Miscellaneous" of the Mozilla Public
+ to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-   License.
+ pick one of these licenses. The files MITX.txt and MPL-1.1.txt contain the
 license texts.
-Initial Developers of this software are:
+ As a courtesy to the open-source and free software community, we ask you to
 dual-license any modifications that you make as well, under the terms of this
 document.
-  Daniel Stenberg <Daniel.Stenberg@sth.frontec.se>
+ Please remember to always keep the licensing information included in
-  Rafael Linden Sagula <sagula@inf.ufrgs.br>
+ individual source files up-to-date, so as to avoid misleading anyone as to
-
+ the status of these files.
 Curl is Copyright (C) 1996-1998 Daniel Stenberg and Rafael Linden Sagula
 I will use a submission policy according to which I will only enter
 contributions into the CVS tree if the contributor agrees to both licenses
 and this dual-license approach.
--- a/MITX.txt
+++ b/MITX.txt
@@ -0,0 +1,27 @@
 COPYRIGHT AND PERMISSION NOTICE
 Copyright (c) 1996 - 2001, Daniel Stenberg, <daniel@haxx.se>.
 All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 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.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
 NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
 LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY
 DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 Except as contained in this notice, the name of a copyright holder shall not
 be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization of the copyright holder.
--- a/MPL-1.0.txt
+++ b/MPL-1.0.txt
@@ -1,360 +0,0 @@
                           MOZILLA PUBLIC LICENSE
                                Version 1.0
                              ----------------
 1. Definitions.
     1.1. ``Contributor'' means each entity that creates or contributes to
     the creation of Modifications.
     1.2. ``Contributor Version'' means the combination of the Original
     Code, prior Modifications used by a Contributor, and the Modifications
     made by that particular Contributor.
     1.3. ``Covered Code'' means the Original Code or Modifications or the
     combination of the Original Code and Modifications, in each case
     including portions thereof.
     1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
     accepted in the software development community for the electronic
     transfer of data.
     1.5. ``Executable'' means Covered Code in any form other than Source
     Code.
     1.6. ``Initial Developer'' means the individual or entity identified as
     the Initial Developer in the Source Code notice required by Exhibit A.
     1.7. ``Larger Work'' means a work which combines Covered Code or
     portions thereof with code not governed by the terms of this License.
     1.8. ``License'' means this document.
     1.9. ``Modifications'' means any addition to or deletion from the
     substance or structure of either the Original Code or any previous
     Modifications. When Covered Code is released as a series of files, a
     Modification is:
          A. Any addition to or deletion from the contents of a file
          containing Original Code or previous Modifications.
          B. Any new file that contains any part of the Original Code or
          previous Modifications.
     1.10. ``Original Code'' means Source Code of computer software code
     which is described in the Source Code notice required by Exhibit A as
     Original Code, and which, at the time of its release under this License
     is not already Covered Code governed by this License.
     1.11. ``Source Code'' means the preferred form of the Covered Code for
     making modifications to it, including all modules it contains, plus any
     associated interface definition files, scripts used to control
     compilation and installation of an Executable, or a list of source code
     differential comparisons against either the Original Code or another
     well known, available Covered Code of the Contributor's choice. The
     Source Code can be in a compressed or archival form, provided the
     appropriate decompression or de-archiving software is widely available
     for no charge.
     1.12. ``You'' means an individual or a legal entity exercising rights
     under, and complying with all of the terms of, this License or a future
     version of this License issued under Section 6.1. For legal entities,
     ``You'' includes any entity which controls, is controlled by, or is
     under common control with You. For purposes of this definition,
     ``control'' means (a) the power, direct or indirect, to cause the
     direction or management of such entity, whether by contract or
     otherwise, or (b) ownership of fifty percent (50%) or more of the
     outstanding shares or beneficial ownership of such entity.
 2. Source Code License.
     2.1. The Initial Developer Grant.
     The Initial Developer hereby grants You a world-wide, royalty-free,
     non-exclusive license, subject to third party intellectual property
     claims:
          (a) to use, reproduce, modify, display, perform, sublicense and
          distribute the Original Code (or portions thereof) with or without
          Modifications, or as part of a Larger Work; and
          (b) under patents now or hereafter owned or controlled by Initial
          Developer, to make, have made, use and sell (``Utilize'') the
          Original Code (or portions thereof), but solely to the extent that
          any such patent is reasonably necessary to enable You to Utilize
          the Original Code (or portions thereof) and not to any greater
          extent that may be necessary to Utilize further Modifications or
          combinations.
     2.2. Contributor Grant.
     Each Contributor hereby grants You a world-wide, royalty-free,
     non-exclusive license, subject to third party intellectual property
     claims:
          (a) to use, reproduce, modify, display, perform, sublicense and
          distribute the Modifications created by such Contributor (or
          portions thereof) either on an unmodified basis, with other
          Modifications, as Covered Code or as part of a Larger Work; and
          (b) under patents now or hereafter owned or controlled by
          Contributor, to Utilize the Contributor Version (or portions
          thereof), but solely to the extent that any such patent is
          reasonably necessary to enable You to Utilize the Contributor
          Version (or portions thereof), and not to any greater extent that
          may be necessary to Utilize further Modifications or combinations.
 3. Distribution Obligations.
     3.1. Application of License.
     The Modifications which You create or to which You contribute are
     governed by the terms of this License, including without limitation
     Section 2.2. The Source Code version of Covered Code may be distributed
     only under the terms of this License or a future version of this
     License released under Section 6.1, and You must include a copy of this
     License with every copy of the Source Code You distribute. You may not
     offer or impose any terms on any Source Code version that alters or
     restricts the applicable version of this License or the recipients'
     rights hereunder. However, You may include an additional document
     offering the additional rights described in Section 3.5.
     3.2. Availability of Source Code.
     Any Modification which You create or to which You contribute must be
     made available in Source Code form under the terms of this License
     either on the same media as an Executable version or via an accepted
     Electronic Distribution Mechanism to anyone to whom you made an
     Executable version available; and if made available via Electronic
     Distribution Mechanism, must remain available for at least twelve (12)
     months after the date it initially became available, or at least six
     (6) months after a subsequent version of that particular Modification
     has been made available to such recipients. You are responsible for
     ensuring that the Source Code version remains available even if the
     Electronic Distribution Mechanism is maintained by a third party.
     3.3. Description of Modifications.
     You must cause all Covered Code to which you contribute to contain a
     file documenting the changes You made to create that Covered Code and
     the date of any change. You must include a prominent statement that the
     Modification is derived, directly or indirectly, from Original Code
     provided by the Initial Developer and including the name of the Initial
     Developer in (a) the Source Code, and (b) in any notice in an
     Executable version or related documentation in which You describe the
     origin or ownership of the Covered Code.
     3.4. Intellectual Property Matters
          (a) Third Party Claims.
          If You have knowledge that a party claims an intellectual property
          right in particular functionality or code (or its utilization
          under this License), you must include a text file with the source
          code distribution titled ``LEGAL'' which describes the claim and
          the party making the claim in sufficient detail that a recipient
          will know whom to contact. If you obtain such knowledge after You
          make Your Modification available as described in Section 3.2, You
          shall promptly modify the LEGAL file in all copies You make
          available thereafter and shall take other steps (such as notifying
          appropriate mailing lists or newsgroups) reasonably calculated to
          inform those who received the Covered Code that new knowledge has
          been obtained.
          (b) Contributor APIs.
          If Your Modification is an application programming interface and
          You own or control patents which are reasonably necessary to
          implement that API, you must also include this information in the
          LEGAL file.
     3.5. Required Notices.
     You must duplicate the notice in Exhibit A in each file of the Source
     Code, and this License in any documentation for the Source Code, where
     You describe recipients' rights relating to Covered Code. If You
     created one or more Modification(s), You may add your name as a
     Contributor to the notice described in Exhibit A. If it is not possible
     to put such notice in a particular Source Code file due to its
     structure, then you must include such notice in a location (such as a
     relevant directory file) where a user would be likely to look for such
     a notice. You may choose to offer, and to charge a fee for, warranty,
     support, indemnity or liability obligations to one or more recipients
     of Covered Code. However, You may do so only on Your own behalf, and
     not on behalf of the Initial Developer or any Contributor. You must
     make it absolutely clear than any such warranty, support, indemnity or
     liability obligation is offered by You alone, and You hereby agree to
     indemnify the Initial Developer and every Contributor for any liability
     incurred by the Initial Developer or such Contributor as a result of
     warranty, support, indemnity or liability terms You offer.
     3.6. Distribution of Executable Versions.
     You may distribute Covered Code in Executable form only if the
     requirements of Section 3.1-3.5 have been met for that Covered Code,
     and if You include a notice stating that the Source Code version of the
     Covered Code is available under the terms of this License, including a
     description of how and where You have fulfilled the obligations of
     Section 3.2. The notice must be conspicuously included in any notice in
     an Executable version, related documentation or collateral in which You
     describe recipients' rights relating to the Covered Code. You may
     distribute the Executable version of Covered Code under a license of
     Your choice, which may contain terms different from this License,
     provided that You are in compliance with the terms of this License and
     that the license for the Executable version does not attempt to limit
     or alter the recipient's rights in the Source Code version from the
     rights set forth in this License. If You distribute the Executable
     version under a different license You must make it absolutely clear
     that any terms which differ from this License are offered by You alone,
     not by the Initial Developer or any Contributor. You hereby agree to
     indemnify the Initial Developer and every Contributor for any liability
     incurred by the Initial Developer or such Contributor as a result of
     any such terms You offer.
     3.7. Larger Works.
     You may create a Larger Work by combining Covered Code with other code
     not governed by the terms of this License and distribute the Larger
     Work as a single product. In such a case, You must make sure the
     requirements of this License are fulfilled for the Covered Code.
 4. Inability to Comply Due to Statute or Regulation.
     If it is impossible for You to comply with any of the terms of this
     License with respect to some or all of the Covered Code due to statute
     or regulation then You must: (a) comply with the terms of this License
     to the maximum extent possible; and (b) describe the limitations and
     the code they affect. Such description must be included in the LEGAL
     file described in Section 3.4 and must be included with all
     distributions of the Source Code. Except to the extent prohibited by
     statute or regulation, such description must be sufficiently detailed
     for a recipient of ordinary skill to be able to understand it.
 5. Application of this License.
     This License applies to code to which the Initial Developer has
     attached the notice in Exhibit A, and to related Covered Code.
 6. Versions of the License.
     6.1. New Versions.
     Netscape Communications Corporation (``Netscape'') may publish revised
     and/or new versions of the License from time to time. Each version will
     be given a distinguishing version number.
     6.2. Effect of New Versions.
     Once Covered Code has been published under a particular version of the
     License, You may always continue to use it under the terms of that
     version. You may also choose to use such Covered Code under the terms
     of any subsequent version of the License published by Netscape. No one
     other than Netscape has the right to modify the terms applicable to
     Covered Code created under this License.
     6.3. Derivative Works.
     If you create or use a modified version of this License (which you may
     only do in order to apply it to code which is not already Covered Code
     governed by this License), you must (a) rename Your license so that the
     phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
     any confusingly similar phrase do not appear anywhere in your license
     and (b) otherwise make it clear that your version of the license
     contains terms which differ from the Mozilla Public License and
     Netscape Public License. (Filling in the name of the Initial Developer,
     Original Code or Contributor in the notice described in Exhibit A shall
     not of themselves be deemed to be modifications of this License.)
 7. DISCLAIMER OF WARRANTY.
     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 8. TERMINATION.
     This License and the rights granted hereunder will terminate
     automatically if You fail to comply with terms herein and fail to cure
     such breach within 30 days of becoming aware of the breach. All
     sublicenses to the Covered Code which are properly granted shall
     survive any termination of this License. Provisions which, by their
     nature, must remain in effect beyond the termination of this License
     shall survive.
 9. LIMITATION OF LIABILITY.
     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
     PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
     OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
     GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
     ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
     BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
     EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
 10. U.S. GOVERNMENT END USERS.
     The Covered Code is a ``commercial item,'' as that term is defined in
     48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
     software'' and ``commercial computer software documentation,'' as such
     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
     all U.S. Government End Users acquire Covered Code with only those
     rights set forth herein.
 11. MISCELLANEOUS.
     This License represents the complete agreement concerning subject
     matter hereof. If any provision of this License is held to be
     unenforceable, such provision shall be reformed only to the extent
     necessary to make it enforceable. This License shall be governed by
     California law provisions (except to the extent applicable law, if any,
     provides otherwise), excluding its conflict-of-law provisions. With
     respect to disputes in which at least one party is a citizen of, or an
     entity chartered or registered to do business in, the United States of
     America: (a) unless otherwise agreed in writing, all disputes relating
     to this License (excepting any dispute relating to intellectual
     property rights) shall be subject to final and binding arbitration,
     with the losing party paying all costs of arbitration; (b) any
     arbitration relating to this Agreement shall be held in Santa Clara
     County, California, under the auspices of JAMS/EndDispute; and (c) any
     litigation relating to this Agreement shall be subject to the
     jurisdiction of the Federal Courts of the Northern District of
     California, with venue lying in Santa Clara County, California, with
     the losing party responsible for costs, including without limitation,
     court costs and reasonable attorneys fees and expenses. The application
     of the United Nations Convention on Contracts for the International
     Sale of Goods is expressly excluded. Any law or regulation which
     provides that the language of a contract shall be construed against the
     drafter shall not apply to this License.
 12. RESPONSIBILITY FOR CLAIMS.
     Except in cases where another Contributor has failed to comply with
     Section 3.4, You are responsible for damages arising, directly or
     indirectly, out of Your utilization of rights under this License, based
     on the number of copies of Covered Code you made available, the
     revenues you received from utilizing such rights, and other relevant
     factors. You agree to work with affected parties to distribute
     responsibility on an equitable basis.
 EXHIBIT A.
     ``The contents of this file are subject to the Mozilla Public License
     Version 1.0 (the "License"); you may not use this file except in
     compliance with the License. You may obtain a copy of the License at
     http://www.mozilla.org/MPL/
     Software distributed under the License is distributed on an "AS IS"
     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
     License for the specific language governing rights and limitations
     under the License.
     The Original Code is ______________________________________.
     The Initial Developer of the Original Code is ________________________.
     Portions created by ______________________ are Copyright (C) ______
     _______________________. All Rights Reserved.
     Contributor(s): ______________________________________.''
--- a/MPL-1.1.txt
+++ b/MPL-1.1.txt
@@ -0,0 +1,470 @@
                          MOZILLA PUBLIC LICENSE
                                Version 1.1
                              ---------------
 1. Definitions.
     1.0.1. "Commercial Use" means distribution or otherwise making the
     Covered Code available to a third party.
     1.1. "Contributor" means each entity that creates or contributes to
     the creation of Modifications.
     1.2. "Contributor Version" means the combination of the Original
     Code, prior Modifications used by a Contributor, and the Modifications
     made by that particular Contributor.
     1.3. "Covered Code" means the Original Code or Modifications or the
     combination of the Original Code and Modifications, in each case
     including portions thereof.
     1.4. "Electronic Distribution Mechanism" means a mechanism generally
     accepted in the software development community for the electronic
     transfer of data.
     1.5. "Executable" means Covered Code in any form other than Source
     Code.
     1.6. "Initial Developer" means the individual or entity identified
     as the Initial Developer in the Source Code notice required by Exhibit
     A.
     1.7. "Larger Work" means a work which combines Covered Code or
     portions thereof with code not governed by the terms of this License.
     1.8. "License" means this document.
     1.8.1. "Licensable" means having the right to grant, to the maximum
     extent possible, whether at the time of the initial grant or
     subsequently acquired, any and all of the rights conveyed herein.
     1.9. "Modifications" means any addition to or deletion from the
     substance or structure of either the Original Code or any previous
     Modifications. When Covered Code is released as a series of files, a
     Modification is:
          A. Any addition to or deletion from the contents of a file
          containing Original Code or previous Modifications.
          B. Any new file that contains any part of the Original Code or
          previous Modifications.
     1.10. "Original Code" means Source Code of computer software code
     which is described in the Source Code notice required by Exhibit A as
     Original Code, and which, at the time of its release under this
     License is not already Covered Code governed by this License.
     1.10.1. "Patent Claims" means any patent claim(s), now owned or
     hereafter acquired, including without limitation,  method, process,
     and apparatus claims, in any patent Licensable by grantor.
     1.11. "Source Code" means the preferred form of the Covered Code for
     making modifications to it, including all modules it contains, plus
     any associated interface definition files, scripts used to control
     compilation and installation of an Executable, or source code
     differential comparisons against either the Original Code or another
     well known, available Covered Code of the Contributor's choice. The
     Source Code can be in a compressed or archival form, provided the
     appropriate decompression or de-archiving software is widely available
     for no charge.
     1.12. "You" (or "Your")  means an individual or a legal entity
     exercising rights under, and complying with all of the terms of, this
     License or a future version of this License issued under Section 6.1.
     For legal entities, "You" includes any entity which controls, is
     controlled by, or is under common control with You. For purposes of
     this definition, "control" means (a) the power, direct or indirect,
     to cause the direction or management of such entity, whether by
     contract or otherwise, or (b) ownership of more than fifty percent
     (50%) of the outstanding shares or beneficial ownership of such
     entity.
 2. Source Code License.
     2.1. The Initial Developer Grant.
     The Initial Developer hereby grants You a world-wide, royalty-free,
     non-exclusive license, subject to third party intellectual property
     claims:
          (a)  under intellectual property rights (other than patent or
          trademark) Licensable by Initial Developer to use, reproduce,
          modify, display, perform, sublicense and distribute the Original
          Code (or portions thereof) with or without Modifications, and/or
          as part of a Larger Work; and
          (b) under Patents Claims infringed by the making, using or
          selling of Original Code, to make, have made, use, practice,
          sell, and offer for sale, and/or otherwise dispose of the
          Original Code (or portions thereof).
          (c) the licenses granted in this Section 2.1(a) and (b) are
          effective on the date Initial Developer first distributes
          Original Code under the terms of this License.
          (d) Notwithstanding Section 2.1(b) above, no patent license is
          granted: 1) for code that You delete from the Original Code; 2)
          separate from the Original Code;  or 3) for infringements caused
          by: i) the modification of the Original Code or ii) the
          combination of the Original Code with other software or devices.
     2.2. Contributor Grant.
     Subject to third party intellectual property claims, each Contributor
     hereby grants You a world-wide, royalty-free, non-exclusive license
          (a)  under intellectual property rights (other than patent or
          trademark) Licensable by Contributor, to use, reproduce, modify,
          display, perform, sublicense and distribute the Modifications
          created by such Contributor (or portions thereof) either on an
          unmodified basis, with other Modifications, as Covered Code
          and/or as part of a Larger Work; and
          (b) under Patent Claims infringed by the making, using, or
          selling of  Modifications made by that Contributor either alone
          and/or in combination with its Contributor Version (or portions
          of such combination), to make, use, sell, offer for sale, have
          made, and/or otherwise dispose of: 1) Modifications made by that
          Contributor (or portions thereof); and 2) the combination of
          Modifications made by that Contributor with its Contributor
          Version (or portions of such combination).
          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
          effective on the date Contributor first makes Commercial Use of
          the Covered Code.
          (d)    Notwithstanding Section 2.2(b) above, no patent license is
          granted: 1) for any code that Contributor has deleted from the
          Contributor Version; 2)  separate from the Contributor Version;
          3)  for infringements caused by: i) third party modifications of
          Contributor Version or ii)  the combination of Modifications made
          by that Contributor with other software  (except as part of the
          Contributor Version) or other devices; or 4) under Patent Claims
          infringed by Covered Code in the absence of Modifications made by
          that Contributor.
 3. Distribution Obligations.
     3.1. Application of License.
     The Modifications which You create or to which You contribute are
     governed by the terms of this License, including without limitation
     Section 2.2. The Source Code version of Covered Code may be
     distributed only under the terms of this License or a future version
     of this License released under Section 6.1, and You must include a
     copy of this License with every copy of the Source Code You
     distribute. You may not offer or impose any terms on any Source Code
     version that alters or restricts the applicable version of this
     License or the recipients' rights hereunder. However, You may include
     an additional document offering the additional rights described in
     Section 3.5.
     3.2. Availability of Source Code.
     Any Modification which You create or to which You contribute must be
     made available in Source Code form under the terms of this License
     either on the same media as an Executable version or via an accepted
     Electronic Distribution Mechanism to anyone to whom you made an
     Executable version available; and if made available via Electronic
     Distribution Mechanism, must remain available for at least twelve (12)
     months after the date it initially became available, or at least six
     (6) months after a subsequent version of that particular Modification
     has been made available to such recipients. You are responsible for
     ensuring that the Source Code version remains available even if the
     Electronic Distribution Mechanism is maintained by a third party.
     3.3. Description of Modifications.
     You must cause all Covered Code to which You contribute to contain a
     file documenting the changes You made to create that Covered Code and
     the date of any change. You must include a prominent statement that
     the Modification is derived, directly or indirectly, from Original
     Code provided by the Initial Developer and including the name of the
     Initial Developer in (a) the Source Code, and (b) in any notice in an
     Executable version or related documentation in which You describe the
     origin or ownership of the Covered Code.
     3.4. Intellectual Property Matters
          (a) Third Party Claims.
          If Contributor has knowledge that a license under a third party's
          intellectual property rights is required to exercise the rights
          granted by such Contributor under Sections 2.1 or 2.2,
          Contributor must include a text file with the Source Code
          distribution titled "LEGAL" which describes the claim and the
          party making the claim in sufficient detail that a recipient will
          know whom to contact. If Contributor obtains such knowledge after
          the Modification is made available as described in Section 3.2,
          Contributor shall promptly modify the LEGAL file in all copies
          Contributor makes available thereafter and shall take other steps
          (such as notifying appropriate mailing lists or newsgroups)
          reasonably calculated to inform those who received the Covered
          Code that new knowledge has been obtained.
          (b) Contributor APIs.
          If Contributor's Modifications include an application programming
          interface and Contributor has knowledge of patent licenses which
          are reasonably necessary to implement that API, Contributor must
          also include this information in the LEGAL file.
               (c)    Representations.
          Contributor represents that, except as disclosed pursuant to
          Section 3.4(a) above, Contributor believes that Contributor's
          Modifications are Contributor's original creation(s) and/or
          Contributor has sufficient rights to grant the rights conveyed by
          this License.
     3.5. Required Notices.
     You must duplicate the notice in Exhibit A in each file of the Source
     Code.  If it is not possible to put such notice in a particular Source
     Code file due to its structure, then You must include such notice in a
     location (such as a relevant directory) where a user would be likely
     to look for such a notice.  If You created one or more Modification(s)
     You may add your name as a Contributor to the notice described in
     Exhibit A.  You must also duplicate this License in any documentation
     for the Source Code where You describe recipients' rights or ownership
     rights relating to Covered Code.  You may choose to offer, and to
     charge a fee for, warranty, support, indemnity or liability
     obligations to one or more recipients of Covered Code. However, You
     may do so only on Your own behalf, and not on behalf of the Initial
     Developer or any Contributor. You must make it absolutely clear than
     any such warranty, support, indemnity or liability obligation is
     offered by You alone, and You hereby agree to indemnify the Initial
     Developer and every Contributor for any liability incurred by the
     Initial Developer or such Contributor as a result of warranty,
     support, indemnity or liability terms You offer.
     3.6. Distribution of Executable Versions.
     You may distribute Covered Code in Executable form only if the
     requirements of Section 3.1-3.5 have been met for that Covered Code,
     and if You include a notice stating that the Source Code version of
     the Covered Code is available under the terms of this License,
     including a description of how and where You have fulfilled the
     obligations of Section 3.2. The notice must be conspicuously included
     in any notice in an Executable version, related documentation or
     collateral in which You describe recipients' rights relating to the
     Covered Code. You may distribute the Executable version of Covered
     Code or ownership rights under a license of Your choice, which may
     contain terms different from this License, provided that You are in
     compliance with the terms of this License and that the license for the
     Executable version does not attempt to limit or alter the recipient's
     rights in the Source Code version from the rights set forth in this
     License. If You distribute the Executable version under a different
     license You must make it absolutely clear that any terms which differ
     from this License are offered by You alone, not by the Initial
     Developer or any Contributor. You hereby agree to indemnify the
     Initial Developer and every Contributor for any liability incurred by
     the Initial Developer or such Contributor as a result of any such
     terms You offer.
     3.7. Larger Works.
     You may create a Larger Work by combining Covered Code with other code
     not governed by the terms of this License and distribute the Larger
     Work as a single product. In such a case, You must make sure the
     requirements of this License are fulfilled for the Covered Code.
 4. Inability to Comply Due to Statute or Regulation.
     If it is impossible for You to comply with any of the terms of this
     License with respect to some or all of the Covered Code due to
     statute, judicial order, or regulation then You must: (a) comply with
     the terms of this License to the maximum extent possible; and (b)
     describe the limitations and the code they affect. Such description
     must be included in the LEGAL file described in Section 3.4 and must
     be included with all distributions of the Source Code. Except to the
     extent prohibited by statute or regulation, such description must be
     sufficiently detailed for a recipient of ordinary skill to be able to
     understand it.
 5. Application of this License.
     This License applies to code to which the Initial Developer has
     attached the notice in Exhibit A and to related Covered Code.
 6. Versions of the License.
     6.1. New Versions.
     Netscape Communications Corporation ("Netscape") may publish revised
     and/or new versions of the License from time to time. Each version
     will be given a distinguishing version number.
     6.2. Effect of New Versions.
     Once Covered Code has been published under a particular version of the
     License, You may always continue to use it under the terms of that
     version. You may also choose to use such Covered Code under the terms
     of any subsequent version of the License published by Netscape. No one
     other than Netscape has the right to modify the terms applicable to
     Covered Code created under this License.
     6.3. Derivative Works.
     If You create or use a modified version of this License (which you may
     only do in order to apply it to code which is not already Covered Code
     governed by this License), You must (a) rename Your license so that
     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
     "MPL", "NPL" or any confusingly similar phrase do not appear in your
     license (except to note that your license differs from this License)
     and (b) otherwise make it clear that Your version of the license
     contains terms which differ from the Mozilla Public License and
     Netscape Public License. (Filling in the name of the Initial
     Developer, Original Code or Contributor in the notice described in
     Exhibit A shall not of themselves be deemed to be modifications of
     this License.)
 7. DISCLAIMER OF WARRANTY.
     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 8. TERMINATION.
     8.1.  This License and the rights granted hereunder will terminate
     automatically if You fail to comply with terms herein and fail to cure
     such breach within 30 days of becoming aware of the breach. All
     sublicenses to the Covered Code which are properly granted shall
     survive any termination of this License. Provisions which, by their
     nature, must remain in effect beyond the termination of this License
     shall survive.
     8.2.  If You initiate litigation by asserting a patent infringement
     claim (excluding declatory judgment actions) against Initial Developer
     or a Contributor (the Initial Developer or Contributor against whom
     You file such action is referred to as "Participant")  alleging that:
     (a)  such Participant's Contributor Version directly or indirectly
     infringes any patent, then any and all rights granted by such
     Participant to You under Sections 2.1 and/or 2.2 of this License
     shall, upon 60 days notice from Participant terminate prospectively,
     unless if within 60 days after receipt of notice You either: (i)
     agree in writing to pay Participant a mutually agreeable reasonable
     royalty for Your past and future use of Modifications made by such
     Participant, or (ii) withdraw Your litigation claim with respect to
     the Contributor Version against such Participant.  If within 60 days
     of notice, a reasonable royalty and payment arrangement are not
     mutually agreed upon in writing by the parties or the litigation claim
     is not withdrawn, the rights granted by Participant to You under
     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
     the 60 day notice period specified above.
     (b)  any software, hardware, or device, other than such Participant's
     Contributor Version, directly or indirectly infringes any patent, then
     any rights granted to You by such Participant under Sections 2.1(b)
     and 2.2(b) are revoked effective as of the date You first made, used,
     sold, distributed, or had made, Modifications made by that
     Participant.
     8.3.  If You assert a patent infringement claim against Participant
     alleging that such Participant's Contributor Version directly or
     indirectly infringes any patent where such claim is resolved (such as
     by license or settlement) prior to the initiation of patent
     infringement litigation, then the reasonable value of the licenses
     granted by such Participant under Sections 2.1 or 2.2 shall be taken
     into account in determining the amount or value of any payment or
     license.
     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
     all end user license agreements (excluding distributors and resellers)
     which have been validly granted by You or any distributor hereunder
     prior to termination shall survive termination.
 9. LIMITATION OF LIABILITY.
     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
 10. U.S. GOVERNMENT END USERS.
     The Covered Code is a "commercial item," as that term is defined in
     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
     software" and "commercial computer software documentation," as such
     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
     all U.S. Government End Users acquire Covered Code with only those
     rights set forth herein.
 11. MISCELLANEOUS.
     This License represents the complete agreement concerning subject
     matter hereof. If any provision of this License is held to be
     unenforceable, such provision shall be reformed only to the extent
     necessary to make it enforceable. This License shall be governed by
     California law provisions (except to the extent applicable law, if
     any, provides otherwise), excluding its conflict-of-law provisions.
     With respect to disputes in which at least one party is a citizen of,
     or an entity chartered or registered to do business in the United
     States of America, any litigation relating to this License shall be
     subject to the jurisdiction of the Federal Courts of the Northern
     District of California, with venue lying in Santa Clara County,
     California, with the losing party responsible for costs, including
     without limitation, court costs and reasonable attorneys' fees and
     expenses. The application of the United Nations Convention on
     Contracts for the International Sale of Goods is expressly excluded.
     Any law or regulation which provides that the language of a contract
     shall be construed against the drafter shall not apply to this
     License.
 12. RESPONSIBILITY FOR CLAIMS.
     As between Initial Developer and the Contributors, each party is
     responsible for claims and damages arising, directly or indirectly,
     out of its utilization of rights under this License and You agree to
     work with Initial Developer and Contributors to distribute such
     responsibility on an equitable basis. Nothing herein is intended or
     shall be deemed to constitute any admission of liability.
 13. MULTIPLE-LICENSED CODE.
     Initial Developer may designate portions of the Covered Code as
     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
     Developer permits you to utilize portions of the Covered Code under
     Your choice of the NPL or the alternative licenses, if any, specified
     by the Initial Developer in the file described in Exhibit A.
 EXHIBIT A -Mozilla Public License.
     ``The contents of this file are subject to the Mozilla Public License
     Version 1.1 (the "License"); you may not use this file except in
     compliance with the License. You may obtain a copy of the License at
     http://www.mozilla.org/MPL/
     Software distributed under the License is distributed on an "AS IS"
     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
     License for the specific language governing rights and limitations
     under the License.
     The Original Code is ______________________________________.
     The Initial Developer of the Original Code is ________________________.
     Portions created by ______________________ are Copyright (C) ______
     _______________________. All Rights Reserved.
     Contributor(s): ______________________________________.
     Alternatively, the contents of this file may be used under the terms
     of the _____ license (the  "[___] License"), in which case the
     provisions of [______] License are applicable instead of those
     above.  If you wish to allow use of your version of this file only
     under the terms of the [____] License and not to allow others to use
     your version of this file under the MPL, indicate your decision by
     deleting  the provisions above and replace  them with the notice and
     other provisions required by the [___] License.  If you do not delete
     the provisions above, a recipient may use your version of this file
     under either the MPL or the [___] License."
     [NOTE: The text of this Exhibit A may differ slightly from the text of
     the notices in the Source Code files of the Original Code. You should
     use the text of this Exhibit A rather than the text found in the
     Original Code Source Code for Your Modifications.]
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,71 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = curl.1
+EXTRA_DIST =						\
 	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt	\
 	reconf Makefile.dist curl-config.in build_vms.com curl-mode.el \
 	config-vms.h config-win32.h config-riscos.h config-mac.h
-EXTRA_DIST = $(man_MANS)
+bin_SCRIPTS = curl-config
-SUBDIRS = lib src
+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:
 	@(cd tests; $(MAKE) quiet-test)
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:
 # %_topdir /home/loic/local/rpm
 # and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc.
 #
 # cd /home/loic/local/rpm ; mkdir -p SOURCES BUILD RPMS/i386 SPECS SRPMS
 #
 # If additional configure flags are needed to build the package, add the
 # following in ~/.rpmmacros
 # %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS}
 # and run make rpm in the following way:
 # AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm
 #
 rpms:
 	$(MAKE) RPMDIST=curl rpm
 	$(MAKE) RPMDIST=curl-ssl rpm
 rpm:
 	RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \
 	cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \
 	cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \
 	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
@@ -1,45 +1,25 @@
-############################################################################
+#############################################################################
 #                                  _   _ ____  _     
 #  Project                     ___| | | |  _ \| |    
 #                             / __| | | | |_) | |    
 #                            | (__| |_| |  _ <| |___ 
 #                             \___|\___/|_| \_\_____|
 #
-#  The contents of this file are subject to the Mozilla Public License
+# Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
 #  Version 1.0 (the "License"); you may not use this file except in
 #  compliance with the License. You may obtain a copy of the License at
 #  http://www.mozilla.org/MPL/
 #
-#  Software distributed under the License is distributed on an "AS IS"
+# In order to be useful for every potential user, curl and libcurl are
-#  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# dual-licensed under the MPL and the MIT/X-derivate licenses.
 #  License for the specific language governing rights and limitations
 #  under the License.
 #
-#  The Original Code is Curl.
+# 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.
 #
-#  The Initial Developer of the Original Code is Daniel Stenberg.
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
-#  Portions created by the Initial Developer are Copyright (C) 1999.
+# $Id$
-#  All Rights Reserved.
+#############################################################################
 #
 # ------------------------------------------------------------
 # Main author:
 # - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 #
 # 	http://curl.haxx.nu
 #
 # $Source$
 # $Revision$
 # $Date$
 # $Author$
 # $State$
 # $Locker$
 #
 # ------------------------------------------------------------
 #
 # In a normal unix-setup, this file will become overwritten.
 #
 ############################################################################
 all:
 	./configure
@@ -49,17 +29,29 @@ ssl:
 	./configure --with-ssl
 	make
 borland:
 	cd lib & make -f Makefile.b32
 	cd src & make -f Makefile.b32
 mingw32:
-	cd lib; make -f Makefile.m32
+	cd lib & make -f Makefile.m32
-	cd src; make -f Makefile.m32
+	cd src & make -f Makefile.m32
 mingw32-ssl:
-	cd lib; make -f Makefile.m32 SSL=1
+	cd lib & make -f Makefile.m32 SSL=1
-	cd src; make -f Makefile.m32 SSL=1
+	cd src & make -f Makefile.m32 SSL=1
 vc:
-	cd lib; nmake -f Makefile.vc6
+	cd lib
-	cd src; nmake -f Makefile.vc6
+	nmake -f Makefile.vc6 cfg=release
 	cd ..\src
 	nmake -f Makefile.vc6
 vc-ssl:
 	cd lib
 	nmake -f Makefile.vc6 cfg=release-ssl
 	cd ..\src
 	nmake -f Makefile.vc6
 cygwin:
 	./configure
--- a/22
+++ b/22
@@ -8,24 +8,26 @@ README
  Curl is a command line tool for transfering data specified with URL
  syntax. Find out how to use Curl by reading the curl.1 man page or the
-  README.curl document. Find out how to install Curl by reading the INSTALL
+  MANUAL document. Find out how to install Curl by reading the INSTALL
  document.
-  libcurl is a link-library that Curl is using to do its job. It is readily
+  libcurl is a library that Curl is using to do its job. It is readily
-  available to be used by your software. Read the README.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.
  Study the LEGAL file for distribution terms and similar.
  Always try the Curl web site for the latest news:
-        http://curl.haxx.nu
+        http://curl.haxx.se
  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/
        China --   http://www.pshowing.com/curl/
  To download the very latest source off the CVS server do this:
@@ -33,12 +35,14 @@ 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
  (you're off the hook!)
  Curl contains pieces of source code that is Copyright (c) 1998, 1999
  Kungliga Tekniska H<>gskolan. This notice is included here to comply with the
  distribution terms.
--- a/README.libcurl
+++ b/README.libcurl
@@ -1,108 +0,0 @@
                         _ _ _                     _ 
                        | (_) |__   ___ _   _ _ __| |
                        | | | '_ \ / __| | | | '__| |
                        | | | |_) | (__| |_| | |  | |
                        |_|_|_.__/ \___|\__,_|_|  |_|
                     How To Use Libcurl In Your Program:
                                 (by Ralph Beckmann <rabe@uni-paderborn.de>)
 NOTE: If you plan to use libcurl.a in Threads under Linux, do not use the old
 gcc-2.7.x because the function 'gethostbyname' seems not to be thread-safe,
 that is to say an unavoidable SEGMENTATION FAULT might occur.
 1. a) In a C-Program:
      #include "curl.h"
   b) In a C++-Program:
      extern "C" {
      #include "curl.h"
      }
 2. char *url="http://www.domain.com";
   curl_urlget (URGTAG_URL, url, 
          URGTAG_FLAGS, CONF_NOPROGRESS,
          URGTAG_ERRORBUFFER, errorBuffer,
          URGTAG_WRITEFUNCTION, (size_t (*)(void *, int, int, FILE
 *))handle_data,
          URGTAG_TIMEOUT, 30,         /* or anything You want             */
   ...
          URGTAG_DONE);
 3. size_t handle_data (const void *ptr, size_t size, size_t nitems,
                       FILE *stream)
   {
      (void)stream;                   /* stop complaining using g++ -Wall */
      if ((int)nitems <= 0) {
         return (size_t)0;
      }
      fprintf(stdout, (char *)ptr);   /* or do anything else with it      */
      return nitems;
   }
 4. Compile Your Program with  -I$(CURL_DIR)/include
 5. Link Your Program together with  $(CURL_DIR)/lib/libcurl.a
                     Small Example of How To Use libcurl
 ----------------------------------------------------------------------
 /* Full example that uses libcurl.a to fetch web pages.                    */
 /* curlthreads.c                                                           */
 /* - Test-Program by Ralph Beckmann for using curl in POSIX-Threads        */
 /* Change *url1 and *url2 to textual long and slow non-FRAMESET websites!  */
 /* 
   1. Compile with gcc or g++ as $(CC): 
       $(CC) -c -Wall -pedantic curlthreads.c -I$(CURL_DIR)/include
   2. Link with:
      - Linux:
        $(CC) -o curlthreads curlthreads.o $(CURL_DIR)/lib/libcurl.a -lpthread
 -lm 
      - Solaris:
        $(CC) -o curlthreads curlthreads.o $(CURL_DIR)/lib/libcurl.a -lpthread
 -lm -lsocket -lnsl
 */
 #include <pthread.h> 
 #include <stdio.h>
 #ifdef __cplusplus
 extern "C" {
 #include "curl.h"
 }
 #else
 #include "curl.h"
 #endif
 size_t storedata (const void *ptr, size_t size, size_t nitems, FILE *stream) {
  (void)ptr; (void)stream;            /* just to stop g++ -Wall complaining */
  fprintf(stdout, "Thread #%i reads %i Bytes.\n", 
                   (int)pthread_self(), (int)(nitems*size));
  return (nitems);
 }
 void *urlfetcher(void *url) {
  curl_urlget (URGTAG_URL,            url, 
               URGTAG_FLAGS,          CONF_NOPROGRESS | CONF_FAILONERROR,
               URGTAG_WRITEFUNCTION,  (size_t (*)(void *, int, int, FILE
 *))storedata,
               URGTAG_DONE);
  return NULL; 
 }
 int main(void) {
  char *url1="www.sun.com";  
  char *url2="www.microsoft.com";
  pthread_t thread_id1, thread_id2;
  pthread_create(&thread_id1, NULL, urlfetcher, (void *)url1);
  pthread_create(&thread_id2, NULL, urlfetcher, (void *)url2);
  pthread_join(thread_id1, NULL);
  pthread_join(thread_id2, NULL);
  fprintf(stdout, "Ready.\n");
  return 0;
 }
--- a/62
+++ b/62
@@ -1,62 +0,0 @@
                                  _   _ ____  _     
  Project                     ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 This document has been introduced in order to let you find documents that
 specify standards used by curl, software that extends curl and web pages with
 "competing" utilities.
 Standards
  RFC 959  - Defines how FTP works
  RFC 1738 - Uniform Resource Locators
  RFC 1777 - defines the LDAP protocol
  RFC 1808 - Relative Uniform Resource Locators
  RFC 1867 - Form-based File Upload in HTML
  RFC 1950 - ZLIB Compressed Data Format Specification
  RFC 1951 - DEFLATE Compressed Data Format Specification
  RFC 1952 - gzip compression format
  RFC 1959 - LDAP URL syntax
  RFC 2045-2049 - Everything you need to know about MIME! (needed for form
                  based upload)
  RFC 2068 - HTTP 1.1 (obsoleted by RFC 2616)
  RFC 2109 - HTTP State Management Mechanism (cookie stuff)
           - Also, read Netscape's specification at
             http://www.netscape.com/newsref/std/cookie_spec.html
  RFC 2183 - "The Content-Disposition Header Field"
  RFC 2229 - "A Dictionary Server Protocol"
  RFC 2231 - "MIME Parameter Value and Encoded Word Extensions:
              Character Sets, Languages, and Continuations"
  RFC 2388 - "Returning Values from Forms: multipart/form-data"
   Use this as an addition to the 1867 
  RFC 2396 - "Uniform Resource Identifiers: Generic Syntax and Semantics" 
   This one obsoletes 1738, but since 1738 is often mentioned I've left it
   in this list.
  RFC 2428 - "FTP Extensions for IPv6 and NATs"
   This should be considered when introducing IPv6 awareness.
  RFC 2616 - HTTP 1.1
  RFC 2617 - HTTP Authentication
 Compilers
  MingW32 - http://www.xraylith.wisc.edu/~khan/software/gnu-win32/index.html
 Software
  OpenSSL - http://www.openssl.org
  OpenLDAP - http://www.openldap.org
  zlib - http://www.cdrom.com/pub/infozip/zlib/
 Competitors
  wget    - ftp://prep.ai.mit.edu/pub/gnu/
  snarf   - http://www.xach.com/snarf/
  lynx    - http://lynx.browser.org/ (well at least when -dump is used)
  swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
  fetch   - ?
--- a/93
+++ b/93
@@ -1,93 +0,0 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 TODO
 Ok, this is what I wanna do with Curl. Please tell me what you think, and
 please don't hesitate to contribute and send me patches that improve this
 product! (Yes, you may add things not mentioned here, these are just a
 few teasers...)
 * rtsp:// support -- "Real Time Streaming Protocol"
   RFC 2326
 * "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.
 * HTTP Pipelining/persistant connections
 - We should introduce HTTP "pipelining". Curl could be able to request for
   several HTTP documents in one connect. It would be the beginning for
   supporing more advanced functions in the future, like web site
   mirroring. This will require that the urlget() function supports several
   documents from a single HTTP server, which it doesn't today.
 - When curl supports fetching several documents from the same server using
   pipelining, I'd like to offer that function to the command line. Anyone has
   a good idea how? The current way of specifying one URL with the output sent
   to the stdout or a file gets in the way. Imagine a syntax that supports
   "additional documents from the same server" in a way similar to:
     curl <main URL> --more-doc <path> --more-doc <path>
   where --more-doc specifies another document on the same server. Where are
   the output files gonna be put and how should they be named? Should each
   "--more-doc" parameter require a local file name to store the result in?
   Like "--more-file" as in:
     curl <URL> --more-doc <path> --more-file <file>
 * RFC2617 compliance, "Digest Access Authentication"
   A valid test page seem to exist at:
    http://hopf.math.nwu.edu/testpage/digest/
   And some friendly person's server source code is available at
    http://hopf.math.nwu.edu/digestauth/index.html
   Then there's the Apache mod_digest source code too of course.  It seems as
   if Netscape doesn't support this, and not many servers do. Although this is
   a lot better authentication method than the more common "Basic". Basic
   sends the password in cleartext over the network, this "Digest" method uses
   a challange-response protocol which increases security quite a lot.
 * Different FTP Upload Through Web Proxy
   I don't know any web proxies that allow CONNECT through on port 21, but
   that would be the best way to do ftp upload. All we would need to do would
   be to 'CONNECT <host>:<port> HTTP/1.0\r\n\r\n' and then do business as
   usual. I least I think so. It would be fun if someone tried this...
 * Multiple Proxies?
   Is there anyone that actually uses serial-proxies? I mean, send CONNECT to
   the first proxy to connect to the second proxy to which you send CONNECT to
   connect to the remote host (or even more iterations). Is there anyone
   wanting curl to support it? (Not that it would be hard, just confusing...)
 * Other proxies
   Ftp-kind proxy, Socks5, whatever kind of proxies are there?
 * IPv6 Awareness
   Where ever it would fit. I am not that into v6 yet to fully grasp what we
   would need to do, but letting the autoconf search for v6-versions of a few
   functions and then use them instead is of course the first thing to do...
   RFC 2428 "FTP Extensions for IPv6 and NATs" will be interesting. PORT
   should be replaced with EPRT for IPv6, and EPSV instead of PASV.
 * An automatic RPM package maker
   Please, write me a script that makes it. It'd make my day.
 * SSL for more protocols, like SSL-FTP...
   (http://search.ietf.org/internet-drafts/draft-murray-auth-ftp-ssl-05.txt)
 * HTTP POST resume using Range:
 * Make curl capable of verifying the server's certificate when connecting
   with HTTPS://.
 * Make the timeout work as expected!
--- a/acconfig.h
+++ b/acconfig.h
@@ -10,3 +10,57 @@
 /* Define cpu-machine-OS */
 #undef OS
 /* Define if you have the gethostbyaddr_r() function with 5 arguments */
 #undef HAVE_GETHOSTBYADDR_R_5
 /* Define if you have the gethostbyaddr_r() function with 7 arguments */
 #undef HAVE_GETHOSTBYADDR_R_7
 /* Define if you have the gethostbyaddr_r() function with 8 arguments */
 #undef HAVE_GETHOSTBYADDR_R_8
 /* Define if you have the gethostbyname_r() function with 3 arguments */
 #undef HAVE_GETHOSTBYNAME_R_3
 /* Define if you have the gethostbyname_r() function with 5 arguments */
 #undef HAVE_GETHOSTBYNAME_R_5
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 /* Define if you have the inet_ntoa_r function declared. */
 #undef HAVE_INET_NTOA_R_DECL
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 /* Define if you have the Kerberos4 libraries (including -ldes) */
 #undef KRB4
 /* Define if you want to enable IPv6 support */
 #undef ENABLE_IPV6
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 /* Define this to 'int' if socklen_t is not an available typedefed type */
 #undef socklen_t
 /* Define this as a suitable file to read random data from */
 #undef RANDOM_FILE
 /* Define this to your Entropy Gathering Daemon socket pathname */
 #undef EGD_SOCKET
 /* Define if you have a working OpenSSL installation */
 #undef OPENSSL_ENABLED
 /* 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
@@ -0,0 +1,445 @@
 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])
  AC_TRY_COMPILE([
 /* headers for O_NONBLOCK test */
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 ],[
 /* try to compile O_NONBLOCK */
 #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
 #if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
 #error "O_NONBLOCK does not work on this platform"
 #endif
  int socket;
  int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
 ],[
 dnl the O_NONBLOCK test was fine
 nonblock="O_NONBLOCK"
 AC_DEFINE(HAVE_O_NONBLOCK)
 ],[
 dnl the code was bad, try a different program now, test 2
  AC_TRY_COMPILE([
 /* headers for FIONBIO test */
 #include <unistd.h>
 #include <stropts.h>
 ],[
 /* FIONBIO source test */
 int flags = ioctl(socket, FIONBIO, &flags);
 ],[
 dnl FIONBIO test was good
 nonblock="FIONBIO"
 AC_DEFINE(HAVE_FIONBIO)
 ],[
 dnl FIONBIO test was also bad
 dnl the code was bad, try a different program now, test 3
  AC_TRY_COMPILE([
 /* headers for ioctlsocket test (cygwin?) */
 #include <windows.h>
 ],[
 /* 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_TRY_COMPILE([
 /* headers for IoctlSocket test (Amiga?) */
 #include <sys/ioctl.h>
 ],[
 /* IoctlSocket source code */
 int flags = IoctlSocket(socket, FIONBIO, (long)1);
 ],[
 dnl ioctlsocket test was good
 nonblock="IoctlSocket"
 AC_DEFINE(HAVE_IOCTLSOCKET_CASE)
 ],[
 dnl ioctlsocket didnt compile!
 nonblock="nada"
 AC_DEFINE(HAVE_DISABLED_NONBLOCKING)
 ])
 dnl end of forth test
 ])
 dnl end of third test
 ])
 dnl end of second test
 ])
 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
 ])
 dnl Check for socklen_t: historically on BSD it is an int, and in
 dnl POSIX 1g it is a type of its own, but some platforms use different
 dnl types for the argument to getsockopt, getpeername, etc.  So we
 dnl have to test to find something that will work.
 AC_DEFUN([TYPE_SOCKLEN_T],
 [
   AC_CHECK_TYPE([socklen_t], ,[
      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>
                  int getpeername (int, $arg2 *, $t *);
               ],[
                  $t len;
                  getpeername(0,0,&len);
               ],[
                  curl_cv_socklen_t_equiv="$t"
                  break
               ])
            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/aclocal.m4
+++ b/aclocal.m4
@@ -1,127 +0,0 @@
 dnl aclocal.m4 generated automatically by aclocal 1.4
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl This program is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 AC_DEFUN(AM_CONFIG_HEADER,
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.
 dnl This file resides in the same directory as the config header
 dnl that is generated.  We must strip everything past the first ":",
 dnl and everything past the last "/".
 AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
 ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
 <<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
 <<am_indx=1
 for am_file in <<$1>>; do
  case " <<$>>CONFIG_HEADERS " in
  *" <<$>>am_file "*<<)>>
    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
    ;;
  esac
  am_indx=`expr "<<$>>am_indx" + 1`
 done<<>>dnl>>)
 changequote([,]))])
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
 # serial 1
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
 AC_SUBST(VERSION)
 dnl test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 #
 # Check to make sure that the build environment is sane.
 #
 AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
 echo timestamp > conftestfile
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
   if test "[$]*" = "X"; then
      # -L didn't work.
      set X `ls -t $srcdir/configure conftestfile`
   fi
   if test "[$]*" != "X $srcdir/configure conftestfile" \
      && test "[$]*" != "X conftestfile $srcdir/configure"; then
      # If neither matched, then we have a broken ls.  This can happen
      # if, for instance, CONFIG_SHELL is bash and it inherits a
      # broken ls alias from the environment.  This has actually
      # happened.  Such a system could not be considered "sane".
      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
 alias in your environment])
   fi
   test "[$]2" = conftestfile
   )
 then
   # Ok.
   :
 else
   AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
 rm -f conftest*
 AC_MSG_RESULT(yes)])
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
 AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if ($2 --version) < /dev/null > /dev/null 2>&1; then
   $1=$2
   AC_MSG_RESULT(found)
 else
   $1="$3/missing $2"
   AC_MSG_RESULT(missing)
 fi
 AC_SUBST($1)])
--- 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
@@ -10,12 +10,6 @@
 /* Define to empty if the keyword does not work.  */
 #undef const
 /* Define if you don't have vprintf but do have _doprnt.  */
 #undef HAVE_DOPRNT
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
@@ -23,19 +17,61 @@
 #undef size_t
 /* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
+#define STDC_HEADERS 1
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
+#define TIME_WITH_SYS_TIME 1
 /* Define cpu-machine-OS */
-#undef 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.  */
-#undef SIZEOF_LONG_DOUBLE
+#define SIZEOF_LONG_DOUBLE 8
 /* The number of bytes in a long long.  */
-#undef SIZEOF_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
@@ -46,50 +82,89 @@
 /* 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.  */
-#undef HAVE_GETHOSTBYADDR
+#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.  */
-#undef HAVE_GETHOSTNAME
+#define HAVE_GETHOSTNAME 1
-/* Define if you have the getpass function.  */
+/* Define if you have the getpass_r function.  */
-#undef HAVE_GETPASS
+#undef HAVE_GETPASS_R
 /* Define if you have the getpwuid function.  */
 #define HAVE_GETPWUID 1
 /* Define if you have the getservbyname function.  */
-#undef HAVE_GETSERVBYNAME
+#define HAVE_GETSERVBYNAME 1
 /* Define if you have the gettimeofday function.  */
-#undef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY 1
 /* Define if you have the inet_addr function.  */
-#undef HAVE_INET_ADDR
+#define HAVE_INET_ADDR 1
 /* Define if you have the inet_ntoa function.  */
-#undef HAVE_INET_NTOA
+#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.  */
-#undef HAVE_PERROR
+#define HAVE_PERROR 1
 /* Define if you have the select function.  */
-#undef HAVE_SELECT
+#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.  */
-#undef HAVE_SOCKET
+#define HAVE_SOCKET 1
 /* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
+#define HAVE_STRCASECMP 1
 /* Define if you have the strcmpi function.  */
 #define HAVE_STRCMPI 1
 /* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
+#define HAVE_STRDUP 1
 /* Define if you have the strftime function.  */
-#undef HAVE_STRFTIME
+#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.  */
-#undef HAVE_STRSTR
+#define  HAVE_STRSTR 1
 /* Define if you have the tcgetattr function.  */
 #undef HAVE_TCGETATTR
@@ -98,7 +173,7 @@
 #undef HAVE_TCSETATTR
 /* Define if you have the uname function.  */
-#undef HAVE_UNAME
+#define HAVE_UNAME 1
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
@@ -109,32 +184,41 @@
 /* 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.  */
-#undef HAVE_ERR_H
+#define HAVE_ERR_H 1
 /* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
+#define HAVE_FCNTL_H 1
 /* Define if you have the <getopt.h> header file.  */
-#undef HAVE_GETOPT_H
+#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.  */
-#undef HAVE_MALLOC_H
+#define HAVE_MALLOC_H 1
 /* Define if you have the <net/if.h> header file.  */
-#undef HAVE_NET_IF_H
+#define HAVE_NET_IF_H 1
 /* Define if you have the <netdb.h> header file.  */
-#undef HAVE_NETDB_H
+#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.  */
-#undef HAVE_NETINET_IN_H
+#define HAVE_NETINET_IN_H 1
 /* Define if you have the <openssl/crypto.h> header file.  */
 #undef HAVE_OPENSSL_CRYPTO_H
@@ -157,17 +241,20 @@
 /* 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.  */
-#undef HAVE_SGTTY_H
+#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.  */
-#undef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
@@ -176,28 +263,31 @@
 #undef HAVE_SYS_SELECT_H
 /* Define if you have the <sys/socket.h> header file.  */
-#undef HAVE_SYS_SOCKET_H
+#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.  */
-#undef HAVE_SYS_STAT_H
+#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.  */
-#undef HAVE_SYS_TYPES_H
+#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.  */
-#undef HAVE_TERMIOS_H
+#define HAVE_TERMIOS_H 1
 /* Define if you have the <time.h> header file.  */
-#undef HAVE_TIME_H
+#define HAVE_TIME_H 1
 /* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
 /* Define if you have the <winsock.h> header file.  */
 #undef HAVE_WINSOCK_H
@@ -214,11 +304,14 @@
 /* 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).  */
-#undef HAVE_LIBSOCKET
+#define HAVE_LIBSOCKET 1
 /* Define if you have the ssl library (-lssl).  */
 #undef HAVE_LIBSSL
@@ -226,9 +319,49 @@
 /* Define if you have the ucb library (-lucb).  */
 #undef HAVE_LIBUCB
-/* Name of package */
+/* Number of bits in a file offset, on hosts where this is settable. */
-#undef PACKAGE
+#undef _FILE_OFFSET_BITS
-/* Version number of package */
+/* Define for large files, on AIX-style hosts. */
-#undef VERSION
+#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
@@ -23,6 +23,12 @@
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #define ssize_t int
 /* Define this to 'int' if socklen_t is not an available typedefed type */
 #define socklen_t int
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
@@ -36,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
@@ -71,6 +77,9 @@
 /* Define if you have the strcasecmp function.  */
 /*#define HAVE_STRCASECMP 1*/
 /* Define if you have the stricmp function.  */
 #define HAVE_STRICMP 1
 /* Define if you have the strdup function.  */
 #define HAVE_STRDUP 1
@@ -87,11 +96,14 @@
 /*#define HAVE_TCSETATTR 1*/
 /* Define if you have the uname function.  */
-#define HAVE_UNAME 1
+/*#define HAVE_UNAME 1*/
 /* 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
@@ -114,7 +126,7 @@
 #define HAVE_NETDB_H 1
 /* Define if you have the <netinet/in.h> header file.  */
-#define HAVE_NETINET_IN_H 1
+/*#define HAVE_NETINET_IN_H 1*/
 /* Define if you have the <sgtty.h> header file.  */
 /*#define HAVE_SGTTY_H 1*/
@@ -146,15 +158,9 @@
 /* Define if you have the <termios.h> header file.  */
 #define HAVE_TERMIOS_H 1
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
 /* Name of package */
 #define PACKAGE "curl"
 /* Version number of package */
 #define VERSION "6.3.1"
 /* Define if you have the <io.h> header file.  */
 #define HAVE_IO_H 1
@@ -172,3 +178,41 @@
 /* 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.*
 *************************************************/
 #ifdef MINGW32 /* Borland and MS don't have this */
 /* Define if you have the <unistd.h> header file.  */
 #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
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
+# Configuration validation subroutine script.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   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.
@@ -25,6 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -45,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
-  linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -94,15 +143,33 @@ 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
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
 		;;
 	-scout)
 		;;
 	-wrs)
 		os=-vxworks
 		basic_machine=$1
 		;;
 	-chorusos*)
 		os=-chorusos
 		basic_machine=$1
 		;;
 	-chorusrdb)
 		os=-chorusrdb
 		basic_machine=$1
 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=sco3.2v5
+		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -121,6 +188,9 @@ case $os in
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -143,27 +213,60 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
 	-mint | -mint[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
 esac
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	1750a | 580 \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+	| a29k \
-		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-		| hppa2.0w \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+	| c4x | clipper \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+	| d10v | d30v | dsp16xx \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+	| fr30 \
-		| mipstx39 | mipstx39el | armv[34][lb] \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+	| i370 | i860 | i960 | ia64 \
 	| m32r | m68000 | m68k | m88k | mcore \
 	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
 	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
 	| 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
 		;;
 	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.
@@ -172,28 +275,64 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	580-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	| a29k-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	| alphapca5[67]-* | arc-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
-	      | hppa2.0w-* \
+	| bs2000-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	| clipper-* | cray2-* | cydra-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	| d10v-* | d30v-* \
-	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
+	| elxsi-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	      | mipstx39-* | mipstx39el-* \
+	| h8300-* | h8500-* \
-	      | f301-* | armv*-*)
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| m32r-* \
 	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
 	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
 	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| 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.
 	386bsd)
 		basic_machine=i386-unknown
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
 	a29khif)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
 		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -209,20 +348,24 @@ 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)
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
 	apollo68bsd)
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -259,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
 		;;
@@ -299,6 +445,10 @@ case $basic_machine in
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
 	es1800 | OSE68k | ose68k | ose | OSE)
 		basic_machine=m68k-ericsson
 		os=-ose
 		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -309,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
@@ -317,6 +471,14 @@ case $basic_machine in
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
 	h8300xray)
 		basic_machine=h8300-hitachi
 		os=-xray
 		;;
 	h8500hms)
 		basic_machine=h8500-hitachi
 		os=-hms
 		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -332,13 +494,30 @@ case $basic_machine in
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -347,35 +526,42 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+	hppaosf)
-		basic_machine=hppa1.0-hp
+		basic_machine=hppa1.1-hp
-		os=-mpeix
+		os=-osf
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+	hppro)
-		basic_machine=hppa1.0-hp
+		basic_machine=hppa1.1-hp
-		os=-mpeix
+		os=-proelf
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
 # 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
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
 	i386-vsta | vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -401,9 +587,17 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
 	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
@@ -418,12 +612,32 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	mmix*)
 		basic_machine=mmix-knuth
 		os=-mmixware
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
 	netbsd386)
 		basic_machine=i386-unknown
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -438,6 +652,10 @@ case $basic_machine in
 		basic_machine=mips-sony
 		os=-newsos
 		;;
 	necv70)
 		basic_machine=v70-nec
 		os=-sysv
 		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -463,9 +681,32 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
 	mon960)
 		basic_machine=i960-intel
 		os=-mon960
 		;;
 	nonstopux)
 		basic_machine=mips-compaq
 		os=-nonstopux
 		;;
 	np1)
 		basic_machine=np1-gould
 		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
 		;;
 	os68k)
 		basic_machine=m68k-none
 		os=-os68k
 		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -483,28 +724,28 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | k6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 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
 	        ;;
@@ -516,15 +757,37 @@ 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
 		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -532,6 +795,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sparclite-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -539,6 +806,13 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
 	st2000)
 		basic_machine=m68k-tandem
 		;;
 	stratus)
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -579,10 +853,22 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
 	sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
 	t3e)
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -600,6 +886,10 @@ case $basic_machine in
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
 	v810 | necv810)
 		basic_machine=v810-nec
 		os=-none
 		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -623,6 +913,18 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
 		;;
 	w89k-*)
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
 	windows32)
 		basic_machine=i386-pc
 		os=-windows32-msvcrt
 		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -630,6 +932,10 @@ case $basic_machine in
        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -637,6 +943,15 @@ case $basic_machine in
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 	w89k)
 		basic_machine=hppa1.1-winbond
 		;;
 	op50n)
 		basic_machine=hppa1.1-oki
 		;;
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
 	mips)
 		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
@@ -653,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)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -671,6 +993,19 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
 	mac | mpw | mac-mpw)
 		basic_machine=m68k-apple
 		;;
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
 	c4x*)
 		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
@@ -724,14 +1059,37 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -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* | -rhapsody* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -openstep* | -mpeix* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -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*86-*)
 			;;
 		    *)
 			os=-nto$os
 			;;
 		esac
 		;;
 	-nto*)
 		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -741,6 +1099,12 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
 		;;
 	-wince*)
 		os=-wince
 		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -756,12 +1120,18 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
 	-ns2 )
 	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -787,9 +1157,18 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
 	-ose*)
 		os=-ose
 		;;
 	-es1800*)
 		os=-ose
 		;;
 	-xenix)
 		os=-xenix
 		;;
        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
 		;;
 	*)
@@ -815,12 +1194,15 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
 	pdp10-*)
 		os=-tops20
 		;;
        pdp11-*)
 		os=-none
 		;;
@@ -839,6 +1221,15 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
 	mips*-cisco)
 		os=-elf
 		;;
 	mips*-*)
 		os=-elf
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -851,6 +1242,15 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
 	*-wec)
 		os=-proelf
 		;;
 	*-winbond)
 		os=-proelf
 		;;
 	*-oki)
 		os=-proelf
 		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -911,9 +1311,21 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
 		os=-coff
 		;;
 	*-*bug)
 		os=-coff
 		;;
 	*-apple)
 		os=-macos
 		;;
 	*-atari*)
 		os=-mint
 		;;
 	*)
 		os=-none
 		;;
@@ -935,10 +1347,10 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
-			-hpux*)
+			-beos*)
-				vendor=hp
+				vendor=be
 				;;
-			-mpeix*)
+			-hpux*)
 				vendor=hp
 				;;
 			-mpeix*)
@@ -959,7 +1371,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -971,9 +1383,29 @@ case $basic_machine in
 			-aux*)
 				vendor=apple
 				;;
 			-hms*)
 				vendor=hitachi
 				;;
 			-mpw* | -macos*)
 				vendor=apple
 				;;
 			-*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,165 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(lib/urldata.h)
 AM_CONFIG_HEADER(config.h src/config.h)
 AM_INIT_AUTOMAKE(curl,"6.5.2")
-dnl Checks for programs.
+dnl Ensure that this file is processed with autoconf 2.50 or newer
-AC_PROG_CC
+dnl Don't even think about removing this check!
-AC_PROG_INSTALL
+AC_PREREQ(2.50)
-AC_PROG_MAKE_SET
+
 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)
 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
 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
 dnl ************************************************************
 dnl lame option to switch on debug options
 dnl
 AC_MSG_CHECKING([whether to enable debug options])
 AC_ARG_ENABLE(debug,
 [  --enable-debug		Enable pedantic debug options
  --disable-debug		Disable debug options],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       ;;
  *)   AC_MSG_RESULT(yes)
    CPPFLAGS="$CPPFLAGS -DMALLOCDEBUG"
    CFLAGS="-W -Wall -Wwrite-strings -pedantic -g" 
       ;;
  esac ],
       AC_MSG_RESULT(no)
 )
 dnl **********************************************************************
 dnl Checks for IPv6
 dnl **********************************************************************
 AC_MSG_CHECKING([whether to enable ipv6])
 AC_ARG_ENABLE(ipv6,
 [  --enable-ipv6		Enable ipv6 (with ipv4) support
  --disable-ipv6		Disable ipv6 support],
 [ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       ipv6=no
       ;;
  *)   AC_MSG_RESULT(yes)
       ipv6=yes
       ;;
  esac ],
  AC_TRY_RUN([ /* is AF_INET6 available? */
 #include <sys/types.h>
 #include <sys/socket.h>
 main()
 {
 if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
   exit(1);
 else
   exit(0);
 }
 ],
  AC_MSG_RESULT(yes)
  ipv6=yes,
  AC_MSG_RESULT(no)
  ipv6=no,
  AC_MSG_RESULT(no)
  ipv6=no
 ))
 if test "$ipv6" = "yes"; then
  CURL_CHECK_WORKING_GETADDRINFO
 fi
 dnl **********************************************************************
 dnl Checks for libraries.
 dnl **********************************************************************
-dnl nsl lib?
+dnl gethostbyname in the nsl lib?
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
 if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then
  dnl gethostbyname in the socket lib?
  AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(socket, gethostbyname))
 fi
 dnl At least one system has been identified to require BOTH nsl and
 dnl socket libs to link properly.
 if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then
  AC_MSG_CHECKING([trying both nsl and socket libs])
  my_ac_save_LIBS=$LIBS
  LIBS="-lnsl -lsocket $LIBS"
  AC_TRY_LINK( ,
             [gethostbyname();],
             my_ac_link_result=success,
             my_ac_link_result=failure )
  if test "$my_ac_link_result" = "failure"; then
    AC_MSG_RESULT([no])
    AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
    dnl restore LIBS
    LIBS=$my_ac_save_LIBS
  else
    AC_MSG_RESULT([yes])
  fi
 fi
 dnl resolve lib?
 AC_CHECK_FUNC(strcasecmp, , AC_CHECK_LIB(resolve, strcasecmp))
 if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
  AC_CHECK_LIB(resolve, strcasecmp,
              [LIBS="-lresolve $LIBS"],
               ,
               -lnsl)
 fi
 dnl socket lib?
 AC_CHECK_FUNC(connect, , AC_CHECK_LIB(socket, connect))
@@ -29,7 +167,146 @@ 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 
 dnl **********************************************************************
 AC_ARG_WITH(egd-socket,
    [  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname],
    [ EGD_SOCKET="$withval" ]
 )
 if test -n "$EGD_SOCKET" ; then
 	AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
 fi
 dnl Check for user-specified random device
 AC_ARG_WITH(random,
    [  --with-random=FILE      read randomness from FILE (default=/dev/urandom)],
    [ RANDOM_FILE="$withval" ],
    [
        dnl Check for random device
        AC_CHECK_FILE("/dev/urandom",
            [
                RANDOM_FILE="/dev/urandom";
            ]
        )
    ]
 )
 if test -n "$RANDOM_FILE" ; then
 	AC_SUBST(RANDOM_FILE)
 	AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE")
 fi
 dnl **********************************************************************
 dnl Check for the presence of Kerberos4 libraries and headers
 dnl **********************************************************************
 AC_ARG_WITH(krb4-includes,
 [  --with-krb4-includes[=DIR]   Specify location of kerberos4 headers],[
 CPPFLAGS="$CPPFLAGS -I$withval"
 KRB4INC="$withval"
 want_krb4=yes
 ])
 AC_ARG_WITH(krb4-libs,
 [  --with-krb4-libs[=DIR]   Specify location of kerberos4 libs],[
 LDFLAGS="$LDFLAGS -L$withval"
 KRB4LIB="$withval"
 want_krb4=yes
 ])
 OPT_KRB4=off
 AC_ARG_WITH(krb4,dnl
 [  --with-krb4[=DIR]       where to look for Kerberos4],[
  OPT_KRB4="$withval"
  if test X"$OPT_KRB4" != Xyes
  then
    LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib"
    KRB4LIB="$OPT_KRB4/lib"
    CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include"
    KRB4INC="$OPT_KRB4/include"
  fi
  want_krb4="yes"
 ])
 AC_MSG_CHECKING([if Kerberos4 support is requested])
 if test "$want_krb4" = yes
 then
  if test "$ipv6" = "yes"; then
    echo krb4 is not compatible with IPv6
    exit 1
  fi
  AC_MSG_RESULT(yes)
  dnl Check for & handle argument to --with-krb4
  AC_MSG_CHECKING(where to look for Kerberos4)
  if test X"$OPT_KRB4" = Xyes
  then
    AC_MSG_RESULT([defaults])
  else
    AC_MSG_RESULT([libs in $KRB4LIB, headers in $KRB4INC])
  fi
  dnl Check for DES library
  AC_CHECK_LIB(des, des_pcbc_encrypt,
  [
    AC_CHECK_HEADERS(des.h)
    dnl resolv lib?
    AC_CHECK_FUNC(res_search, , AC_CHECK_LIB(resolv, res_search))
    dnl Check for the Kerberos4 library
    AC_CHECK_LIB(krb, krb_net_read,
    [
      dnl Check for header files
      AC_CHECK_HEADERS(krb.h)
      dnl we found the required libraries, add to LIBS
      LIBS="-lkrb -ldes $LIBS"
      dnl Check for function krb_get_our_ip_for_realm
      dnl this is needed for NAT networks
      AC_CHECK_FUNCS(krb_get_our_ip_for_realm)
      dnl add define KRB4
      AC_DEFINE(KRB4)
      dnl substitute it too!
      KRB4_ENABLED=1
      AC_SUBST(KRB4_ENABLED)
      dnl the krb4 stuff needs a strlcpy()
      AC_CHECK_FUNCS(strlcpy)
    ])
  ])
 else
  AC_MSG_RESULT(no)
 fi
 dnl **********************************************************************
 dnl Check for the presence of SSL libraries and headers
@@ -48,35 +325,93 @@ 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
 	LIBS="$LIBS -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
        dnl we didn't find the SSL lib, try the RSAglue/rsaref stuff
        AC_MSG_CHECKING(for ssl with RSAglue/rsaref libs in use);
        OLIBS=$LIBS
        LIBS="$LIBS -lRSAglue -lrsaref"
        AC_CHECK_LIB(ssl, SSL_connect)
        if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
            dnl still no SSL_connect
            AC_MSG_RESULT(no)
            LIBS=$OLIBS
        else
            AC_MSG_RESULT(yes)
        fi
    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)
+    AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.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 Check for the OpenSSL engine header, it is kind of "separated"
    dnl from the main SSL check
    AC_CHECK_HEADERS(openssl/engine.h)
    AC_SUBST(OPENSSL_ENABLED)
  fi
  if test X"$OPT_SSL" != Xoff &&
     test "$OPENSSL_ENABLED" != "1"; then
    AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])
  fi
  dnl these can only exist if openssl exists
  AC_CHECK_FUNCS( RAND_status \
                  RAND_screen \
                  RAND_egd )
 fi
 dnl **********************************************************************
@@ -111,6 +446,37 @@ dnl fi
 dnl z lib?
 dnl AC_CHECK_FUNC(gzread, , AC_CHECK_LIB(z, gzread))
 dnl Default is to try the thread-safe versions of a few functions
 OPT_THREAD=on
 AC_ARG_ENABLE(thread,dnl
 [  --disable-thread       tell configure to not look for thread-safe functions],
  OPT_THREAD=off
 )
 if test X"$OPT_THREAD" = Xoff
 then
  AC_MSG_WARN(libcurl will not get built using thread-safe functions)
  AC_DEFINE(DISABLED_THREADSAFE, 1, \
 Set to explicitly specify we don't want to use thread-safe functions)
 else
  dnl dig around for gethostbyname_r()
  CURL_CHECK_GETHOSTBYNAME_R()
  dnl dig around for gethostbyaddr_r()
  CURL_CHECK_GETHOSTBYADDR_R()
  dnl poke around for inet_ntoa_r()
  CURL_CHECK_INET_NTOA_R()
  dnl is there a localtime_r()
  CURL_CHECK_LOCALTIME_R()
  AC_CHECK_FUNCS( gmtime_r )
 fi
 dnl **********************************************************************
 dnl Back to "normal" configuring
 dnl **********************************************************************
@@ -124,13 +490,14 @@ AC_CHECK_HEADERS( \
        arpa/inet.h \
        net/if.h \
        netinet/in.h \
 	netinet/if_ether.h \
        netdb.h \
        sys/select.h \
        sys/socket.h \
        sys/sockio.h \
        sys/stat.h \
        sys/types.h \
-        getopt.h \
+        sys/time.h \
        sys/param.h \
        termios.h \
        termio.h \
@@ -141,6 +508,9 @@ AC_CHECK_HEADERS( \
        winsock.h \
        time.h \
        io.h \
        pwd.h \
        utime.h \
        sys/utime.h
 )
 dnl Check for libz header
@@ -158,38 +528,54 @@ AC_CHECK_SIZEOF(long double, 8)
 # check for 'long long'
 AC_CHECK_SIZEOF(long long, 4)
-dnl Get system canonical name
+# check for ssize_t
-AC_CANONICAL_HOST
+AC_CHECK_TYPE(ssize_t, int)
-AC_DEFINE_UNQUOTED(OS, "${host}")
+
 TYPE_SOCKLEN_T
 TYPE_IN_ADDR_T
 dnl Checks for library functions.
 dnl AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
+dnl AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( socket \
                select \
                strdup \
                strstr \
                strtok_r \
                strftime \
                uname \
                strcasecmp \
                stricmp \
                strcmpi \
                gethostname \
                gethostbyaddr \
                getservbyname \
                gettimeofday \
                inet_addr \
                inet_ntoa \
                tcsetattr \
                tcgetattr \
                perror \
                getpass \
                closesocket \
                setvbuf \
-                RAND_status \
+                sigaction \
-                RAND_screen
+                signal \
                getpass_r \
                strlcat \
                getpwuid \
                geteuid \
                dlopen \
                utime
 )
 dnl removed 'getpass' check on October 26, 2000
 if test "$ac_cv_func_select" != "yes"; then
  AC_MSG_ERROR(Can't work without an existing select() function)
 fi
 if test "$ac_cv_func_socket" != "yes"; then
  AC_MSG_ERROR(Can't work without an existing socket() function)
 fi
 AC_PATH_PROG( PERL, perl, , 
  $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
@@ -199,17 +585,31 @@ AC_PATH_PROGS( NROFF, gnroff nroff, ,
  $PATH:/usr/bin/:/usr/local/bin )
 AC_SUBST(NROFF)
 AC_PROG_RANLIB
 AC_PROG_YACC
 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 \
-           lib/Makefile )
+	   multi/Makefile \
-dnl	   perl/checklinks.pl \
+           lib/Makefile \
-dnl	   perl/getlinks.pl \
+           tests/Makefile \
-dnl        perl/formfind.pl \
+           tests/data/Makefile \
-dnl	   perl/recursiveftpget.pl  )
+	   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 \
           packages/Solaris/Makefile \
           curl-config
 ])
 AC_OUTPUT
--- a/curl-config.in
+++ b/curl-config.in
@@ -0,0 +1,97 @@
 #! /bin/sh
 #
 # The idea to this kind of setup info script was stolen from numerous
 # other packages, such as neon, libxml and gnome.
 #
 # $Id$
 #
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
 usage()
 {
    cat <<EOF
 Usage: curl-config [OPTION]
 Available values for OPTION include:
  --cc        compiler
  --cflags    pre-processor and compiler flags
  --feature   newline separated list of enabled features
  --help      display this help and exit
  --libs      library linking information
  --prefix    curl install prefix
  --version   output version information
  --vernum    output the version information as a number (hexadecimal)
 EOF
    exit $1
 }
 if test $# -eq 0; then
    usage 1
 fi
 while test $# -gt 0; do
    case "$1" in
    # this deals with options in the style
    # --option=value and extracts the value part
    # [not currently used]
    -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    *) value= ;;
    esac
    case "$1" in
    --cc)
 	echo @CC@
 	;;
    --prefix)
 	echo $prefix
 	;;
    --feature)
 	if test "@OPENSSL_ENABLED@" = "1"; then
          echo "SSL"
        fi
 	if test "@KRB4_ENABLED@" = "1"; then
          echo "KRB4"
        fi
 	if test "@IPV6_ENABLED@" = "1"; then
          echo "IPv6"
        fi
 	;;
    --version)
 	echo libcurl @VERSION@
 	exit 0
 	;;
    --vernum)
 	echo @VERSIONNUM@
 	exit 0
 	;;
    --help)
 	usage 0
 	;;
    --cflags)
       	echo -I@includedir@
       	;;
    --libs)
       	echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@
       	;;
    *)
        echo "unknown option: $1"
 	usage
 	exit 1
 	;;
    esac
    shift
 done
 exit 0
--- 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/curl-ssl.spec
+++ b/curl-ssl.spec
@@ -1,52 +0,0 @@
 %define name curl-ssl
 %define tarball curl
 %define version 6.0
 %define release 1
 %define prefix /usr/local
 %define builddir $RPM_BUILD_DIR/%{tarball}-%{version}
 Summary: get a file from a FTP, GOPHER or HTTP server.
 Name: %{name}
 Version: %{version}
 Release: %{release}
 Copyright: MPL
 Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 Packager: Troy Engel <tengel@sonic.net>
 Group: Utilities/Console
 Source: %{tarball}-%{version}.tar.gz
 URL: http://curl.haxx.nu/
 BuildRoot: /tmp/%{tarball}-%{version}-root
 %description
 curl is a client to get documents/files from servers, using any of the
 supported protocols. The command is designed to work without user
 interaction or any kind of interactivity.
 curl offers a busload of useful tricks like proxy support, user
 authentication, ftp upload, HTTP post, file transfer resume and more.
 Note: this version is compiled with SSL (https:) support.
 %prep
 rm -rf $RPM_BUILD_ROOT
 rm -rf %{builddir}
 %setup -n %{tarball}-%{version} 
 %build
 CFLAGS=$RPM_OPT_FLAGS ./configure --prefix=$RPM_BUILD_ROOT%{prefix} --with-ssl
 make CFLAGS="-DUSE_SSLEAY -I/usr/include/openssl"
 %install
 make install-strip
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf %{builddir}
 %files
 %defattr(-,root,root)
 %attr(0755,root,root) %{prefix}/bin/curl
 %doc curl.1 README* CHANGES CONTRIBUTE FAQ FILES INSTALL LEGAL MPL-1.0.txt RESOURCES TODO perl/
--- a/curl.spec
+++ b/curl.spec
@@ -1,52 +0,0 @@
 %define name curl
 %define version 6.0
 %define release 1
 %define prefix /usr/local
 %define builddir $RPM_BUILD_DIR/%{name}-%{version}
 Summary: get a file from a FTP, GOPHER or HTTP server.
 Name: %{name}
 Version: %{version}
 Release: %{release}
 Copyright: MPL
 Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 Packager: Troy Engel <tengel@sonic.net>
 Group: Utilities/Console
 Source: %{name}-%{version}.tar.gz
 URL: http://curl.haxx.nu/
 BuildRoot: /tmp/%{name}-%{version}-root
 %description
 curl is a client to get documents/files from servers, using any of the
 supported protocols. The command is designed to work without user
 interaction or any kind of interactivity.
 curl offers a busload of useful tricks like proxy support, user
 authentication, ftp upload, HTTP post, file transfer resume and more.
 Note: this version is compiled without SSL (https:) support.
 %prep
 rm -rf $RPM_BUILD_ROOT
 rm -rf %{builddir}
 %setup  
 %build
 export CFLAGS=$RPM_OPT_FLAGS 
 ./configure --prefix=$RPM_BUILD_ROOT%{prefix}
 make 
 %install
 make install-strip
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf %{builddir}
 %files
 %defattr(-,root,root)
 %attr(0755,root,root) %{prefix}/bin/curl
 %doc curl.1 README* CHANGES CONTRIBUTE FAQ FILES INSTALL LEGAL MPL-1.0.txt RESOURCES TODO perl/
--- a/docs/BUGS
+++ b/docs/BUGS
@@ -1,3 +1,4 @@
 $Id$
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -6,9 +7,9 @@
 BUGS
-  Curl has grown substantially from that day, several years ago, when I
+  Curl and libcurl have grown substantially since the beginning. At the time
-  started fiddling with it. When I write this, there are 16500 lines of source
+  of writing (mid March 2001), there are 23000 lines of source code, and by
-  code, and by the time you read this it has probably grown even more.
+  the time you read this it has probably grown even more.
  Of course there are lots of bugs left. And lots of misfeatures.
@@ -21,10 +22,16 @@ BUGS
        http://sourceforge.net/bugs/?group_id=976
  When reporting a bug, you should include information that will help us
-  understand what's wrong, what's expected and how to repeat it. You therefore
+  understand what's wrong, what you expected to happen and how to repeat the
-  need to supply your operating system's name and version number (uname -a
+  bad behavior. You therefore need to supply your operating system's name and
-  under a unix is fine), what version of curl you're using (curl -v is fine),
+  version number (uname -a under a unix is fine), what version of curl you're
-  what URL you were working with and anything else you think matters.
+  using (curl -V is fine), what URL you were working with and anything else
  you think matters.
  Since curl deals with networks, it often helps us a lot if you include a
  protocol debug dump with your bug report. The output you get by using the -v
  flag. Usually, you also get more info by using -i so that is likely to be
  useful when reporting bugs as well.
  If curl crashed, causing a core dump (in unix), there is hardly any use to
  send that huge file to anyone of us. Unless we have an exact same system
@@ -32,25 +39,25 @@ BUGS
  a stack trace and send that (much smaller) output to us instead!
  The address and how to subscribe to the mailing list is detailed in the
-  README.curl file.
+  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 finnished loading the core file and presents you a
+  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 chaing of functions that were called when curl
+  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
@@ -0,0 +1,113 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 To Think About When Contributing Source Code
 This document is intended to offer some guidelines that can be useful to keep
 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
 the same license curl and libcurl is already using unless stated otherwise.
 If you add a larger piece of code, you can opt to make that file or set of
 files to use a different license as long as they don't enforce any changes to
 the rest of the package and they make sense. Such "separate parts" can not be
 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
 names. It doesn't necessarily have to mean that you should use the same as in
 other places of the code, just that the names should be logical,
 understandable and be named according to what they're used for. File-local
 functions should be made static.
 Indenting
 Please try using the same indenting levels and bracing method as all the
 other code already does. It makes the source code a lot easier to follow if
 all of it is written using the same style. We don't ask you to like it, we
 just ask you to follow the tradition! ;-)
 Commenting
 Comment your source code extensively. Commented code is quality code and
 enables future modifications much more. Uncommented code much more risk being
 completely replaced when someone wants to extend things, since other persons'
 source code can get quite hard to read.
 General Style
 Keep your functions small. If they're small you avoid a lot of mistakes and
 you don't accidentally mix up variables.
 Non-clobbering All Over
 When you write new functionality or fix bugs, it is important that you don't
 fiddle all over the source files and functions. Remember that it is likely
 that other people have done changes in the same source files as you have and
 possibly even in the same functions. If you bring completely new
 functionality, try writing it in a new source file. If you fix bugs, try to
 fix one bug at a time and send them as separate patches.
 Separate Patches Doing Different Things
 It is annoying when you get a huge patch from someone that is said to fix 511
 odd problems, but discussions and opinions don't agree with 510 of them - or
 509 of them were already fixed in a different way. Then the patcher needs to
 extract the single interesting patch from somewhere within the huge pile of
 source, and that gives a lot of extra work. Preferably, all fixes that
 correct different problems should be in their own patch with an attached
 description exactly what they correct so that all patches can be selectively
 applied by the maintainer or other interested parties.
 Patch Against Recent Sources
 Please try to get the latest available sources to make your patches
 against. It makes the life of the developers so much easier. The very best is
 if you get the most up-to-date sources from the CVS repository, but the
 latest release archive is quite OK as well!
 Document
 Writing docs is dead boring and one of the big problems with many open source
 projects. Someone's gotta do it. It makes it a lot easier if you submit a
 small description of your fix or your new features with every contribution so
 that it can be swiftly added to the package documentation.
 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. You will be
 required to have posted a few quality patches first, before you can be
 granted write access.
 Test Cases
 Since the introduction of the test suite, we can quickly verify that the main
 features are working as they're supposed to. To maintain this situation and
 improve it, all new features and functions that are added need to be tested
 in the test suite. Every feature that is added should get at least one valid
 test case that verifies that it works as documented. If every submitter also
 post a few test cases, it won't end up as a heavy burden on a single person!
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -0,0 +1,670 @@
 Updated: December 21, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 FAQ
 1. Philosophy
  1.1 What is cURL?
  1.2 What is libcurl?
  1.3 What is cURL not?
  1.4 When will you make curl do XXXX ?
  1.5 Who makes cURL?
  1.6 What do you get for making cURL?
  1.7 What about CURL from curl.com?
 2. Install Related Problems
  2.1 configure doesn't find OpenSSL even when it is installed
   2.1.1. native linker doesn't find openssl
   2.1.2. only the libssl lib is missing
  2.2 Does curl work/build with other SSL libraries?
  2.3 Where can I find a copy of LIBEAY32.DLL?
  2.4 Does cURL support Socks (RFC 1928) ?
 3. Usage Problems
  3.1 curl: (1) SSL is disabled, https: not supported
  3.2 How do I tell curl to resume a transfer?
  3.3 Why doesn't my posting using -F work?
  3.4 How do I tell curl to run custom FTP commands?
  3.5 How can I disable the Pragma: nocache header?
  3.6 Does curl support javascript, ASP, XML, XHTML or HTML version Y?
  3.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 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.
  4.2 Why do I get problems when I use & or % in the URL?
  4.3 How can I use {, }, [ or ] to specify multiple URLs?
  4.4 Why do I get downloaded data even though the web page doesn't exist?
  4.5 Why do I get return code XXX from a HTTP server?
   4.5.1 "400 Bad Request"
   4.5.2 "401 Unauthorized"
   4.5.3 "403 Forbidden"
   4.5.4 "404 Not Found"
   4.5.5 "405 Method Not Allowed"
   4.5.6 "301 Moved Permanently"
  4.6 Can you tell me what error code 142 means?
  4.7 How do I keep user names and passwords secret in Curl command lines?
  4.8 I found a bug!
  4.9 Curl can't authenticate to the server that requires NTLM?
 5. libcurl Issues
  5.1 Is libcurl thread-safe?
  5.2 How can I receive all data into a large memory chunk?
  5.3 How do I fetch multiple files with libcurl?
  5.4 Does libcurl do Winsock initing on win32 systems?
  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
  5.6 What about Keep-Alive or persistent connections?
 6. License Issues
  6.1 I have a GPL program, can I use the libcurl library?
  6.2 I have a closed-source program, can I use the libcurl library?
  6.3 I have a BSD licensed program, can I use the libcurl library?
  6.4 I have a program that uses LGPL libraries, can I use libcurl?
  6.5 Can I modify curl/libcurl for my program and keep the changes secret?
  6.6 Can you please change the curl/libcurl license to XXXX?
 ==============================================================================
 1. Philosophy
  1.1 What is cURL?
  cURL (or simply just 'curl') is a command line tool for getting or sending
  files using URL syntax. The name is a play on 'Client for URLs', originally
  with URL spelled in uppercase to make it obvious it deals with URLs. The
  fact it can also be pronounced 'see URL' also helped.
  Curl supports a range of common Internet protocols, currently including
  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].
  1.2 What is libcurl?
  libcurl is a reliable and portable library which provides you with an easy
  interface to a range of common Internet protocols.
  You can use libcurl for free in your application even if it is commercial
  or closed-source.
  1.3 What is cURL not?
  Curl is *not* a wget clone even though that is a very common misconception.
  Never, during curl's development, have we intended curl to replace wget or
  compete on its market. Curl is targeted at single-shot file transfers.
  Curl is not a web site mirroring program. If you wanna use curl to mirror
  something: fine, go ahead and write a script that wraps around curl to make
  it reality (like curlmirror.pl does).
  Curl is not an FTP site mirroring program. Sure, get and send FTP with curl
  but if you want systematic and sequential behavior you should write a
  script (or write a new program that interfaces libcurl) and do it.
  Curl is not a PHP tool, even though it works perfectly well when used from
  or with PHP.
  Curl is not a single-OS program. Curl exists, compiles, builds and runs
  under a wide range of operating systems, including all modern Unixes (and a
  bunch of older ones too), Windows, Amiga, BeOS, OS/2, OS X, QNX etc.
  1.4 When will you make curl do XXXX ?
  We love suggestions of what to change in order to make curl and libcurl
  better. We do however believe in a few rules when it comes to the future of
  curl:
  * Curl is to remain a command line tool. If you want GUIs or fancy scripting
    capabilities, you're free to write another tool that uses libcurl and that
    offers this. There's no point in having a single tool that does every
    imaginable thing. That's also one of the great advantages of having the
    core of curl as a library.
  * We do not add things to curl that other small and available tools already
    do very fine at the side. Curl's output is fine to pipe into another
    program or redirect to another file for the next program to interpret.
  * 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 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
    implement it for you, that is not a very friendly attitude. We spend a
    considerable time already on maintaining and developing curl. In order to
    get more out of us, you should consider trading in some of your time and
    efforts in return.
  * If you write the code, chances are bigger that it will get into curl
    faster.
  1.5 Who makes cURL?
  cURL and libcurl are not made by any single individual. Sure, Daniel
  Stenberg writes the major parts, but various people's submissions are
  important and crucial. Anyone can post their changes and improvements and
  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 docs/THANKS file is only a small part of all
  the people that every day provide us with bug reports, suggestions, ideas
  and source code.
  curl is developed by a community, with Daniel at the wheel.
  1.6 What do you get for making cURL?
  Project cURL is entirely free and open, without any commercial interests or
  money involved. No person gets paid in any way for developing curl. We all
  do this voluntarily on our spare time.
  We get some help from companies. Contactor Data hosts the curl web site and
  the main mailing list, Haxx owns the curl web site's domain and
  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
  This may be because of several reasons.
    2.1.1. native linker doesn't find openssl
    Affected platforms:
      Solaris (native cc compiler)
      HPUX (native cc compiler)
      SGI IRIX (native cc compiler)
      SCO UNIX (native cc compiler)
    When configuring curl, I specify --with-ssl. OpenSSL is installed in
    /usr/local/ssl Configure reports SSL in /usr/local/ssl, but fails to find
    CRYPTO_lock in -lcrypto
    Cause: The cc for this test places the -L/usr/local/ssl/lib AFTER
    -lcrypto, so ld can't find the library. This is due to a bug in the GNU
    autoconf tool.
    Workaround: Specifying "LDFLAGS=-L/usr/local/ssl/lib" in front of
    ./configure places the -L/usr/local/ssl/lib early enough in the command
    line to make things work
    Solution submitted by: Bob Allison <allisonb@users.sourceforge.net>
    2.1.2. only the libssl lib is missing
    If all include files and the libcrypto lib is present, with only the
    libssl being missing according to configure, this is mostly likely because
    a few functions are left out from the libssl.
    If the function names missing include RSA or RSAREF you can be certain
    that this is because libssl requires the RSA and RSAREF libs to build.
    See the INSTALL file section that explains how to add those libs to
    configure. Make sure that you remove the config.cache file before you
    rerun configure with the new flags.
  2.2. Does curl work/build with other SSL libraries?
  Curl has been written to use OpenSSL, although there should not be much
  problems using a different library. If anyone does "port" curl to use a
  different SSL library, we are of course very interested in getting the
  patch!
  2.3. Where can I find a copy of LIBEAY32.DLL?
  That is an OpenSSL binary built for Windows.
  Curl uses OpenSSL to do the SSL stuff. The LIBEAY32.DLL is what curl needs
  on a windows machine to do https://. Check out the curl web site to find
  accurate and up-to-date pointers to recent OpenSSL DLLs and other binary
  packages.
  2.4. Does cURL support Socks (RFC 1928) ?
  No. Nobody has wanted it that badly yet. We appreciate patches that bring
  this functionality.
 3. Usage problems
  3.1. curl: (1) SSL is disabled, https: not supported
  If you get this output when trying to get anything from a https:// server,
  it means that the configure script couldn't find all libs and include files
  it requires for SSL to work. If the configure script fails to find them,
  curl is simply built without SSL support.
  To get the https:// support into a curl that was previously built but that
  reports that https:// is not supported, you should dig through the document
  and logs and check out why the configure script doesn't find the SSL libs
  and/or include files.
  Also, check out the other paragraph in this FAQ labeled "configure doesn't
  find OpenSSL even when it is installed".
  3.2. How do I tell curl to resume a transfer?
  Curl supports resumed transfers both ways on both FTP and HTTP.
  Try the -C option.
  3.3. Why doesn't my posting using -F work?
  You can't simply use -F or -d at your choice. The web server that will
  receive your post assumes one of the formats. If the form you're trying to
  "fake" sets the type to 'multipart/form-data', then and only then you must
  use the -F type. In all the most common cases, you should use -d which then
  causes a posting with the type 'application/x-www-form-urlencoded'.
  This is described in some detail in the MANUAL and TheArtOfHttpScripting
  documents, and if you don't understand it the first time, read it again
  before you post questions about this to the mailing list. Also, try reading
  through the mailing list archives for old postings and questions regarding
  this.
  3.4. How do I tell curl to run custom FTP commands?
  You can tell curl to perform optional commands both before and/or after a
  file transfer. Study the -Q/--quote option.
  Since curl is used for file transfers, you don't use curl to just perform
  FTP commands without transferring anything. Therefore you must always specify
  a URL to transfer to/from even when doing custom FTP commands.
  3.5. How can I disable the Pragma: nocache header?
  You can change all internally generated headers by adding a replacement with
  the -H/--header option. By adding a header with empty contents you safely
  disable that one. Use -H "Pragma:" to disable that specific header.
  3.6. Does curl support javascript, ASP, XML, XHTML or HTML version Y?
  To curl, all contents are alike. It doesn't matter how the page was
  generated. It may be ASP, PHP, Perl, shell-script, SSI or plain
  HTML-files. There's no difference to curl and it doesn't even know what kind
  of language that generated the page.
  Javascript is slightly different since that is code embedded in the HTML
  that is sent for the client to interpret and curl has no javascript
  interpreter.
  3.7. Can I use curl to delete/rename a file through FTP?
  Yes. You specify custom FTP commands with -Q/--quote.
  One example would be to delete a file after you have downloaded it:
     curl -O ftp://download.com/coolfile -Q '-DELE coolfile'
  3.8 How do I tell curl to follow HTTP redirects?
  Curl does not follow so-called redirects by default. The Location: header
  that informs the client about this is only interpreted if you're using the
  -L/--location option. As in:
     curl -L http://redirector.com
  3.9 How do I use curl in my favourite programming language?
  There exist many language interfaces/bindings for curl that integrates it
  better with various languages. If you are fluid in a script language, you
  may very well opt to use such an interface instead of using the command line
  tool.
  At the time of writing, there are bindings for the five language mentioned
  above, but chances are there are even more by the time you read this. Or you
  may be able you write your own wrapper for a not-yet supported language!
  Find out more about which languages that support curl directly, and how to
  install and use them, in the libcurl section of the curl web site:
        http://curl.haxx.se/libcurl/
  In December 2001, there are interfaces available for the following
  languages: C/C++, Cocoa, Dylan, Java, Perl, PHP, Python, Rexx, Ruby, Scheme
  and Tcl. By the time you read this, additional ones may have appeared!
  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
  Curl adheres to the HTTP spec, which basically means you can play with *any*
  protocol that is built on top of HTTP. Protocols such as SOAP, WEBDAV and
  XML-RPC are all such ones. You can use -X to set custom requests and -H to
  set custom headers (or replace internally generated ones).
  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.
  It took a very long time before we could sort out why curl had problems to
  connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.  The
  error sometimes showed up similar to:
  16570:error:1407D071:SSL routines:SSL2_READ:bad mac decode:s2_pkt.c:233:
  It turned out to be because many older SSL servers don't deal with SSLv3
  requests properly. To correct this problem, tell curl to select SSLv2 from
  the command line (-2/--sslv2).
  There has also been examples where the remote server didn't like the SSLv2
  request and instead you had to force curl to use SSLv3 with -3/--sslv3.
  4.2. Why do I get problems when I use & or % in the URL?
  In general unix shells, the & letter is treated special and when used, it
  runs the specified command in the background. To safely send the & as a part
  of a URL, you should quote the entire URL by using single (') or double (")
  quotes around it.
  An example that would invoke a remote CGI that uses &-letters could be:
     curl 'http://www.altavista.com/cgi-bin/query?text=yes&q=curl'
  In win32, the standard DOS shell treats the %-letter specially and you may
  need to quote the string properly when % is used in it.
  Also note that if you want the literal %-letter to be part of the data you
  pass in a POST using -d/--data you must encode it as '%25'.
  4.3. How can I use {, }, [ or ] to specify multiple URLs?
  Because those letters have a special meaning to the shell, and to be used in
  a URL specified to curl you must quote them.
  An example that downloads two URLs (sequentially) would do:
    curl '{curl,www}.haxx.se'
  To be able to use those letters as actual parts of the URL (without using
  them for the curl URL "globbing" system), use the -g/--globoff option (curl
  7.6 and later):
    curl -g 'www.site.com/weirdname[].html'
  4.4. Why do I get downloaded data even though the web page doesn't exist?
  Curl asks remote servers for the page you specify. If the page doesn't exist
  at the server, the HTTP protocol defines how the server should respond and
  that means that headers and a "page" will be returned. That's simply how
  HTTP works.
  By using the --fail option you can tell curl explicitly to not get any data
  if the HTTP return code doesn't say success.
  4.5 Why do I get return code XXX from a HTTP server?
  RFC2616 clearly explains the return codes. This is a short transcript. Go
  read the RFC for exact details:
    4.5.1 "400 Bad Request"
    The request could not be understood by the server due to malformed
    syntax. The client SHOULD NOT repeat the request without modifications.
    4.5.2 "401 Unauthorized"
    The request requires user authentication.
    4.5.3 "403 Forbidden"
    The server understood the request, but is refusing to fulfill it.
    Authorization will not help and the request SHOULD NOT be repeated.
    4.5.4 "404 Not Found"
    The server has not found anything matching the Request-URI. No indication
    is given of whether the condition is temporary or permanent.
    4.5.5 "405 Method Not Allowed"
    The method specified in the Request-Line is not allowed for the resource
    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 exited due to a crash. This is a serious error, and we
  appreciate a detailed bug report from you that describes how we could go
  ahead and repeat this!
  4.7. How do I keep user names and passwords secret in Curl command lines?
  This problem has two sides:
  The first part is to avoid having clear-text passwords in the command line
  so that they don't appear in 'ps' outputs and similar. That is easily
  avoided by using the "-K" option to tell curl to read parameters from a
  file or stdin to which you can pass the secret info.
  To keep the passwords in your account secret from the rest of the world is
  not a task that curl addresses. You could of course encrypt them somehow to
  at least hide them from being read by human eyes, but that is not what
  anyone would call security.
  Also note that regular HTTP and FTP passwords are sent in clear across the
  network. All it takes for anyone to fetch them is to listen on the network.
  Eavesdropping is very easy.
  4.8 I found a bug!
  It is not a bug if the behavior is documented. Read the docs first.
  If it is a problem with a binary you've downloaded or a package for your
  particular platform, try contacting the person who built the package/archive
  you have.
  If there is a bug, post a bug report in the Curl Bug Track System over at
  http://sourceforge.net/bugs/?group_id=976
  Always include as many details you can think of, including curl version,
  operating system name and version and complete instructions how to repeat
  the bug.
  4.9. Curl can't authenticate to the server that requires NTLM?
  NTLM is a Microsoft proprietary protocol. Unfortunately, curl does not
  currently support that. Proprietary formats are evil. You should not use
  such ones.
 5. libcurl Issues
  5.1. Is libcurl thread-safe?
  Yes.
  We have written the libcurl code specificly adjusted for multi-threaded
  programs. libcurl will use thread-safe functions instead of non-safe ones if
  your system has such.
  We would appreciate some kind of report or README file from those who have
  used libcurl in a threaded environment.
  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.
  One solution to this problem could be to have a pointer to a struct that you
  pass to the callback function. You set the pointer using the
  curl_easy_setopt(CURLOPT_FILE) function. Then that pointer will be passed to
  the callback instead of a FILE * to a file:
        /* imaginary struct */
        struct MemoryStruct {
          char *memory;
          size_t size;
        };
        /* imaginary callback function */
        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;
        }
  5.3 How do I fetch multiple files with libcurl?
  Starting with version 7.7, curl and libcurl will have excellent support for
  transferring multiple files. You should just repeatedly set new URLs with
  curl_easy_setopt() and then transfer it with curl_easy_perform(). The handle
  you get from curl_easy_init() is not only reusable starting with libcurl
  7.7, but also you're encouraged to reuse it if you can, as that will enable
  libcurl to use persistent connections.
  For libcurl prior to 7.7, there was no multiple file support. The only
  available way to do multiple requests was to init/perform/cleanup for each
  transfer.
  5.4 Does libcurl do Winsock initialization on win32 systems?
  Yes (since 7.8.1) if told to in the curl_global_init() call.
  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
  Yes, but you cannot open a FILE * and pass the pointer to a DLL and have
  that DLL use the FILE *. If you set CURLOPT_FILE you must also use
  CURLOPT_WRITEFUNCTION as well to set a function that writes the file, even
  if that simply writes the data to the specified FILE*. Similarly, if you use
  CURLOPT_INFILE you must also specify CURLOPT_READFUNCTION.
  (Provided by Joel DeYoung and Bob Schader)
  5.6 What about Keep-Alive or persistent connections?
  Starting with version 7.7, curl and libcurl will have excellent support for
  persistent connections when transferring several files from the same server.
  Curl will attempt to reuse connections for all URLs specified on the same
  command line/config file, and libcurl will reuse connections for all
  transfers that are made using the same libcurl handle.
  Previous versions had no persistent connection support.
 6. License Issues
  Curl and libcurl are released under a MIT/X derivate license *or* the MPL,
  the Mozilla Public License. To get a really good answer to your license
  conflict questions, you should study the MPL and MIT/X licenses and the
  license you are about to use and check for clashes yourself. This section is
  just a brief summary for the cases we get the most questions. (Parts of this
  section was much enhanced by Bjorn Reese.)
  6.1. I have a GPL program, can I use the libcurl library?
  Yes!
  Since libcurl may be distributed under the MIT/X derivate license, it can be
  used together with GPL in any software.
  6.2. I have a closed-source program, can I use the libcurl library?
  Yes!
  libcurl does not put any restrictions on the program that uses the library.
  6.3. I have a BSD licensed program, can I use the libcurl library?
  Yes!
  libcurl does not put any restrictions on the program that uses the library.
  6.4. I have a program that uses LGPL libraries, can I use libcurl?
  Yes!
  The LGPL license doesn't clash with other licenses.
  6.5. Can I modify curl/libcurl for my program and keep the changes secret?
  Yes!
  The MIT/X derivate license practically allows you to do almost anything with
  the sources, on the condition that the copyright texts in the sources are
  left intact.
  6.6. Can you please change the curl/libcurl license to XXXX?
  No.
  We have carefully picked this license after years of development and
  discussions and a large amount of people have contributed with source code
  knowing that this is the license we use. This license puts the restrictions
  we want on curl/libcurl and it does not spread to other programs or
  libraries that use it. The recent dual license modification should make it
  possible for everyone to use libcurl or curl in their projects, no matter
  what license they already have in use.
--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -15,39 +15,48 @@ Misc
 - guesses protocol from host name unless specified
 - uses .netrc
 - progress bar/time specs while downloading
- - PROXY environment variables support
+ - "standard" proxy environment variables support
 - config file support
- - compiles on win32
+ - compiles on win32 (reported built on 29 operating systems)
 - redirectable stderr
 - use selected network interface for outgoing traffic
 - IPv6 support
 - persistant connections
 HTTP
 - HTTP/1.1 compliant
 - GET
 - PUT
 - HEAD
 - POST
 - multipart POST
 - authentication
- - resume
+ - resume (both GET and PUT)
 - follow redirects
 - maximum amount of redirects to follow
 - custom HTTP request
- - cookie get/send
+ - cookie get/send fully parsed
- - understands the netscape cookie file
+ - understands the netscape cookie file format
- - custom headers (that can replace internally generated headers)
+ - custom headers (that can replace/remove internally generated headers)
 - custom user-agent string
 - custom referer string
 - range
 - proxy authentication
 - time conditions
 - via http-proxy
 - retrieve file modification date
 HTTPS (*1)
 - (all the HTTP features)
 - using certificates
 - verify server certificate
 - via http-proxy
 FTP
 - download
 - authentication
- - PORT or PASV
+ - kerberos security
 - active/passive using PORT, EPRT, PASV or EPSV
 - single file size information (compare to HTTP HEAD)
 - 'type=' URL support
 - dir listing
@@ -57,12 +66,15 @@ FTP
 - upload via http-proxy as HTTP PUT
 - download resume
 - upload resume
- - QUOT commands (before and/or after the transfer)
+ - custom ftp commands (before and/or after the transfer)
 - simple "range" support
 - via http-proxy
 - all operations can be tunneled through a http-proxy
 - customizable to retrieve file modification date
 TELNET
 - connection negotiation
 - custom telnet options
 - stdin/stdout I/O
 LDAP (*2)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -0,0 +1,448 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
                                How To Compile
 Curl has been compiled and built on numerous different operating systems.
 Most systems build curl the same way (unix-style). Continue reading below for
 more details if you're one of them.
 If you're using Windows (95/98/NT/ME/2000/XP or similar), VMS, RISC OS or OS/2
 or cross-compile, you should continue reading from one the paragraphs further
 down.
 UNIX
 ====
   A normal unix installation is made in three or four steps (after you've
   unpacked the source archive):
        ./configure
        make
        make test (optional)
        make install
   You probably need to be root when doing the last command.
   If you want to install curl in a different file hierarchy than /usr/local,
   you need to specify that already when running configure:
        ./configure --prefix=/path/to/curl/tree
   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 /usr/local/ssl, you can run configure like:
 	./configure --with-ssl
   If you have OpenSSL installed somewhere else (for example, /opt/OpenSSL,)
   you can run configure like this:
 	./configure --with-ssl=/opt/OpenSSL
   If you insist on forcing a build without SSL support, even though you may
   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 have to set the LDFLAGS and CPPFLAGS
   environment variables prior to running configure.  Something like this
   should work:
     (with the Bourne shell and its clones):
       CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
           ./configure
     (with csh, tcsh and their clones):
       env CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
       ./configure
   If your SSL library was compiled with rsaref (usually for use in the United
   States), you may also need to set:
     LIBS=-lRSAglue -lrsaref
     (as suggested by Doug Kaufman)
   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
     commands (note that this requires curl to be built staticly): (from Ralph
     Beckmann)
       ./configure [...]
       cd lib; make; cd ..
       cd src; make; cd ..
       cp src/curl elsewhere/bin/
     As suggested by David West, you can make a faked version of autoconf and
     autoheader:
       ----start of autoconf----
       #!/bin/bash
       #fake autoconf for building curl
       if [ "$1" = "--version" ] then
         echo "Autoconf version 2.13"
       fi
       ----end of autoconf----
     Then make autoheader a symbolic link to the same script and make sure
     they're executable and set to appear in the path *BEFORE* the actual (but
     obsolete) autoconf and autoheader scripts.
   MORE OPTIONS
     To force configure to use the standard cc compiler if both cc and gcc are
     present, run configure like
       CC=cc ./configure
         or
       env Cc=cc ./configure
     To force a static library compile, disable the shared library creation
     by running configure like:
       ./configure --disable-shared
     To tell the configure script to skip searching for thread-safe functions,
     add an option like:
       ./configure --disable-thread
     To build curl with kerberos4 support enabled, curl requires the krb4 libs
     and headers installed. You can then use a set of options to tell
     configure where those are:
          --with-krb4-includes[=DIR]   Specify location of kerberos4 headers
          --with-krb4-libs[=DIR]       Specify location of kerberos4 libs
          --with-krb4[=DIR]            where to look for Kerberos4
     In most cases, /usr/athena is the install prefix and then it works with
       ./configure --with-krb4=/usr/athena
     If you're a curl developer and use gcc, you might want to enable more
     debug options with the --enable-debug option.
 Win32
 =====
   Without SSL:
      MingW32 (GCC-2.95) style
      ------------------------
        Run the 'mingw32.bat' file to get the proper environment variables
        set, then run 'make mingw32' in the root dir.
        If you have any problems linking libraries or finding header files, be
        sure to verify that the provided "Makefile.m32" files use the proper
        paths, and adjust as necessary.
      Cygwin style
      ------------
        Almost identical to the unix installation. Run the configure script in
        the curl root with 'sh configure'. Make sure you have the sh
        executable in /bin/ or you'll see the configure fail towards the end.
        Run 'make'
      Microsoft command line style
      ----------------------------
        Run the 'vcvars32.bat' file to get the proper environment variables
        set, then run 'nmake vc' in the root dir.
        The vcvars32.bat file is part of the Microsoft development
        environment.
      IDE-style
      -------------------------
        If you use VC++, Borland or similar compilers. Include all lib source
        files in a static lib "project" (all .c and .h files that is).
        (you should name it libcurl or similar)
        Make the sources in the src/ drawer be a "win32 console application"
        project. Name it curl.
        With VC++, add 'ws2_32.lib' to the link libs when you build curl!
        Borland seems to do that itself magically. Of course you have to make
        sure it links with the libcurl too!
        For VC++ 6, there's an included Makefile.vc6 that should be possible
        to use out-of-the-box.
        Microsoft note: add /Zm200 to the compiler options to increase the
        compiler's memory allocation limit, as the hugehelp.c won't compile
        due to "too long puts string".
   With SSL:
      MingW32 (GCC-2.95) style
      ------------------------
        Run the 'mingw32.bat' file to get the proper environment variables
        set, then run 'make mingw32-ssl' in the root dir.
        If you have any problems linking libraries or finding header files, be
        sure to look at the provided "Makefile.m32" files for the proper
        paths, and adjust as necessary.
      Cygwin style
      ------------
        Haven't done, nor got any reports on how to do. It should although be
        identical to the unix setup for the same purpose. See above.
      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. 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.
      Microsoft / Borland style
      -------------------------
        If you have OpenSSL, and want curl to take advantage of it, edit your
        project properties to use the SSL include path, link with the SSL libs
        and define the USE_SSLEAY symbol.
 IBM OS/2
 ========
   Building under OS/2 is not much different from building under unix.
   You need:
      - emx 0.9d
      - GNU make
      - GNU patch
      - ksh
      - GNU bison
      - GNU file utilities
      - GNU sed
      - autoconf 2.13
   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
   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__
   in your definitions.
   If everything seems to work fine but there's no curl.exe, you need to add
   -Zexe to your linker flags.
   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)
   As QNX is targetted for resource constrained environments, the QNX headers
   set conservative limits. This includes the FD_SETSIZE macro, set by default
   to 32. Socket descriptors returned within the CURL library may exceed this,
   resulting in memory faults/SIGSEGV crashes when passed into select(..)
   calls using fd_set macros.
   A good all-round solution to this is to override the default when building
   libcurl, by overriding CFLAGS during configure, example
   #  configure CFLAGS='-DFD_SETSIZE=64 -g -O2'
 CROSS COMPILE
 =============
   (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 operating systems
   that curl has been compiled for. If you know one system curl compiles and
   runs on, that isn't listed, please let us know!
        - Alpha DEC OSF 4
        - Alpha Digital UNIX v3.2
        - 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
        - i386 OpenBSD
        - i386 SCO unix
        - i386 Solaris 2.7
        - i386 Windows 95, 98, ME, NT, 2000
        - ia64 Linux 2.3.99
        - m68k AmigaOS 3
        - m68k Linux
        - m68k OpenBSD
        - s390 Linux 
 OpenSSL
 =======
   You'll find OpenSSL information at:
      http://www.openssl.org
 MingW32/Cygwin
 ==============
   You'll find MingW32 and Cygwin information at:
      http://www.mingw.org
 OpenLDAP
 ========
   You'll find OpenLDAP information at:
      http://www.openldap.org
   You need to install it with shared libraries, which is enabled when running
   the ldap configure script with "--enable-shared". With my linux 2.0.36
   kernel I also had to disable using threads (with --without-threads),
   because the configure script couldn't figure out my system.
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -0,0 +1,381 @@
                                    Updated for curl 7.9.1 on November 2, 2001
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 INTERNALS
 The project is split in two. The library and the client. The client part uses
 the library, but the library is designed to allow other applications to use
 it.
 The largest amount of code and complexity is in the library part.
 CVS
 ===
 All changes to the sources are committed to the CVS repository as soon as
 they're somewhat verified to work. Changes shall be commited as independently
 as possible so that individual changes can be easier spotted and tracked
 afterwards.
 Tagging shall be used extensively, and by the time we release new archives we
 should tag the sources with a name similar to the released version number.
 Windows vs Unix
 ===============
 There are a few differences in how to program curl the unix way compared to
 the Windows way. The four perhaps most notable details are:
 1. Different function names for socket operations.
   In curl, this is solved with defines and macros, so that the source looks
   the same at all places except for the header file that defines them. The
   macros in use are sclose(), sread() and swrite().
 2. Windows requires a couple of init calls for the socket stuff.
   Those must be made by the application that uses libcurl, in curl that means
   src/main.c has some code #ifdef'ed to do just that.
 3. The file descriptors for network communication and file operations are
    not easily interchangable as in unix.
   We avoid this by not trying any funny tricks on file descriptors.
 4. When writing data to stdout, Windows makes end-of-lines the DOS way, thus
    destroying binary data, although you do want that conversion if it is
    text coming through... (sigh)
   We set stdout to binary under windows
 Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All
 conditionals that deal with features *should* instead be in the format
 '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
 we maintain two config-win32.h files (one in / and one in src/) that are
 supposed to look exactly as a config.h file would have looked like on a
 Windows machine!
 Generally speaking: always remember that this will be compiled on dozens of
 operating systems. Don't walk on the edge.
 Library
 =======
 There are plenty of entry points to the library, namely each publicly defined
 function that libcurl offers to applications. All of those functions are
 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 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 three arguments, where the option stuff must be
 passed in pairs: the parameter-ID and the parameter-value. The list of
 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_perform() and the main
 work then continues in lib/url.c. The flow continues with a call to
 Curl_connect() to connect to the remote site.
 o Curl_connect()
   ... analyzes the URL, it separates the different components and connects to
   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 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.
   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 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. It runs Curl_disconnect() on all open connectons.
 A quick roundup on internal function sequences (many of these call
 protocol-specific function-pointers):
  curl_connect - connects to a remote site and does initial connect fluff
   This also checks for an existing connection to the requested site and uses
   that one if it is possible.
   curl_do - starts a transfer
    curl_transfer() - transfers data
   curl_done - ends a transfer
  curl_disconnect - disconnects from a remote site. This is called when the
   disconnect is really requested, which doesn't necessarily have to be
   exactly after curl_done in case we want to keep the connection open for
   a while.
 HTTP(S)
 HTTP offers a lot and is the protocol in curl that uses the most lines of
 code. There is a special file (lib/formdata.c) that offers all the multipart
 post functions.
 base64-functions for user+password stuff (and more) is in (lib/base64.c) and
 all functions for parsing and sending cookies are found in (lib/cookie.c).
 HTTPS uses in almost every means the same procedure as HTTP, with only two
 exceptions: the connect procedure is different and the function used to read
 or write from the socket is different, although the latter fact is hidden in
 the source by the use of curl_read() for reading and curl_write() for writing
 data to the remote server.
 http_chunks.c contains functions that understands HTTP 1.1 chunked transfer
 encoding.
 An interesting detail with the HTTP(S) request, is the add_buffer() series of
 functions we use. They append data to one single buffer, and when the
 building is done the entire request is sent off in one single write. This is
 done this way to overcome problems with flawed firewalls and lame servers.
 FTP
 The Curl_if2ip() function can be used for getting the IP number of a
 specified network interface, and it resides in lib/if2ip.c.
 Curl_ftpsendf() is used for sending FTP commands to the remote server. It was
 made a separate function to prevent us programmers from forgetting that they
 must be CRLF terminated. They must also be sent in one single write() to make
 firewalls and similar happy.
 Kerberos
 The kerberos support is mainly in lib/krb4.c and lib/security.c.
 TELNET
 Telnet is implemented in lib/telnet.c.
 FILE
 The file:// protocol is dealt with in lib/file.c.
 LDAP
 Everything LDAP is in lib/ldap.c.
 GENERAL
 URL encoding and decoding, called escaping and unescaping in the source code,
 is found in lib/escape.c.
 While transfering data in Transfer() a few functions might get
 used. curl_getdate() in lib/getdate.c is for HTTP date comparisons (and
 more).
 lib/getenv.c offers curl_getenv() which is for reading environment variables
 in a neat platform independent way. That's used in the client, but also in
 lib/url.c when checking the proxy environment variables. Note that contrary
 to the normal unix getenv(), this returns an allocated buffer that must be
 free()ed after use.
 lib/netrc.c holds the .netrc parser
 lib/timeval.c features replacement functions for systems that don't have
 gettimeofday() and a few support functions for timeval convertions.
 A function named curl_version() that returns the full curl version string is
 found in lib/version.c.
 If authentication is requested but no password is given, a getpass_r() clone
 exists in lib/getpass.c. libcurl offers a custom callback that can be used
 instead of this, but it doesn't change much to us.
 Persistent Connections
 ======================
 The persistent connection support in libcurl requires some considerations on
 how to do things inside of the library.
 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 as
   all the options etc that the library-user may choose.
 o The 'SessionHandle' struct holds the "connection cache" (an array of
   pointers to 'connectdata' structs). There's one connectdata struct
   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 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 transfer operation is complete, we try to leave the connection
   open. Particular options may tell us not to, and protocols may signal
   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
 persistent connections to work.
 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 static.
 Public ("exported") symbols must use a 'curl_' prefix. (There are exceptions,
 but they are to be changed to follow this pattern in future versions.)
 Return Codes and Informationals
 ===============================
 I've made things simple. Almost every function in libcurl returns a CURLcode,
 that must be CURLE_OK if everything is OK or otherwise a suitable error code
 as the curl/curl.h include file defines. The very spot that detects an error
 must use the Curl_failf() function to set the human-readable error
 description.
 In aiding the user to understand what's happening and to debug curl usage, we
 must supply a fair amount of informational messages by using the Curl_infof()
 function. Those messages are only displayed when the user explicitly asks for
 them. They are best used when revealing information that isn't otherwise
 obvious.
 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 []
 expansion stuff is there.
 The client mostly messes around to setup its 'config' struct properly, then
 it calls the curl_easy_*() functions of the library and when it gets back
 control after the curl_easy_perform() it cleans up the library, checks status
 and exits.
 When the operation is done, the ourWriteOut() function in src/writeout.c may
 be called to report about the operation. That function is using the
 curl_easy_getinfo() function to extract useful information from the curl
 session.
 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 lib/memdebug.c contains debug-versions of a few functions. Functions
 such as malloc, free, fopen, fclose, etc that somehow deal with resources
 that might give us problems if we "leak" them. The functions in the memdebug
 system do nothing fancy, they do their normal function and then log
 information about what they just did. The logged data can then be analyzed
 after a complete session,
 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, this is also
 switched on by running configure with --enable-debug.
 Test Suite
 ==========
 Since November 2000, a test suite has evolved. It is placed in its own
 subdirectory directly off the root in the curl archive tree, and it contains
 a bunch of scripts and a lot of test case data.
 The main test script is runtests.pl that will invoke the two servers
 httpserver.pl and ftpserver.pl before all the test cases are performed. The
 test suite currently only runs on unix-like platforms.
 You'll find a complete description of the test case data files in the
 tests/README file.
 The test suite automatically detects if curl was built with the memory
 debugging enabled, and if it was it will detect memory leaks too.
 Building Releases
 =================
 There's no magic to this. When you consider everything stable enough to be
 released, run the 'maketgz' script (using 'make distcheck' will give you a
 pretty good view on the status of the current sources). maketgz prompts for
 version number of the client and the library before it creates a release
 archive. maketgz uses 'make dist' for the actual archive building, why you
 need to fill in the Makefile.am files properly for which files that should
 be included in the release archives.
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -3,7 +3,7 @@ LATEST VERSION
  You always find news about what's going on as well as the latest versions
  from the curl web pages, located at:
-        http://curl.haxx.nu
+        http://curl.haxx.se
 SIMPLE USAGE
@@ -15,22 +15,26 @@ SIMPLE USAGE
        curl ftp://ftp.funet.fi/README
  Get a gopher document from funet's gopher server:
        curl gopher://gopher.funet.fi
  Get a web page from a server using port 8000:
        curl http://www.weirdserver.com:8000/
  Get a list of the root directory of an FTP site:
-        curl ftp://ftp.fts.frontec.se/
+        curl ftp://cool.haxx.se/
  Get a gopher document from funet's gopher server:
        curl gopher://gopher.funet.fi
  Get the definition of curl from a dictionary:
        curl dict://dict.org/m:curl
  Fetch two documents at once:
        curl ftp://cool.haxx.se/ http://www.weirdserver.com:8000/
 DOWNLOAD TO A FILE
  Get a web page and store in a local file:
@@ -43,6 +47,10 @@ DOWNLOAD TO A FILE
        curl -O http://www.netscape.com/index.html
  Fetch two files and store them with their remote names:
        curl -O www.haxx.se/index.html -O curl.haxx.se/download.html
 USING PASSWORDS
 FTP
@@ -124,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:
@@ -139,15 +147,17 @@ UPLOADING
        curl -T localfile -a ftp://ftp.upload.com/remotefile
-  NOTE: Curl does not support ftp upload through a proxy! The reason for this
+  Curl also supports ftp upload through a proxy, but only if the proxy is
-  is simply that proxies are seldomly configured to allow this and that no
+  configured to allow that kind of tunneling. If it does, you can run curl in
-  author has supplied code that makes it possible!
+  a fashion similar to:
        curl --proxytunnel -x proxy:port -T localfile ftp.upload.com
 HTTP
  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.
@@ -176,9 +186,9 @@ DETAILED INFORMATION
  -D/--dump-header option when getting files from both FTP and HTTP, and it
  will then store the headers in the specified file.
-  Store the HTTP headers in a separate file:
+  Store the HTTP headers in a separate file (headers.txt in the example):
-        curl --dump-header headers.txt curl.haxx.nu
+        curl --dump-header headers.txt curl.haxx.se
  Note that headers stored in a separate file can be very useful at a later
  time if you want curl to use cookies sent by the server. More about that in
@@ -194,38 +204,73 @@ POST (HTTP)
        curl -d "name=Rafael%20Sagula&phone=3320780" \
                http://www.where.com/guest.cgi
  How to post a form with curl, lesson #1:
  Dig out all the <input> tags in the form that you want to fill in. (There's
  a perl program called formfind.pl on the curl site that helps with this).
  If there's a "normal" post, you use -d to post. -d takes a full "post
  string", which is in the format
        <variable1>=<data1>&<variable2>=<data2>&...
  The 'variable' names are the names set with "name=" in the <input> tags, and
  the data is the contents you want to fill in for the inputs. The data *must*
  be properly URL encoded. That means you replace space with + and that you
  write weird letters with %XX where XX is the hexadecimal representation of
  the letter's ASCII code.
  Example:
  (page located at http://www.formpost.com/getthis/
        <form action="post.cgi" method="post">
        <input name=user size=10>
        <input name=pass type=password size=10>
        <input name=id type=hidden value="blablabla">
        <input name=ding value="submit">
        </form>
  We want to enter user 'foobar' with password '12345'.
  To post to this, you enter a curl command line like:
        curl -d "user=foobar&pass=12345&id=blablabla&dig=submit"  (continues)
          http://www.formpost.com/getthis/post.cgi
  While -d uses the application/x-www-form-urlencoded mime-type, generally
  understood by CGI's and similar, curl also supports the more capable
  multipart/form-data type. This latter type supports things like file upload.
  -F accepts parameters like -F "name=contents". If you want the contents to
  be read from a file, use <@filename> as contents. When specifying a file,
-  you can also specify which content type the file is, by appending
+  you can also specify the file content type by appending ';type=<mime type>'
-  ';type=<mime type>' to the file name. You can also post contents of several
+  to the file name. You can also post the contents of several files in one field.
-  files in one field. So that the field name 'coolfiles' can be sent three
+  For example, the field name 'coolfiles' is used to send three  files, with
-  files with different content types in a manner similar to:
+  different content types using the following syntax:
        curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
        http://www.post.com/postit.cgi
-  If content-type is not specified, curl will try to guess from the extension
+  If the content-type is not specified, curl will try to guess from the file
-  (it only knows a few), or use the previously specified type (from an earlier
+  extension  (it only knows a few), or use the previously specified type
-  file if several files are specified in a list) or finally using the default
+  (from an earlier file if several files are specified in a list) or else it
-  type 'text/plain'.
+  will  using the default type 'text/plain'.
  Emulate a fill-in form with -F. Let's say you fill in three fields in a
  form. One field is a file name which to post, one field is your name and one
  field is a file description. We want to post the file we have written named
  "cooltext.txt". To let curl do the posting of this data instead of your
-  favourite browser, you have to check out the HTML of the form page to get to
+  favourite browser, you have to read the HTML source of the form page and find
-  know the names of the input fields. In our example, the input field names are
+  the names of the input fields. In our example, the input field names are
  'file', 'yourname' and 'filedescription'.
        curl -F "file=@cooltext.txt" -F "yourname=Daniel" \
             -F "filedescription=Cool text file with cool text inside" \
             http://www.post.com/postit.cgi
-  So, to send two files in one post you can do it in two ways:
+  To send two files in one post you can do it in two ways:
  1. Send multiple files in a single "field" with a single field name:
@@ -235,16 +280,18 @@ POST (HTTP)
        curl -F "docpicture=@dog.gif" -F "catpicture=@cat.gif" 
-REFERER
+REFERRER
  A HTTP request has the option to include information about which address
-  that referred to actual page, and curl allows the user to specify that
+  that referred to actual page.  Curl allows you to specify the
-  referrer to get specified on the command line. It is especially useful to
+  referrer to be used on the command line. It is especially useful to
  fool or trick stupid servers or CGI scripts that rely on that information
  being available or contain certain data.
        curl -e www.coolsite.com http://www.showme.com/
  NOTE: The referer field is defined in the HTTP spec to be a full URL.
 USER AGENT
  A HTTP request has the option to include information about the browser
@@ -306,13 +353,17 @@ COOKIES
  Note that by specifying -b you enable the "cookie awareness" and with -L
  you can make curl follow a location: (which often is used in combination
  with cookies). So that if a site sends cookies and a location, you can
-  use a non-existing file to trig the cookie awareness like:
+  use a non-existing file to trigger the cookie awareness like:
-        curl -L -b empty-file www.example.com
+        curl -L -b empty.txt www.example.com
  The file to read cookies from must be formatted using plain HTTP headers OR
  as netscape's cookie file. Curl will determine what kind it is based on the
-  file contents.
+  file contents.  In the above command, curl will parse the header and store
  the cookies received from www.example.com.  curl will send to the server the
  stored cookies which match the request as it follows the location.  The
  file "empty.txt" may be a non-existant file.
 PROGRESS METER
@@ -345,12 +396,12 @@ PROGRESS METER
 SPEED LIMIT
-  Curl offers the user to set conditions regarding transfer speed that must
+  Curl allows the user to set the transfer speed conditions that must be met
-  be met to let the transfer keep going. By using the switch -y and -Y you
+  to let the transfer keep going. By using the switch -y and -Y you
-  can make curl abort transfers if the transfer speed doesn't exceed your
+  can make curl abort transfers if the transfer speed is below the specified
-  given lowest limit for a specified time.
+  lowest limit for a specified time.
-  To let curl abandon downloading this page if its slower than 3000 bytes per
+  To have curl abort the download if the speed is slower than 3000 bytes per
  second for 1 minute, run:
        curl -y 3000 -Y 60 www.far-away-site.com
@@ -363,17 +414,26 @@ SPEED LIMIT
 CONFIG FILE
  Curl automatically tries to read the .curlrc file (or _curlrc file on win32
-  systems) from the user's home dir on startup. The config file should be
+  systems) from the user's home dir on startup.
-  made up with normal command line switches. Comments can be used within the
+
-  file. If the first letter on a line is a '#'-letter the rest of the line
+  The config file could be made up with normal command line switches, but you
-  is treated as a comment.
+  can also specify the long options without the dashes to make it more
  readable. You can separate the options and the parameter with spaces, or
  with = or :. Comments can be used within the file. If the first letter on a
  line is a '#'-letter the rest of the line is treated as a comment.
  If you want the parameter to contain spaces, you must inclose the entire
  parameter within double quotes ("). Within those quotes, you specify a
  quote as \".
  NOTE: You must specify options and their arguments on the same line.
  Example, set default time out and proxy in a config file:
        # We want a 30 minute timeout:
        -m 1800
        # ... and we use a proxy for all accesses:
-        -x proxy.our.domain.com:8080
+        proxy = proxy.our.domain.com:8080
  White spaces ARE significant at the end of lines, but all white spaces
  leading up to the first characters of each line are ignored.
@@ -387,14 +447,14 @@ CONFIG FILE
  without URL by making a config file similar to:
        # default url to get
-        http://help.with.curl.com/curlhelp.html
+        url = "http://help.with.curl.com/curlhelp.html"
  You can specify another config file to be read by using the -K/--config
  flag. If you set config file name to "-" it'll read the config from stdin,
  which can be handy if you want to hide options from being visible in process
  tables etc:
-        echo "-u user:passwd" | curl -K - http://that.secret.site.com
+        echo "user = user:passwd" | curl -K - http://that.secret.site.com
 EXTRA HEADERS
@@ -407,9 +467,13 @@ EXTRA HEADERS
        curl -H "X-you-and-me: yes" www.love.com
-  This can also be useful in case you want curl to send a different text in
+  This can also be useful in case you want curl to send a different text in a
-  a header than it normally does. The -H header you specify then replaces the
+  header than it normally does. The -H header you specify then replaces the
-  header curl would normally send.
+  header curl would normally send. If you replace an internal header with an
  empty one, you prevent that header from being sent. To prevent the Host:
  header from being used:
        curl -H "Host:" www.server.com
 FTP and PATH NAMES
@@ -445,13 +509,14 @@ FTP and firewalls
  connect to the client on the given (as parameters to the PORT command) IP
  number and port.
-  The -P flag to curl allows for different options. Your machine may have
+  The -P flag to curl supports a few different options. Your machine may have
  several IP-addresses and/or network interfaces and curl allows you to select
  which of them to use. Default address can also be used:
        curl -P - ftp.download.com
-  Download with PORT but use the IP address of our 'le0' interface:
+  Download with PORT but use the IP address of our 'le0' interface (this does
  not work on windows):
        curl -P le0 ftp.download.com
@@ -459,6 +524,16 @@ FTP and firewalls
        curl -P 192.168.0.10 ftp.download.com
 NETWORK INTERFACE
  Get a web page from a server using a specified port for the interface:
 	curl --interface eth0:1 http://www.netscape.com/
  or
 	curl --interface 192.168.1.10 http://www.netscape.com/
 HTTPS
  Secure HTTP requires SSL libraries to be installed and used when curl is
@@ -499,6 +574,26 @@ HTTPS
  Otherwise, curl will first attempt to use v3 and then v2.
  To use OpenSSL to convert your favourite browser's certificate into a PEM
  formatted one that curl can use, do something like this (assuming netscape,
  but IE is likely to work similarly):
    You start with hitting the 'security' menu button in netscape. 
    Select 'certificates->yours' and then pick a certificate in the list 
    Press the 'export' button 
    enter your PIN code for the certs 
    select a proper place to save it 
    Run the 'openssl' application to convert the certificate. If you cd to the
    openssl installation, you can do it like:
     # ./apps/openssl pkcs12 -in [file you saved] -clcerts -out [PEMfile]
 RESUMING FILE TRANSFERS
 To continue a file transfer where it was previously aborted, curl supports
@@ -506,20 +601,20 @@ 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.
- (*2) = This requires that the wb server supports at least HTTP/1.1. If it
+ (*2) = This requires that the web server supports at least HTTP/1.1. If it
        doesn't, curl will say so.
 TIME CONDITIONS
@@ -621,7 +716,7 @@ NETRC
  A very simple .netrc file could look something like:
-        machine curl.haxx.nu login iamdaniel password mysecret
+        machine curl.haxx.se login iamdaniel password mysecret
 CUSTOM OUTPUT
@@ -634,16 +729,84 @@ CUSTOM OUTPUT
        curl -w 'We downloaded %{size_download} bytes\n' www.download.com
-MAILING LIST
+KERBEROS4 FTP TRANSFER
-  We have an open mailing list to discuss curl, its development and things
+  Curl supports kerberos4 for FTP transfers. You need the kerberos package
-  relevant to this.
+  installed and used at curl build time for it to be used.
-  To subscribe, mail curl-request@contactor.se with "subscribe <your email
+  First, get the krb-ticket the normal way, like with the kauth tool. Then use
-  address>" in the body.
+  curl in way similar to:
-  To post to the list, mail curl@contactor.se.
+        curl --krb4 private ftp://krb4site.com -u username:fakepwd
-  To unsubcribe, mail curl-request@contactor.se with "unsubscribe <your
+  There's no use for a password on the -u switch, but a blank one will make
-  subscribed email address>" in the body.
+  curl ask for one and you already entered the real password to kauth.
 TELNET
  The curl telnet support is basic and very easy to use. Curl passes all data
  passed to it on stdin to the remote server. Connect to a remote telnet
  server using a command line similar to:
        curl telnet://remote.server.com
  And enter the data to pass to the server on stdin. The result will be sent
  to stdout or to the file you specify with -o.
  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
  password accordingly.
 PERSISTANT CONNECTIONS
  Specifying multiple files on a single command line will make curl transfer
  all of them, one after the other in the specified order.
  libcurl will attempt to use persistant connections for the transfers so that
  the second transfer to the same host can use the same connection that was
  already initiated and was left open in the previous transfer. This greatly
  decreases connection time for all but the first transfer and it makes a far
  better use of the network.
  Note that curl cannot use persistant connections for transfers that are used
  in subsequence curl invokes. Try to stuff as many URLs as possible on the
  same command line if they are using the same host, as that'll make the
  transfers faster. If you use a http proxy for file transfers, practicly
  all transfers will be persistant.
  Persistant connections were introduced in curl 7.7.
 MAILING LISTS
  For your convenience, we have several open mailing lists to discuss curl,
  its development and things relevant to this.
  To subscribe to the main curl list, mail curl-request@contactor.se with
  "subscribe <fill in your email address>" in the body.
  To subscribe to the curl-library users/deverlopers list, follow the
  instructions at http://curl.haxx.se/mail/
  To subscribe to the curl-announce list, to only get information about new
  releases, follow the instructions at http://curl.haxx.se/mail/
  To subscribe to the curl-and-PHP list in which curl using with PHP is
  discussed, follow the instructions at http://curl.haxx.se/mail/
  Please direct curl questions, feature requests and trouble reports to one of
  these mailing lists instead of mailing any individual.
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -0,0 +1,77 @@
 #
 # $Id$
 #
 AUTOMAKE_OPTIONS = foreign no-dependencies
 man_MANS = \
 	curl.1 \
 	curl-config.1 \
 	curl_easy_cleanup.3 \
 	curl_easy_getinfo.3 \
 	curl_easy_init.3 \
 	curl_easy_perform.3 \
 	curl_easy_setopt.3 \
 	curl_easy_duphandle.3 \
 	curl_formparse.3 \
 	curl_formadd.3 \
 	curl_formfree.3 \
 	curl_getdate.3 \
 	curl_getenv.3 \
 	curl_slist_append.3 \
 	curl_slist_free_all.3 \
 	curl_version.3 \
 	curl_escape.3 \
 	curl_unescape.3 \
 	curl_strequal.3 \
 	curl_strnequal.3 \
 	curl_mprintf.3 \
 	curl_global_init.3 \
 	curl_global_cleanup.3 \
 	libcurl.3
 SUBDIRS = examples
 HTMLPAGES = \
 	curl.html \
 	curl-config.html \
 	curl_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 \
 	README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS \
 	VERSIONS $(HTMLPAGES)
 MAN2HTML= gnroff -man $< | man2html >$@
 SUFFIXES = .1 .3 .html
 html: $(HTMLPAGES)
 .3.html:
 	$(MAN2HTML)
 .1.html:
 	$(MAN2HTML)
--- a/docs/README.win32
+++ b/docs/README.win32
@@ -0,0 +1,22 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 README.win32
  Read the README file first.
  Curl has been compiled, built and run on all sorts of Windows and win32
  systems. While not being the main develop target, a fair share of curl users
  are win32-based.
  The unix-style man pages are tricky to read on windows, so therefore are all
  those pages also converted to HTML and those are also included in the
  release archives.
  The main curl.1 man page is also "built-in" in the command line tool. Use a
  command line similar to this in order to extract a separate text file:
        curl -M >manual.txt
--- a/docs/RESOURCES
+++ b/docs/RESOURCES
@@ -0,0 +1,125 @@
                                  _   _ ____  _     
  Project                     ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 This document has been introduced in order to let you find documents that
 specify standards used by curl, software that extends curl, web pages with
 "competing" utilities and information pages that describe some of the tools
 that we use to build/compile/develop curl.
 Standards
 ---------
  RFC 959  - Defines how FTP works
  RFC 1635 - How to Use Anonymous FTP
  RFC 1738 - Uniform Resource Locators
  RFC 1777 - defines the LDAP protocol
  RFC 1808 - Relative Uniform Resource Locators
  RFC 1867 - Form-based File Upload in HTML
  RFC 1950 - ZLIB Compressed Data Format Specification
  RFC 1951 - DEFLATE Compressed Data Format Specification
  RFC 1952 - gzip compression format
  RFC 1959 - LDAP URL syntax
  RFC 2045-2049 - Everything you need to know about MIME! (needed for form
                  based upload)
  RFC 2068 - HTTP 1.1 (obsoleted by RFC 2616)
  RFC 2109 - HTTP State Management Mechanism (cookie stuff)
           - Also, read Netscape's specification at
             http://curl.haxx.se/rfc/cookie_spec.html
  RFC 2183 - The Content-Disposition Header Field
  RFC 2229 - A Dictionary Server Protocol
  RFC 2255 - Newer LDAP URL syntax document.
  RFC 2231 - MIME Parameter Value and Encoded Word Extensions:
             Character Sets, Languages, and Continuations
  RFC 2388 - "Returning Values from Forms: multipart/form-data"
             Use this as an addition to the RFC1867 
  RFC 2396 - "Uniform Resource Identifiers: Generic Syntax and Semantics" This
             one obsoletes RFC 1738, but since RFC 1738 is often mentioned
             I've left it in this list.
  RFC 2428 - FTP Extensions for IPv6 and NATs
  RFC 2577 - FTP Security Considerations
  RFC 2616 - HTTP 1.1, the latest
  RFC 2617 - HTTP Authentication
  RFC 2718 - Guidelines for new URL Schemes
  RFC 2732 - Format for Literal IPv6 Addresses in URL's
  RFC 2818 - HTTP Over TLS (TLS is the successor to SSL)
  RFC 2964 - Use of HTTP State Management
  RFC 2965 - HTTP State Management Mechanism. Cookies. Obsoletes RFC2109
 Compilers
 ---------
  MingW32 - http://www.mingw.org/
  gcc     - http://www.gnu.org/software/gcc/gcc.html
 Software
 --------
  OpenSSL -  http://www.openssl.org/
  OpenLDAP - http://www.openldap.org/
  zlib -     http://www.cdrom.com/pub/infozip/zlib/
 Similar Tools
 -------------
  wget    - http://sunsite.dk/wget/
  snarf   - http://www.xach.com/snarf/
  lynx    - http://lynx.browser.org/ (well at least when -dump is used)
  swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
  Kermit  - http://www.columbia.edu/kermit/ftpclient
  Pavuk   - http://www.idata.sk/~ondrej/pavuk/
  httpr   - http://zwolak.dhs.org/httpr/
  puf     - http://www.inf.tu-dresden.de/~ob6/sw/puf.html
 Related Software
 ----------------
  ftpparse - http://cr.yp.to/ftpparse.html parses FTP LIST responses
  autoconf - http://www.gnu.org/software/autoconf/autoconf.html
  automake - http://www.gnu.org/software/automake/automake.html
  bison    - http://www.gnu.org/software/bison/bison.html
  gzip     - http://www.gnu.org/software/gzip/gzip.html
  tar      - http://www.gnu.org/software/tar/tar.html
  libtool  - http://www.gnu.org/software/libtool/libtool.html
--- 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
@@ -0,0 +1,136 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 TODO
 Things to do in project cURL. Please tell me what you think, contribute and
 send me patches that improve things! Also check the http://curl.haxx.se/dev
 web section for various development notes.
 LIBCURL
 * Consider an interface to libcurl that allows applications to easier get to
   know what cookies that are sent back in the response headers.
 * Make content encoding/decoding internally be made using a filter system.
 * The new 'multi' interface is being designed. Work out the details, start
   implementing and write test applications!
   [http://curl.haxx.se/dev/multi.h]
 * Add a name resolve cache to libcurl to make repeated fetches to the same
   host name (when persitancy isn't available) faster.
 * Introduce another callback interface for upload/download that makes one
   less copy of data and thus a faster operation.
   [http://curl.haxx.se/dev/no_copy_callbacks.txt]
 * Add configure options that disables certain protocols in libcurl to
   decrease footprint.  '--disable-[protocol]' where protocol is http, ftp,
   telnet, ldap, dict or file.
 * Add asynchronous name resolving. http://curl.haxx.se/dev/async-resolver.txt
 * Strip any trailing CR from the error message when Curl_failf() is used.
 DOCUMENTATION
 * Document all CURLcode error codes, why they happen and what most likely
   will make them not happen again.
 FTP
 * FTP ASCII upload does not follow RFC959 section 3.1.1.1: "The sender
   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."
 * An option to only download remote FTP files if they're newer than the local
   one is a good idea, and it would fit right into the same syntax as the
   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. 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
   protocol is a proprietary one, it involves reverse engineering and network
   sniffing. This should however be a library-based functionality. There are a
   few different efforts "out there" to make open source HTTP clients support
   this and it should be possible to take advantage of other people's hard
   work. http://modntlm.sourceforge.net/ is one. There's a web page at
   http://www.innovation.ch/java/ntlm.html that contains detailed reverse-
   engineered info.
 * RFC2617 compliance, "Digest Access Authentication"
   A valid test page seem to exist at:
   http://hopf.math.nwu.edu/testpage/digest/
   And some friendly person's server source code is available at
   http://hopf.math.nwu.edu/digestauth/index.html
   Then there's the Apache mod_digest source code too of course.  It seems as
   if Netscape doesn't support this, and not many servers do. Although this is
   a lot better authentication method than the more common "Basic". Basic
   sends the password in cleartext over the network, this "Digest" method uses
   a challange-response protocol which increases security quite a lot.
 TELNET
 * Make TELNET work on windows98!
 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
@@ -0,0 +1,378 @@
 Online:  http://curl.haxx.se/docs/httpscripting.shtml
 Author:  Daniel Stenberg <daniel@haxx.se>
 Date:    October 31, 2001
 Version: 0.5
                The Art Of Scripting HTTP Requests Using Curl
                =============================================
 This document will assume that you're familiar with HTML and general
 networking.
 The possibility to write scripts is essential to make a good computer
 system. Unix' capability to be extended by shell scripts and various tools to
 run various automated commands and scripts is one reason why it has succeeded
 so well.
 The increasing amount of applications moving to the web has made "HTTP
 Scripting" more frequently requested and wanted. To be able to automatically
 extract information from the web, to fake users, to post or upload data to
 web servers are all important tasks today.
 Curl is a command line tool for doing all sorts of URL manipulations and
 transfers, but this particular document will focus on how to use it when
 doing HTTP requests for fun and profit. I'll assume that you know how to
 invoke 'curl --help' or 'curl --manual' to get basic information about it.
 Curl is not written to do everything for you. It makes the requests, it gets
 the data, it sends data and it retrieves the information. You probably need
 to glue everything together using some kind of script language or repeated
 manual invokes.
 1. The HTTP Protocol
 HTTP is the protocol used to fetch data from web servers. It is a very simple
 protocol that is built upon TCP/IP. The protocol also allows information to
 get sent to the server from the client using a few different methods, as will
 be shown here.
 HTTP is plain ASCII text lines being sent by the client to a server to
 request a particular action, and then the server replies a few text lines
 before the actual requested content is sent to the client.
 Using curl's option -v will display what kind of commands curl sends to the
 server, as well as a few other informational texts. -v is the single most
 useful option when it comes to debug or even understand the curl<->server
 interaction.
 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
 http://curl.haxx.se or https://yourbank.com a million times.
 3. GET a page
 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 issue the command line
        curl http://curl.haxx.se
 you get a web page returned in your terminal window. The entire HTML document
 that that URL holds.
 All HTTP replies contain a set of headers that are normally hidden, use
 curl's -i option to display them as well as the rest of the document. You can
 also ask the remote server for ONLY the headers by using the -I option.
 4. Forms
 Forms are the general way a web site can present a HTML page with fields for
 the user to enter data in, and then press some kind of 'OK' or 'submit'
 button to get that data sent to the server. The server then typically uses
 the posted data to decide how to act. Like using the entered words to search
 in a database, or to add the info in a bug track system, display the entered
 address on a map or using the info as a login-prompt verifying that the user
 is allowed to see what it is about to see.
 Of course there has to be some kind of program in the server end to receive
 the data you send. You cannot just invent something out of the air.
 4.1 GET
  A GET-form uses the method GET, as specified in HTML like:
        <form method="GET" action="junk.cgi">
          <input type=text name="birthyear">
          <input type=submit name=press value="OK">
        </form>
  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
  previous URL.
  If the original form was seen on the page "www.hotmail.com/when/birth.html",
  the second page you'll get will become
  "www.hotmail.com/when/junk.cgi?birthyear=1905&press=OK".
  Most search engines work this way.
  To make curl do the GET form post for you, just enter the expected created
  URL:
        curl "www.hotmail.com/when/junk.cgi?birthyear=1905&press=OK"
 4.2 POST
  The GET method makes all input field names get displayed in the URL field of
  your browser. That's generally a good thing when you want to be able to
  bookmark that page with your given data, but it is an obvious disadvantage
  if you entered secret information in one of the fields or if there are a
  large amount of fields creating a very long and unreadable URL.
  The HTTP protocol then offers the POST method. This way the client sends the
  data separated from the URL and thus you won't see any of it in the URL
  address field.
  The form would look very similar to the previous one:
        <form method="POST" action="junk.cgi">
          <input type=text name="birthyear">
          <input type=submit name=press value="OK">
        </form>
  And to use curl to post this form with the same data filled in as before, we
  could do it like:
        curl -d "birthyear=1905&press=OK" www.hotmail.com/when/junk.cgi
  This kind of POST will use the Content-Type
  application/x-www-form-urlencoded and is the most widely used POST kind.
 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 referred to as
  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:
    <form method="POST" enctype='multipart/form-data' action="upload.cgi">
      <input type=file name=upload>
      <input type=submit name=press value="OK">
    </form>
  This clearly shows that the Content-Type about to be sent is
  multipart/form-data.
  To post to a form like this with curl, you enter a command line like:
        curl -F upload=@localfilename -F press=OK [URL]
 4.4 HIDDEN FIELDS
  A very common way for HTML based application to pass state information
  between pages is to add hidden fields to the forms. Hidden fields are
  already filled in, they aren't displayed to the user and they get passed
  along just as all the other fields.
  A similar example form with one visible field, one hidden field and one
  submit button could look like:
    <form method="POST" action="foobar.cgi">
      <input type=text name="birthyear">
      <input type=hidden name="person" value="daniel">
      <input type=submit name="press" value="OK">
    </form>
  To post this with curl, you won't have to think about if the fields are
  hidden or not. To curl they're all the same:
        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
 again, this of course requires that someone put a program or script on the
 server end that knows how to receive a HTTP PUT stream.
 Put a file to a HTTP server with curl:
        curl -T uploadfile www.uploadhttp.com/receive.cgi
 6. AUTHENTICATION
 Authentication is the ability to tell the server your username and password
 so that it can verify that you're allowed to do the request you're doing. The
 basic authentication used in HTTP is *plain* *text* based, which means it
 sends username and password only slightly obfuscated, but still fully
 readable by anyone that sniffs on the network between you and the remote
 server.
 To tell curl to use a user and password for authentication:
        curl -u name:password www.secrets.com
 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:
        curl -U proxyuser:proxypassword curl.haxx.se
 If you use any one these user+password options but leave out the password
 part, curl will prompt for the password interactively.
 Do note that when a program is run, its parameters are possible to see when
 listing the running processes of the system. Thus, other users may be able to
 watch your passwords if you pass them as plain command line options. There
 are ways to circumvent this.
 7. REFERER
 A HTTP request may include a 'referer' field, which can be used to tell from
 which URL the client got to this particular resource. Some programs/scripts
 check the referer field of requests to verify that this wasn't arriving from
 an external site or an unknown page. While this is a stupid way to check
 something so easily forged, many scripts still do it. Using curl, you can put
 anything you want in the referer-field and thus more easily be able to fool
 the server into serving your request.
 Use curl to set the referer field with:
        curl -e http://curl.haxx.se daniel.haxx.se
 8. USER AGENT
 Very similar to the referer field, all HTTP requests may set the User-Agent
 field. It names what user agent (client) that is being used. Many
 applications use this information to decide how to display pages. Silly web
 programmers try to make different pages for users of different browsers to
 make them look the best possible for their particular browsers. They usually
 also do different kinds of javascript, vbscript etc.
 At times, you will see that getting a page with curl will not return the same
 page that you see when getting the page with your browser. Then you know it
 is time to set the User Agent field to fool the server into thinking you're
 one of those browsers.
 To make curl look like Internet Explorer on a Windows 2000 box:
        curl -A "Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)" [URL]
 Or why not look like you're using Netscape 4.73 on a Linux (PIII) box:
        curl -A "Mozilla/4.73 [en] (X11; U; Linux 2.2.15 i686)" [URL]
 9. REDIRECTS
 When a resource is requested from a server, the reply from the server may
 include a hint about where the browser should go next to find this page, or a
 new page keeping newly generated output. The header that tells the browser
 to redirect is Location:.
 Curl does not follow Location: headers by default, but will simply display
 such pages in the same manner it display all HTTP replies. It does however
 feature an option that will make it attempt to follow the Location: pointers.
 To tell curl to follow a Location: 
        curl -L www.sitethatredirects.com
 If you use curl to POST to a site that immediately redirects you to another
 page, you can safely use -L and -d/-F together. Curl will only use POST in
 the first request, and then revert to GET in the following operations.
 10. COOKIES
 The way the web browsers do "client side state control" is by using
 cookies. Cookies are just names with associated contents. The cookies are
 sent to the client by the server. The server tells the client for what path
 and host name it wants the cookie sent back, and it also sends an expiration
 date and a few more properties.
 When a client communicates with a server with a name and path as previously
 specified in a received cookie, the client sends back the cookies and their
 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 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.
 The simplest way to send a few cookies to the server when getting a page with
 curl is to add them on the command line like:
        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:
        curl -D headers_and_cookies www.cookiesite.com
 Curl has a full blown cookie parsing engine built-in that comes to use if you
 want to reconnect to a server and use cookies that were stored from a
 previous connection (or handicrafted manually to fool the server into
 believing you had a previous connection). To use previously stored cookies,
 you run curl like:
        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
 protocol for doing this is what is generally known as HTTPS, HTTP over
 SSL. SSL encrypts all the data that is sent and received over the network and
 thus makes it harder for attackers to spy on sensitive information.
 SSL (or TLS as the latest version of the standard is called) offers a
 truckload of advanced features to allow all those encryptions and key
 infrastructure mechanisms encrypted HTTP requires.
 Curl supports encrypted fetches thanks to the freely available OpenSSL
 libraries. To get a page from a HTTPS server, simply run curl like:
        curl https://that.secure.server.com
 11.1 CERTIFICATES
  In the HTTPS world, you use certificates to validate that you are the one
  you you claim to be, as an addition to normal passwords. Curl supports
  client-side certificates. All certificates are locked with a PIN-code, why
  you need to enter the unlock-code before the certificate can be used by
  curl. The PIN-code can be specified on the command line or if not, entered
  interactively when curl queries for it. Use a certificate with curl on a
  HTTPS server like:
        curl -E mycert.pem https://that.secure.server.com
 12. REFERENCES
 RFC 2616 is a must to read if you want in-depth understanding of the HTTP
 protocol.
 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
@@ -0,0 +1,55 @@
 .\" You can view this file with:
 .\" nroff -man curl-config.1
 .\" Written by Daniel Stenberg
 .\"
 .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
 .B curl-config [options]
 .SH DESCRIPTION
 .B curl-config
 displays information about a previous curl and libcurl installation.
 .SH OPTIONS
 .IP "--cflags"
 Set of compiler options (CFLAGS) to use when compiling files that use
 libcurl. Currently that is only thw include path to the curl include files.
 .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
 any particular order. The keywords will be separated by newlines. There may be
 none, one or several keywords in the list.
 .IP "--help"
 Displays the available options.
 .IP "--libs"
 Shows the complete set of libs and other linker options you will need in order
 to link your application with libcurl.
 .IP "--prefix"
 This is the prefix used when libcurl was installed. Libcurl is then installed
 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 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
 What's the installed libcurl version?
  curl-config --version
 .SH "SEE ALSO"
 .BR curl (1)
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -2,18 +2,18 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "13 March 2000" "Curl 6.5" "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
+.I [URL...]
 .SH DESCRIPTION
 .B curl
-is a client to get documents/files from servers, using any of the
+is a client to get documents/files from or send documents to a server, using
-supported protocols. The command is designed to work without user
+any of the supported protocols (HTTP, HTTPS, FTP, GOPHER, DICT, TELNET, LDAP
-interaction or any kind of interactivity.
+or FILE). The command is designed to work without user interaction or any kind
 of interactivity.
 curl offers a busload of useful tricks like proxy support, user
 authentication, ftp upload, HTTP post, SSL (https:) connections, cookies, file
@@ -37,18 +37,32 @@ It is possible to specify up to 9 sets or series for a URL, but no nesting is
 supported at the moment:
 http://www.any.org/archive[1996-1999]/volume[1-4]part{a,b,c,index}.html
 You can specify any amount of URLs on the command line. They will be fetched
 in a sequential manner in the specified order.
 Curl will attempt to re-use connections for multiple file transfers, so that
 getting many files from the same server will not do multiple connects /
 handshakes. This improves speed. Of course this is only done on files
 specified on a single command line and cannot be used between separate curl
 invokes.
 .SH OPTIONS
 .IP "-a/--append"
 (FTP)
 When used in a ftp upload, this will tell curl to append to the target
 file instead of overwriting it. If the file doesn't exist, it will
 be created.
 If this option is used twice, the second one will disable append mode again.
 .IP "-A/--user-agent <agent string>"
 (HTTP)
 Specify the User-Agent string to send to the HTTP server. Some badly done CGIs
 fail if its not set to "Mozilla/4.0".  To encode blanks in the string,
 surround the string with single quote marks.  This can also be set with the
 -H/--header flag of course.
 If this option is set more than once, the last one will be the one that's
 used.
 .IP "-b/--cookie <name=data>"
 (HTTP)
 Pass the data to the HTTP server as a cookie. It is supposedly the
@@ -57,47 +71,103 @@ 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!
-.IP "-B/--ftp-ascii"
+
-(FTP/LDAP)
+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
-also be enforced by using an URL that ends with ";type=A".
+also be enforced by using an URL that ends with ";type=A". This option causes
-.IP "-c/--continue"
+data sent to stdout to be in text mode for win32 systems.
-Continue/Resume a previous file transfer. This instructs curl to
+
-continue appending data on the file where it was previously left,
+If this option is used twice, the second one will disable ASCII usage.
-possibly because of a broken connection to the server. There must be
+.IP "--ciphers <list of ciphers>"
-a named physical file to append to for this to work.
+(SSL) Specifies which ciphers to use in the connection. The list of ciphers
-Note: Upload resume is depening on a command named SIZE not always
+must be using valid ciphers. Read up on SSL cipher list details on this URL:
-present in all ftp servers! Upload resume is for FTP only.
+.I http://www.openssl.org/docs/apps/ciphers.html (Option added in curl 7.9)
-HTTP resume is only possible with HTTP/1.1 or later servers.
+
 If this option is used severl times, the last one will override the others.
 .IP "--connect-timeout <seconds>"
 Maximum time in seconds that you allow the connection to the server to take.
 This only limits the connection phase, once curl has connected this option is
 of no more use. This option didn't work in win32 systems until 7.7.2.  See
 also the
 .I "--max-time"
 option.
 If this option is used several times, the last one will be used.
 .IP "-c/--cookie-jar <file name>"
 Specify to which file you want curl to write all cookies after a completed
 operation. Curl writes all cookies previously read from a specified file as
 well as all cookies received from remote server(s). If no cookies are known,
 no file will be written. The file will be written using the Netscape cookie
 file format. If you set the file name to a single dash, "-", the cookies will
 be written to stdout. (Option added in curl 7.9)
 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>"
-(HTTP)
+(HTTP) Sends the specified data in a POST request to the HTTP server, in a way
-Sends the specified data in a POST request to the HTTP server. Note
+that can emulate as if a user has filled in a HTML form and pressed the submit
-that the data is sent exactly as specified with no extra processing.
+button. Note that the data is sent exactly as specified with no extra
-The data is expected to be "url-encoded". This will cause curl to
+processing (with all newlines cut off).  The data is expected to be
-pass the data to the server using the content-type
+"url-encoded". This will cause curl to pass the data to the server using the
-application/x-www-form-urlencoded. Compare to -F.
+content-type application/x-www-form-urlencoded. Compare to -F. If more than
 one -d/--data option is used on the same command line, the data pieces
 specified will be merged together with a separating &-letter. Thus, using '-d
 name=daniel -d skill=lousy' would generate a post chunk that looks like
 \&'name=daniel&skill=lousy'.
 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.
+read the data from, or - if you want curl to read the data from stdin.  The
-The contents of the file must already be url-encoded.
+contents of the file must already be url-encoded. Multiple files can also be
 specified. Posting data from a file named 'foobar' would thus be done with
 "--data @foobar".
 To post data purely binary, you should instead use the --data-binary option.
 -d/--data is the same as --data-ascii.
 If this option is used several times, the ones following the first will
 append data.
 .IP "--data-ascii <data>"
 (HTTP) This is an alias for the -d/--data option.
 If this option is used several times, the ones following the first will
 append data.
 .IP "--data-binary <data>"
 (HTTP) This posts data in a similar manner as --data-ascii does, although when
 using this option the entire context of the posted data is kept as-is. If you
 want to post a binary file without the strip-newlines feature of the
 --data-ascii option, this is for you.
 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
@@ -106,11 +176,22 @@ file if -I/--head is used.
 This option is handy to use when you want to store the cookies that a HTTP
 site sends to you. The cookies could then be read in a second curl invoke by
 using the -b/--cookie option!
 If this option is used several times, the last one will be used.
 .IP "-e/--referer <URL>"
-(HTTP)
+(HTTP) Sends the "Referer Page" information to the HTTP server. This can also
-Sends the "Referer Page" information to the HTTP server. Some badly
+be set with the -H/--header flag of course.  When used with
-done CGIs fail if it's not set. This can also be set with the -H/--header
+.I -L/--location 
-flag of course.
+you can append ";auto" to the referer URL to make curl automatically set the
 previous URL when it follows a Location: header. The ";auto" string can be
 used alone, even if you don't set an initial referer.
 If this option is used several times, the last one will be used.
 .IP "--egd-file <file>"
 (HTTPS) Specify the path name to the Entropy Gathering Daemon socket. The
 socket is used to seed the random engine for SSL connections. See also the
 .I "--random-file"
 option.
 .IP "-E/--cert <certificate[:password]>"
 (HTTPS)
 Tells curl to use the specified certificate file when getting a file
@@ -118,6 +199,13 @@ with HTTPS. The certificate must be in PEM format.
 If the optional password isn't specified, it will be queried for on
 the terminal. Note that this certificate is the private key and the private
 certificate concatenated!
 If this option is used several times, the last one will be used.
 .IP "--cacert <CA certificate>"
 (HTTPS) Tells curl to use the specified certificate file to verify the
 peer. The certificate must be in PEM format.
 If this option is used several times, the last one will be used.
 .IP "-f/--fail"
 (HTTP)
 Fail silently (no output at all) on server errors. This is mostly done
@@ -126,65 +214,117 @@ attempts. In normal cases when a HTTP server fails to deliver a
 document, it returns a HTML document stating so (which often also
 describes why and more). This flag will prevent curl from
 outputting that and fail silently instead.
 If this option is used twice, the second will again disable silent failure.
 .IP "-F/--form <name=content>"
-(HTTP)
+(HTTP) This lets curl emulate a filled in form in which a user has pressed the
-This lets curl emulate a filled in form in which a user has pressed
+submit button. This causes curl to POST data using the content-type
-the submit button. This causes curl to POST data using the
+multipart/form-data according to RFC1867. This enables uploading of binary
-content-type multipart/form-data according to RFC1867. This enables
+files etc. To force the 'content' part to be be a file, prefix the file name
-uploading of binary files etc. To force the 'content' part to be
+with an @ sign. To just get the content part from a file, prefix the file name
-read from a file, prefix the file name with an @ sign. Example, to
+with the letter <. The difference between @ and < is then that @ makes a file
-send your password file to the server, where 'password' is the
+get attached in the post as a file upload, while the < makes a text field and
-name of the form-field to which /etc/passwd will be the input:
+just get the contents for that text field from a file.
 Example, to send your password file to the server, where
 \&'password' is the name of the form-field to which /etc/passwd will be the
 input:
 .B curl
 -F password=@/etc/passwd www.mypasswords.com
 To read the file's content from stdin insted of a file, use - where the file
-name should've been.
+name should've been. This goes for both @ and < constructs.
 This option can be used multiple times.
 .IP "-g/--globoff"
 This option switches off the "URL globbing parser". When you set this option,
 you can specify URLs that contain the letters {}[] without having them being
 interpreted by curl itself. Note that these letters are not normal legal URL
 contents but they should be encoded according to the URI standard. (Option
 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>"
-(HTTP)
+(HTTP) Extra header to use when getting a web page. You may specify any number
-Extra header to use when getting a web page. You may specify any number of
+of extra headers. Note that if you should add a custom header that has the
-extra headers. Note that if you should add a custom header that has the same
+same name as one of the internal ones curl would use, your externally set
-name as one of the internal ones curl would use, your externally set header
+header will be used instead of the internal one. This allows you to make even
 will be used instead of the internal one. This allows you to make even
 trickier stuff than curl would normally do. You should not replace internally
-set headers without knowing perfectly well what you're doing.
+set headers without knowing perfectly well what you're doing. Replacing an
 internal header with one without content on the right side of the colon will
 prevent that header from appearing.
 This option can be used multiple times.
 .IP "-i/--include"
 (HTTP)
 Include the HTTP-header in the output. The HTTP-header includes things
 like server-name, date of the document, HTTP-version and more...
 If this option is used twice, the second will again disable header include.
 .IP "--interface <name>"
 Perform an operation using a specified interface. You can enter interface
 name, IP address or host name. An example could look like:
 .B "curl --interface eth0:1 http://www.netscape.com/"
 If this option is used several times, the last one will be used.
 .IP "-I/--head"
 (HTTP/FTP)
 Fetch the HTTP-header only! HTTP-servers feature the command HEAD
 which this uses to get nothing but the header of a document. When used
 on a FTP file, curl displays the file size only.
 If this option is used twice, the second will again disable header only.
 .IP "--krb4 <level>"
 (FTP) Enable kerberos4 authentication and use. The level must be entered and
 should be one of 'clear', 'safe', 'confidential' or 'private'. Should you use
 a level that is not one of these, 'private' will instead be used.
 If this option is used several times, the last one will be used.
 .IP "-K/--config <config file>"
-Specify which config file to read curl arguments from. The config
+Specify which config file to read curl arguments from. The config file is a
-file is a text file in which command line arguments can be written
+text file in which command line arguments can be written which then will be
-which then will be used as if they were written on the actual command
+used as if they were written on the actual command line. Options and their
-line. If the first column of a config line is a '#' character, the
+parameters must be specified on the same config file line. If the parameter is
-rest of the line will be treated as a comment.
+to contain white spaces, the parameter must be inclosed within quotes.  If the
 first column of a config line is a '#' character, the rest of the line will be
 treated as a comment.
 Specify the filename as '-' to make curl read the file from stdin.
 This option can be used multiple times.
 .IP "-l/--list-only"
 (FTP)
 When listing an FTP directory, this switch forces a name-only view.
 Especially useful if you want to machine-parse the contents of an FTP
 directory since the normal directory view doesn't use a standard look
 or format.
 If this option is used twice, the second will again disable list only.
 .IP "-L/--location"
-(HTTP/HTTPS)
+(HTTP/HTTPS) If the server reports that the requested page has a different
-If the server reports that the requested page has a different location
+location (indicated with the header line Location:) this flag will let curl
-(indicated with the header line Location:) this flag will let curl
+attempt to reattempt the get on the new place. If used together with -i or -I,
-attempt to reattempt the get on the new place. If used together with
+headers from all requested pages will be shown. If this flag is used when
-i or -I, headers from all requested pages will be shown.
+making a HTTP POST, curl will automatically switch to GET after the initial
 POST has been done.
 If this option is used twice, the second will again disable location following.
 .IP "-m/--max-time <seconds>"
-Maximum time in seconds that you allow the whole operation to take.
+Maximum time in seconds that you allow the whole operation to take.  This is
-This is useful for preventing your batch jobs from hanging for hours
+useful for preventing your batch jobs from hanging for hours due to slow
-due to slow networks or links going down.
+networks or links going down.  This doesn't work fully in win32 systems.
-This doesn't work properly in win32 systems.
+See also the
 .I "--connect-timeout"
 option.
 If this option is used several times, the last one will be used.
 .IP "-M/--manual"
 Manual. Display the huge help text.
 .IP "-n/--netrc"
@@ -193,7 +333,9 @@ Makes curl scan the
 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(5)
+.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
@@ -202,14 +344,18 @@ directory.
 A quick and very simple example of how to setup a
 .I .netrc
 to allow curl to ftp to the machine host.domain.com with user name
-'myself' and password 'secret' should look similar to:
+\&'myself' and password 'secret' should look similar to:
-.B "machine host.domain.com user myself password secret"
+.B "machine host.domain.com login myself password secret"
 If this option is used twice, the second will again disable netrc usage.
 .IP "-N/--no-buffer"
 Disables the buffering of the output stream. In normal work situations, curl
 will use a standard buffered output stream that will have the effect that it
 will output the data in chunks, not necessarily exactly when the data arrives.
 Using this option will disable that buffering.
 If this option is used twice, the second will again switch on buffering.
 .IP "-o/--output <file>"
 Write output to <file> instead of stdout. If you are using {} or [] to fetch
 multiple documents, you can use '#' followed by a number in the <file>
@@ -221,9 +367,21 @@ being fetched. Like in:
 or use several variables like:
  curl http://{site,host}.host[1-5].com -o "#1_#2"
 You may use this option as many times as you have number of URLs.
 .IP "-O/--remote-name"
 Write output to a local file named like the remote file we get. (Only
 the file part of the remote file is used, the path is cut off.)
 You may use this option as many times as you have number of URLs.
 .IP "-p/--proxytunnel"
 When an HTTP proxy is used, this option will cause non-HTTP protocols to
 attempt to tunnel through the proxy instead of merely using it to do HTTP-like
 operations. The tunnel approach is made with the HTTP proxy CONNECT request
 and requires that the proxy allows direct connect to the remote port number
 curl wants to tunnel through to.
 If this option is used twice, the second will again disable proxy tunnel.
 .IP "-P/--ftpport <address>"
 (FTP)
 Reverses the initiator/listener roles when connecting with ftp. This
@@ -245,6 +403,8 @@ i.e "my.host.domain" to specify machine
 .B "-"
 (any single-letter string) to make it pick the machine's default
 .RE
 If this option is used several times, the last one will be used.
 .IP "-q"
 If used as the first parameter on the command line, the
 .I $HOME/.curlrc
@@ -257,6 +417,14 @@ transfer is taking place. To make commands take place after a successful
 transfer, prefix them with a dash '-'. You may specify any amount of commands
 to be run before and after the transfer. If the server returns failure for one
 of the commands, the entire operation will be aborted.
 This option can be used multiple times.
 .IP "--random-file <file>"
 (HTTPS) Specify the path name to file containing what will be considered as
 random data. The data is used to seed the random engine for SSL connections.
 See also the
 .I "--edg-file"
 option.
 .IP "-r/--range <range>"
 (HTTP/FTP)
 Retrieve a byte range (i.e a partial document) from a HTTP/1.1 or FTP
@@ -294,35 +462,69 @@ document.
 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.
 If this option is used twice, the second will again disable mute.
 .IP "-S/--show-error"
 When used with -s it makes curl show error message if it fails.
-.IP "-t/--upload"
+
-Transfer the stdin data to the specified file. Curl will read
+If this option is used twice, the second will again disable show error.
-everything from stdin until EOF and store with the supplied name. If
+.IP "-t/--telnet-option <OPT=val>"
-this is used on a http(s) server, the PUT command will be used.
+Pass options to the telnet protocol. Supported options are:
 TTYPE=<term> Sets the terminal type.
 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
 examples of how to use this. If no password is specified, curl will
 ask for it interactively.
 If this option is used several times, the last one will be used.
 .IP "-U/--proxy-user <user:password>"
 Specify user and password to use for Proxy authentication. If no
 password is specified, curl will ask for it interactively.
 If this option is used several times, the last one will be used.
 .IP "--url <URL>"
 Specify a URL to fetch. This option is mostly handy when you wanna specify
 URL(s) in a config file.
 This option may be used any number of times. To control where this URL is written, use the
 .I -o
 or the
 .I -O
 options.
 .IP "-v/--verbose"
 Makes the fetching more verbose/talkative. Mostly usable for
 debugging. Lines starting with '>' means data sent by curl, '<'
 means data received by curl that is hidden in normal cases and lines
 starting with '*' means additional info provided by curl.
 If this option is used twice, the second will again disable verbose.
 .IP "-V/--version"
 Displays the full version of curl, libcurl and other 3rd party libraries
 linked with the executable.
@@ -370,21 +572,41 @@ 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
 .B size_upload
 The total amount of bytes that were uploaded.
 .TP
 .B size_header
 The total amount of bytes of the downloaded headers.
 .TP
 .B size_request
 The total amount of bytes that were sent in the HTTP request.
 .TP
 .B speed_download
 The average download speed that curl measured for the complete download.
 .TP
 .B speed_upload
-The average upload speed that curl measured for the complete download.
+The average upload speed that curl measured for the complete upload.
 .RE
 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>"
 (HTTP)
 Specifies a custom request to use when communicating with the HTTP server.
@@ -394,14 +616,20 @@ HTTP 1.1 specification for details and explanations.
 (FTP)
 Specifies a custom FTP command to use instead of LIST when doing file lists
 with ftp.
 If this option is used several times, the last one will be used.
 .IP "-y/--speed-time <time>"
 If a download is slower than speed-limit bytes per second during a speed-time
 period, the download gets aborted. If speed-time is used, the default
 speed-limit will be 1 unless set with -y.
 If this option is used several times, the last one will be used.
 .IP "-Y/--speed-limit <speed>"
 If a download is slower than this given speed, in bytes per second, for
 speed-time seconds it gets aborted. speed-time is set with -Y and is 30 if
 not set.
 If this option is used several times, the last one will be used.
 .IP "-z/--time-cond <date expression>"
 (HTTP)
 Request to get a file that has been modified later than the given time and
@@ -409,33 +637,46 @@ date, or one that has been modified before that time. The date expression can
 be all sorts of date strings or if it doesn't match any internal ones, it
 tries to get the time from a given file name instead! See the
 .BR "GNU date(1)"
-man page for date expression details.
+or
 .BR "curl_getdate(3)"
 man pages for date expression details.
 Start the date expression with a dash (-) to make it request for a document
 that is older than the given date/time, default is a document that is newer
 than the specified date/time.
 If this option is used several times, the last one will be used.
 .IP "-3/--sslv3"
 (HTTPS)
 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.
 If this option is used twice, the second will again disable the progress bar.
 .IP "--crlf"
 (FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
 If this option is used twice, the second will again disable crlf converting.
 .IP "--stderr <file>"
 Redirect all writes to stderr to the specified file instead. If the file name
 is a plain '-', it is instead written to stdout. This option has no point when
 you're using a shell with decent redirecting capabilities.
 If this option is used several times, the last one will be used.
 .SH FILES
 .I ~/.curlrc
 .RS
 Default config file.
 .SH ENVIRONMENT
-.IP "HTTP_PROXY [protocol://]<host>[:port]"
+.IP "http_proxy [protocol://]<host>[:port]"
 Sets proxy server to use for HTTP.
 .IP "HTTPS_PROXY [protocol://]<host>[:port]"
 Sets proxy server to use for HTTPS.
@@ -446,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,
@@ -483,7 +721,7 @@ FTP weird USER reply. Curl couldn't parse the reply sent to the USER request.
 .IP 13
 FTP weird PASV reply, Curl couldn't parse the reply sent to the PASV request.
 .IP 14
-FTP weird 227 formay. Curl couldn't parse the 227-line the server sent.
+FTP weird 227 format. Curl couldn't parse the 227-line the server sent.
 .IP 15
 FTP can't get host. Couldn't resolve the host IP we got in the 227-line.
 .IP 16
@@ -541,55 +779,36 @@ LDAP search failed.
 Library not found. The LDAP library was not found.
 .IP 41
 Function not found. A required LDAP function was not found.
 .IP 42
 Aborted by callback. An application told curl to abort the operation.
 .IP 43
 Internal error. A function was called with a bad parameter.
 .IP 44
 Internal error. A function was called in a bad order.
 .IP 45
 Interface error. A specified outgoing interface could not be used.
 .IP 46
 Bad password entered. An error was signalled when the password was entered.
 .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 any (or have other suggestions), mail Daniel Stenberg
+If you do find bugs, mail them to curl-bug@haxx.se.
 <Daniel.Stenberg@haxx.nu>.
 .SH AUTHORS / CONTRIBUTORS
- - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+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,nu>
 - Troy Engel <tengel@sonic.net>
 - Ryan Nelson <ryan@inch.com>
 - Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
 - 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és Garcí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@telekom.de>
 - Matthew Clarke <clamat@van.maves.ca>
 - Linus Nielsen <Linus.Nielsen@haxx.nu>
 - 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>
 .SH WWW
-http://curl.haxx.nu
+http://curl.haxx.se
 .SH FTP
 ftp://ftp.sunet.se/pub/www/utilities/curl/
 .SH "SEE ALSO"
--- a/docs/curl_easy_cleanup.3
+++ b/docs/curl_easy_cleanup.3
@@ -0,0 +1,29 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_cleanup 3 "5 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_easy_cleanup - End a libcurl session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "void curl_easy_cleanup(CURL *" handle ");"
 .ad
 .SH DESCRIPTION
 This function must be the last function to call for a curl session. It is the
 opposite of the
 .I curl_easy_init
 function and must be called with the same
 .I handle
 as input as the curl_easy_init call returned.
 This will effectively close all connections libcurl has been used and possibly
 has kept open until now. Don't call this function if you intend to transfer
 more files (libcurl 7.7 or later).
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_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
@@ -0,0 +1,106 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_init 3 "5 March 2001" "libcurl 7.6.1" "libcurl Manual"
 .SH NAME
 curl_easy_getinfo - Extract information from a curl session (added in 7.4)
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... );"
 .ad
 .SH DESCRIPTION
 Request internal information from the curl session with this function.  The
 third argument
 .B MUST
 be a pointer to a long, a pointer to a char * or a pointer to a double (as
 this documentation describes further down).  The data pointed-to will be
 filled in accordingly and can be relied upon only if the function returns
 CURLE_OK.  This function is intended to get used *AFTER* a performed transfer,
 all results from this function are undefined until the transfer is completed.
 .SH AVAILABLE INFORMATION
 These are informations that can be extracted:
 .TP 0.8i
 .B CURLINFO_EFFECTIVE_URL
 Pass a pointer to a 'char *' to receive the last used effective URL.
 .TP
 .B CURLINFO_HTTP_CODE
 Pass a pointer to a long to receive the last received HTTP code.
 .TP
 .B CURLINFO_FILETIME
 Pass a pointer to a long to receive the remote time of the retrieved
 document. If you get 0, it can be because of many reasons (unknown, the server
 hides it or the server doesn't support the command that tells document time
 etc) and the time of the document is unknown. (Added in 7.5)
 .TP
 .B CURLINFO_TOTAL_TIME
 Pass a pointer to a double to receive the total transaction time in seconds
 for the previous transfer.
 .TP
 .B CURLINFO_NAMELOOKUP_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the name resolving was completed.
 .TP
 .B CURLINFO_CONNECT_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the connect to the remote host (or proxy) was completed.
 .TP
 .B CURLINFO_PRETRANSFER_TIME
 Pass a pointer to a double to receive the time, in seconds, it took from the
 start until the file transfer is just about to begin. This includes all
 pre-transfer commands and negotiations that are specific to the particular
 protocol(s) involved.
 .TP
 .B CURLINFO_STARTTRANSFER_TIME
 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.
 .TP
 .B CURLINFO_SIZE_DOWNLOAD
 Pass a pointer to a double to receive the total amount of bytes that were
 downloaded.
 .TP
 .B CURLINFO_SPEED_DOWNLOAD
 Pass a pointer to a double to receive the average download speed that curl
 measured for the complete download.
 .TP
 .B CURLINFO_SPEED_UPLOAD
 Pass a pointer to a double to receive the average upload speed that curl
 measured for the complete upload.
 .TP
 .B CURLINFO_HEADER_SIZE
 Pass a pointer to a long to receive the total size of all the headers
 received.
 .TP
 .B CURLINFO_REQUEST_SIZE
 Pass a pointer to a long to receive the total size of the issued
 requests. This is so far only for HTTP requests. Note that this may be more
 than one request if FOLLOWLOCATION is true.
 .TP
 .B CURLINFO_SSL_VERIFYRESULT
 Pass a pointer to a long to receive the result of the certification
 verification that was requested (using the CURLOPT_SSL_VERIFYPEER option to
 curl_easy_setopt). (Added in 7.4.2)
 .TP
 .B CURLINFO_CONTENT_LENGTH_DOWNLOAD
 Pass a pointer to a double to receive the content-length of the download. This
 is the value read from the Content-Length: field.  (Added in 7.6.1)
 .TP
 .B CURLINFO_CONTENT_LENGTH_UPLOAD
 Pass a pointer to a double to receive the specified size of the upload.
 (Added in 7.6.1)
 .PP
 .SH RETURN VALUE
 If the operation was successful, CURLE_OK is returned. Otherwise an
 appropriate error code will be returned.
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3)"
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_init.3
+++ b/docs/curl_easy_init.3
@@ -0,0 +1,34 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_init 3 "14 August 2001" "libcurl 7.8.1" "libcurl Manual"
 .SH NAME
 curl_easy_init - Start a libcurl session
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURL *curl_easy_init( );"
 .ad
 .SH DESCRIPTION
 This function must be the first function to call, and it returns a CURL handle
 that you shall use as input to the other easy-functions. The init calls
 intializes curl and this call MUST have a corresponding call to
 .I curl_easy_cleanup
 when the operation is complete.
 On win32 systems, if you want to init the winsock stuff manually, libcurl will
 not do that for you. WSAStartup() and WSACleanup() should then be called
 accordingly.  If you want libcurl to handle this, use the CURL_GLOBAL_WIN32
 flag in the initial curl_global_init() call.
 Using libcurl 7.7 and later, you should perform all your sequential file
 transfers using the same curl handle. This enables libcurl to use persistant
 connections where possible.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_easy_cleanup "(3), " curl_global_init "(3)
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_perform.3
+++ b/docs/curl_easy_perform.3
@@ -0,0 +1,46 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_easy_perform 3 "5 Mar 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_easy_perform - Perform a file transfer
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode curl_easy_perform(CURL *" handle ");
 .ad
 .SH DESCRIPTION
 This function is called after the init and all the curl_easy_setopt() calls
 are made, and will perform the transfer as described in the options.
 It must be called with the same
 .I handle
 as input as the curl_easy_init call returned.
 libcurl version 7.7 or later (for older versions see below): You can do any
 amount of calls to curl_easy_perform() while using the same handle. If you
 intend to transfer more than one file, you are even encouraged to do
 so. libcurl will then attempt to re-use the same connection for the following
 transfers, thus making the operations faster, less CPU intense and using less
 network resources. Just note that you will have to use
 .I curl_easy_setopt
 between the invokes to set options for the following curl_easy_perform.
 You must never call this function simultaneously from two places using the
 same handle. Let the function return first before invoking it another time. If
 you want parallel transfers, you must use several curl handles.
 Before libcurl version 7.7: You are only allowed to call this function once
 using the same handle. If you want to do repeated calls, you must call
 curl_easy_cleanup and curl_easy_init again first.
 .SH RETURN VALUE
 0 means everything was ok, non-zero means an error occurred as
 .I <curl/curl.h>
 defines. If the CURLOPT_ERRORBUFFER was set with
 .I curl_easy_setopt
 there will be a readable error message in the error buffer when non-zero is
 returned.
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), " curl_easy_setopt "(3), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_setopt.3
+++ b/docs/curl_easy_setopt.3
@@ -0,0 +1,622 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .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
 #include <curl/curl.h>
 CURLcode curl_easy_setopt(CURL *handle, CURLoption option, parameter);
 .ad
 .SH DESCRIPTION
 curl_easy_setopt() is used to tell libcurl how to behave. Most operations in
 libcurl have default actions, and by using the appropriate options to
 \fIcurl_easy_setopt\fP, you can change them.  All options are set with the
 \fIoption\fP followed by a \fIparameter\fP. That parameter can be a long, a
 function pointer or an object pointer, all depending on what the specific
 option expects. Read this manual carefully as bad input values may cause
 libcurl to behave badly!  You can only set one option in each function call. A
 typical application uses many curl_easy_setopt() calls in the setup phase.
 \fBNOTE:\fP strings passed to libcurl as 'char *' arguments, will not be
 copied by the library. Instead you should keep them available until libcurl no
 longer needs them. Failing to do so will cause very odd behavior or even
 crashes.
 \fBNOTE2:\fP options set with this function call are valid for the forthcoming
 data transfers that are performed when you invoke \fIcurl_easy_perform\fP.
 The options are not in any way reset between transfers, so if you want
 subsequent transfers with different options, you must change them between the
 transfers.
 The \fIhandle\fP is the return code from a \fIcurl_easy_init(3)\fP or
 \fIcurl_easy_duphandle(3)\fP call.
 .SH OPTIONS
 The options are listed in a sort of random order, but you'll figure it out!
 .TP 0.8i
 .B CURLOPT_FILE
 Data pointer to pass to the file write function. Note that if you specify the
 \fICURLOPT_WRITEFUNCTION\fP, this is the pointer you'll get as input. If you
 don't use a callback, you must pass a 'FILE *' as libcurl will pass this to
 fwrite() when writing data.
 \fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use the
 \fICURLOPT_WRITEFUNCTION\fP if you set this option or you will experience
 crashes.
 .TP
 .B CURLOPT_WRITEFUNCTION
 Function pointer that should match the following prototype: \fBsize_t
 function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
 function gets called by libcurl as soon as there is data available to pass
 available that needs to be saved. The size of the data pointed to by \fIptr\fP
 is \fIsize\fP multiplied with \fInmemb\fP.  Return the number of bytes
 actually taken care of. If that amount differs from the amount passed to your
 function, it'll signal an error to the library and it will abort the transfer
 and return \fICURLE_WRITE_ERROR\fP.
 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 to the file read function. Note that if you specify the
 \fICURLOPT_READFUNCTION\fP, this is the pointer you'll get as input. If you
 don't specify a read callback, this must be a valid FILE *.
 \fBNOTE:\fP If you're using libcurl as a win32 DLL, you MUST use a
 \fICURLOPT_READFUNCTION\fP if you set this option.
 .TP
 .B CURLOPT_READFUNCTION
 Function pointer that should match the following prototype: \fBsize_t
 function( void *ptr, size_t size, size_t nmemb, void *stream);\fP This
 function gets called by libcurl as soon as it needs to read data in order to
 send it to the peer. The data area pointed at by the pointer \fIptr\fP may be
 filled with at most \fIsize\fP multiplied with \fInmemb\fP number of
 bytes. Your function must return the actual number of bytes that you stored in
 that memory area. Returning 0 will signal end-of-file to the library and cause
 it to stop the current transfer.
 .TP
 .B CURLOPT_INFILESIZE
 When uploading a file to a remote site, this option should be used to tell
 libcurl what the expected size of the infile is.
 .TP
 .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.
 \fBNOTE:\fP this option is (the only one) required to be set before
 \fIcurl_easy_perform(3)\fP is called.
 .TP
 .B CURLOPT_PROXY
 Set HTTP proxy to use. The parameter should be a char * to a zero terminated
 string holding the host name or dotted IP address. To specify port number in
 this string, append :[port] to the end of the host name. The proxy string may
 be prefixed with [protocol]:// since any such prefix will be ignored. The
 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
 Pass a long with this option to set the proxy port to connect to unless it is
 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 operations
 through a given HTTP proxy. Note that there is a big difference between using
 a proxy and to tunnel through it. If you don't know what this means, you
 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. 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 body
 output. This is only relevant for protocols that actually have headers
 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.
 \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 separate header and body
 parts.
 .TP
 .B CURLOPT_FAILONERROR
 A non-zero parameter tells the library to fail silently if the HTTP code
 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
 A non-zero parameter tells the library to prepare for an upload. The
 CURLOPT_INFILE and CURLOPT_INFILESIZE are also interesting for uploads.
 .TP
 .B CURLOPT_POST
 A non-zero parameter tells the library to do a regular HTTP post. This is a
 normal application/x-www-form-urlencoded kind, which is the most commonly used
 one by HTML forms. See the CURLOPT_POSTFIELDS option for how to specify the
 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 listing that would include file
 sizes, dates etc.
 .TP
 .B CURLOPT_FTPAPPEND
 A non-zero parameter tells the library to append to the remote file instead of
 overwrite it. This is only useful when uploading to a ftp site.
 .TP
 .B CURLOPT_NETRC
 A non-zero parameter tells the library to scan your \fI~/.netrc\fP file to
 find user name and password for the remote site you are about to access. Only
 machine name, user name and password is taken into account (init macros and
 similar things aren't supported).
 \fBNote:\fP libcurl does not verify that the file has the correct properties
 set (as the standard Unix ftp client does). It should only be readable by
 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.
 \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 usable when transferring text data between
 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 to transfer data. The
 data should be set with CURLOPT_INFILE and CURLOPT_INFILESIZE.
 .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. \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
 \fI"X-Y,N-M"\fP. Using this kind of multiple intervals will cause the HTTP
 server to send the response document in pieces (using standard MIME separation
 techniques).
 .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. Normally, name lookups can take a
 considerable time and limiting operations to less than a few minutes risk
 aborting perfectly normal operations. This option will cause curl to use the
 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. 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. When this option is used
 you can post fully binary data, which otherwise is likely to fail. If this
 size is set to zero, the library will use strlen() to get the size. (Added in
 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
 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
 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
 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
 that the transfer should be below during CURLOPT_LOW_SPEED_TIME seconds for
 the library to consider it too slow and abort.
 .TP
 .B CURLOPT_LOW_SPEED_TIME
 Pass a long as parameter. It contains the time in seconds that the transfer
 should be below the CURLOPT_LOW_SPEED_LIMIT for the library to consider it too
 slow and abort.
 .TP
 .B CURLOPT_RESUME_FROM
 Pass a long as parameter. It contains the offset in number of bytes that you
 want the transfer to start from.
 .TP
 .B CURLOPT_COOKIE
 Pass a pointer to a zero terminated string as parameter. It will be used to
 set a cookie in the http request. The format of the string should be
 [NAME]=[CONTENTS]; Where NAME is the cookie name.
 .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 \fBstruct
 curl_slist\fP structs properly filled in. Use \fIcurl_slist_append(3)\fP to
 create the list and \fIcurl_slist_free_all(3)\fP to clean up an entire
 list. If you add a header that is otherwise generated and used by libcurl
 internally, your added one will be used instead. If you add a header with no
 contents as in 'Accept:' (no data on the right side of the colon), the
 internally used header will 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 \fIcurl_formadd(3)\fP as documented. The
 data in this list must remained intact until you close this curl handle again
 with \fIcurl_easy_cleanup(3)\fP.
 .TP
 .B CURLOPT_SSLCERT
 Pass a pointer to a zero terminated string as parameter. The string should be
 the file name of your certificate. The default format is "PEM" and can be
 changed with \fICURLOPT_SSLCERTTYPE\fP.
 .TP
 .B CURLOPT_SSLCERTTYPE
 Pass a pointer to a zero terminated string as parameter. The string should be
 the format of your certificate. Supported formats are "PEM" and "DER".
 .TP
 .B CURLOPT_SSLCERTPASSWD
 Pass a pointer to a zero terminated string as parameter. It will be used as
 the password required to use the CURLOPT_SSLCERT certificate. If the password
 is not supplied, you will be prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can
 be used to set your own prompt function.
 \fBNOTE:\fPThis option is replaced by \fICURLOPT_SSLKEYPASSWD\fP and only
 cept for backward compatibility. You never needed a pass phrase to load
 a certificate but you need one to load your private key.
 .TP
 .B CURLOPT_SSLKEY
 Pass a pointer to a zero terminated string as parameter. The string should be
 the file name of your private key. The default format is "PEM" and can be
 changed with \fICURLOPT_SSLKEYTYPE\fP.
 .TP
 .B CURLOPT_SSLKEYTYPE
 Pass a pointer to a zero terminated string as parameter. The string should be
 the format of your private key. Supported formats are "PEM", "DER" and "ENG".
 \fBNOTE:\fPThe format "ENG" enables you to load the private key from a crypto
 engine. in this case \fICURLOPT_SSLKEY\fP is used as an identifier passed to
 the engine. You have to set the crypto engine with \fICURLOPT_SSL_ENGINE\fP.
 .TP
 .B CURLOPT_SSLKEYASSWD
 Pass a pointer to a zero terminated string as parameter. It will be used as
 the password required to use the \fICURLOPT_SSLKEY\fP private key. If the password
 is not supplied, you will be prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can
 be used to set your own prompt function.
 .TP
 .B CURLOPT_SSL_ENGINE
 Pass a pointer to a zero terminated string as parameter. It will be used as
 the identifier for the crypto engine you want to use for your private key.
 \fBNOTE:\fPIf the crypto device cannot be loaded, \fICURLE_SSL_ENGINE_NOTFOUND\fP
 is returned.
 .TP
 .B CURLOPT_SSL_ENGINEDEFAULT
 Sets the actual crypto engine as the default for (asymetric) crypto operations.
 \fBNOTE:\fPIf the crypto device cannot be set, \fICURLE_SSL_ENGINE_SETFAILED\fP
 is returned.
 .TP
 .B CURLOPT_CRLF
 Convert Unix newlines to CRLF newlines on FTP uploads.
 .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 \fIcurl_slist_append(3)\fP 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
 NULL to this option.
 .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
 \fICURLOPT_QUOTE\fP. Disable this operation again by setting a NULL to this
 option.
 .TP
 .B CURLOPT_WRITEHEADER
 Pass a pointer to be used to write the header part of the received data to. If
 you don't use your own callback to take care of the writing, this must be a
 valid FILE *. See also the \fICURLOPT_HEADERFUNCTION\fP option below on how to set a
 custom get-all-headers callback.
 .TP
 .B CURLOPT_HEADERFUNCTION
 Function pointer that should match the following prototype: \fIsize_t
 function( void *ptr, size_t size, size_t nmemb, void *stream);\fP. This
 function gets called by libcurl as soon as there is received header data that
 needs to be written down. The headers are guaranteed to be written one-by-one
 and only complete lines are written. Parsing headers should be easy enough
 using this. The size of the data pointed to by \fIptr\fP is \fIsize\fP
 multiplied with \fInmemb\fP.  The pointer named \fIstream\fP will be the one
 you passed to libcurl with the \fICURLOPT_WRITEHEADER\fP 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 \fICURLE_WRITE_ERROR\fP 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 /
 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 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 a HTTP-only feature. (TBD)
 .TP
 .B CURLOPT_TIMEVALUE
 Pass a long as parameter. This should be the time in seconds since 1 jan 1970,
 and the time will be used as specified in CURLOPT_TIMECONDITION or if that
 isn't used, it will be TIMECOND_IFMODSINCE by default.
 .TP
 .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 or less obscure HTTP requests. Don't do this at will,
 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
 internally when reporting errors.
 .TP
 .B CURLOPT_INTERFACE
 Pass a char * as parameter. This set the interface name to use as outgoing
 network interface. The name can be an interface name, an IP address or a host
 name. (Added in libcurl 7.3)
 .TP
 .B CURLOPT_KRB4LEVEL
 Pass a char * as parameter. Set the krb4 security level, this also enables
 krb4 awareness.  This is a string, 'clear', 'safe', 'confidential' or
 \&'private'.  If the string is set but doesn't match one of these, 'private'
 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_PROGRESSFUNCTION
 Function pointer that should match the \fIcurl_progress_callback\fP prototype
 found in \fI<curl/curl.h>\fP. This function gets called by libcurl instead of
 its internal equivalent with a frequent interval during data transfer.
 Unknown/unused argument values will be set to zero (like if you only download
 data, the upload size will remain 0). Returning a non-zero value from this
 callback will cause libcurl to abort the transfer and return
 \fICURLE_ABORTED_BY_CALLBACK\fP.
 .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 \fICURLOPT_PROGRESSFUNCTION\fP.
 .TP
 .B CURLOPT_SSL_VERIFYPEER
 Pass a long that is set to a non-zero value to make curl verify the peer's
 certificate. The certificate to verify against must be specified with the
 CURLOPT_CAINFO option. (Added in 7.4.2)
 .TP
 .B CURLOPT_CAINFO
 Pass a char * to a zero terminated file naming holding the certificate to
 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 \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: \fBint my_getpass(void *client, char *prompt, char*
 buffer, int buflen );\fP.  If set to NULL, it equals to making the function
 always fail. If the function returns a non-zero value, it will abort the
 operation and an error (CURLE_BAD_PASSWORD_ENTERED) will be returned.
 \fIclient\fP is a generic pointer, see \fICURLOPT_PASSWDDATA\fP.  \fIprompt\fP
 is a zero-terminated string that is text that prefixes the input request.
 \fIbuffer\fP is a pointer to data where the entered password should be stored
 and \fIbuflen\fP 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 \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
 \fIcurl_easy_getinfo(3)\fP function with the \fICURLINFO_FILETIME\fP argument
 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
 (\fICURLE_TOO_MANY_REDIRECTS\fP). This option only makes sense if the
 \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.
 \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 \fICURLCLOSEPOLICY_LEAST_RECENTLY_USED\fP to make libcurl close
 the connection that was least recently used, that connection is also least
 likely to be capable of re-use. Use \fICURLCLOSEPOLICY_OLDEST\fP to make
 libcurl close the oldest connection, the one that was created first among the
 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 (fresh)
 connection by force. If the connection cache is full before this connection,
 one of the existing connections will be closed as according to the selected or
 default policy. This option should be used with caution and only if you
 understand what it does. Set this to 0 to have libcurl attempt re-using an
 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
 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 (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
 from to seed the random engine for SSL. The more random the specified file is,
 the more secure will the SSL connection become.
 .TP
 .B CURLOPT_EGDSOCKET
 Pass a char * to the zero terminated path name to the Entropy Gathering Daemon
 socket. It will be used to seed the random engine for SSL.
 .TP
 .B CURLOPT_CONNECTTIMEOUT
 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). See also the \fICURLOPT_TIMEOUT\fP 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
 CURLE_OK (zero) means that the option was set properly, non-zero means an
 error occurred as \fI<curl/curl.h>\fP defines.
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
 .SH BUGS
 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
@@ -0,0 +1,28 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_escape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_escape - URL encodes the given string
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "char *curl_escape( char *" url ", int "length " );"
 .ad
 .SH DESCRIPTION
 This function will convert the given input string to an URL encoded string and
 return that as a new allocated string. All input characters that are not a-z,
 A-Z or 0-9 will be converted to their "URL escaped" version. If a sequence of
 %NN (where NN is a two-digit hexadecimal number) is found in the string to
 encode, that 3-letter combination will be copied to the output unmodifed,
 assuming that it is an already encoded piece of data.
 If the 'length' argument is set to 0, curl_escape() will use strlen() on the
 input 'url' string to find out the size.
 You must free() the returned string when you're done with it.
 .SH RETURN VALUE
 A pointer to a zero terminated string or NULL if it failed.
 .SH "SEE ALSO"
 .I curl_unescape(), RFC 2396
--- 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
@@ -0,0 +1,27 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_formfree 3 "6 April 2001" "libcurl 7.7.1" "libcurl Manual"
 .SH NAME
 curl_formfree - free a previously build multipart/formdata HTTP POST chain
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "void curl_formfree(struct HttpPost *" form);
 .ad
 .SH DESCRIPTION
 curl_formfree() is used to clean up data previously built/appended with
 curl_formadd()/curl_formparse(). This must be called when the data has
 been used, which typically means after the curl_easy_perform() has
 been called.
 .SH RETURN VALUE
 None
 .SH "SEE ALSO"
 .BR curl_formparse "(3) [deprecated], "
 .BR curl_formadd "(3) "
 .SH BUGS
 libcurl 7.7.1 and earlier versions does not allow a NULL pointer to be used as
 argument.
--- a/docs/curl_formparse.3
+++ b/docs/curl_formparse.3
@@ -0,0 +1,18 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_formparse 3 "17 Dec 2001" "libcurl 7.9.2" "libcurl Manual"
 .SH NAME
 curl_formparse - add a section to a multipart/formdata HTTP POST:
 deprecated (use curl_formadd instead)
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode curl_formparse(char * " string, " struct HttpPost ** " firstitem,
 .BI "struct HttpPost ** " lastitem ");"
 .ad
 .SH DESCRIPTION
 This has been removed deliberately. The \fBcurl_formadd\fP has been introduced
 to replace this function. Do not use this. Convert to the new function
 now. curl_formparse() will be removed from a future version of libcurl.
--- a/docs/curl_getdate.3
+++ b/docs/curl_getdate.3
@@ -0,0 +1,80 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_getdate 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
 curl_getdate - Convert an date in a ASCII string to number of seconds since
 January 1, 1970
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "time_t curl_getdate(char *" datestring ", time_t *"now" );
 .ad
 .SH DESCRIPTION
 This function returns the number of seconds since January 1st 1970, for the
 date and time that the
 .I datestring
 parameter specifies. The 
 .I now
 parameter is there and should hold the current time to allow the datestring to
 specify relative dates/times. Read further in the date string parser section
 below.
 .SH PARSING DATES AND TIMES
 A "date" is a string, possibly empty, containing many items separated by
 whitespace.  The whitespace may be omitted when no ambiguity arises.  The
 empty string means the beginning of today (i.e., midnight).  Order of the
 items is immaterial.  A date string may contain many flavors of items:
 .TP 0.8i
 .B calendar date items
 This can be specified in a number of different ways. Including 1970-09-17, 70-9-17, 70-09-17, 9/17/72, 24 September 1972, 24 Sept 72, 24 Sep 72, Sep 24, 1972, 24-sep-72, 24sep72.
 The year can also be omitted, for example: 9/17 or "sep 17".
 .TP
 .B time of the day items
 This string specifies the time on a given day. Syntax supported includes:
 18:19:0, 18:19, 6:19pm, 18:19-0500 (for specifying the time zone as well).
 .TP
 .B time zone items
 Specifies international time zone. There are a few acronyms supported, but in
 general you should instead use the specific realtive time compared to
 UTC. Supported formats include: -1200, MST, +0100.
 .TP
 .B day of the week items
 Specifies a day of the week. If this is mentioned alone it means that day of
 the week in the future.
 Days of the week may be spelled out in full: `Sunday', `Monday', etc or they
 may be abbreviated to their first three letters, optionally followed by a
 period.  The special abbreviations `Tues' for `Tuesday', `Wednes' for
 `Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed.
 A number may precede a day of the week item to move forward supplementary
 weeks.  It is best used in expression like `third monday'.  In this context,
 `last DAY' or `next DAY' is also acceptable; they move one week before or
 after the day that DAY by itself would represent.
 .TP
 .B relative items
 A relative item adjusts a date (or the current date if none) forward or
 backward. Example syntax includes: "1 year", "1 year ago", "2 days", "4
 weeks".
 The string `tomorrow' is worth one day in the future (equivalent to `day'),
 the string `yesterday' is worth one day in the past (equivalent to `day ago').
 .TP
 .B pure numbers
 If the decimal number is of the form YYYYMMDD and no other calendar date item
 appears before it in the date string, then YYYY is read as the year, MM as the
 month number and DD as the day of the month, for the specified calendar date.
 .PP
 .SH RETURN VALUE
 This function returns zero when it fails to parse the date string. Otherwise
 it returns the number of seconds as described.
 .SH AUTHORS
 Originally written by Steven M. Bellovin <smb@research.att.com> while at the
 University of North Carolina at Chapel Hill.  Later tweaked by a couple of
 people on Usenet.  Completely overhauled by Rich $alz <rsalz@bbn.com> and Jim
 Berets <jberets@bbn.com> in August, 1990.
 .SH "SEE ALSO"
 .BR 
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_getenv.3
+++ b/docs/curl_getenv.3
@@ -0,0 +1,32 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .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(const char *" name ");
 .ad
 .SH DESCRIPTION
 curl_getenv() is a portable wrapper for the getenv() function, meant to
 emulate its behaviour and provide an identical interface for all operating
 systems libcurl builds on (including win32).
 .SH RETURN VALUE
 If successful, curl_getenv() returns a pointer to the value of the specified
 environment. The memory it refers to is malloc()ed why the application must
 free() this when the data has completed to serve its purpose. When
 .I curl_getenv()
 fails to find the specified name, it returns a null pointer.
 .SH NOTE
 Under unix operating systems, there isn't any point in returning an allocated
 memory, although other systems won't work properly if this isn't done. The
 unix implementation thus have to suffer slightly from the drawbacks of other
 systems.
 .SH "SEE ALSO"
 .BR getenv "(3C), "
 .SH BUGS
 Surely there are some, you tell me!
--- 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
@@ -0,0 +1,88 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_printf 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
 .SH NAME
 curl_maprintf, curl_mfprintf, curl_mprintf, curl_msnprintf, curl_msprintf
 curl_mvaprintf, curl_mvfprintf, curl_mvprintf, curl_mvsnprintf,
 curl_mvsprintf - formatted output conversion
 .SH SYNOPSIS
 .B #include <curl/mprintf.h>
 .sp
 .BI "int curl_mprintf(const char *" format ", ...);"
 .br
 .BI "int curl_mfprintf(FILE *" fd ", const char *" format ", ...);"
 .br
 .BI "int curl_msprintf(char *" buffer ", const char *" format ", ...);"
 .br
 .BI "int curl_msnprintf(char *" buffer ", size_t " maxlength ", const char *" format ", ...);"
 .br
 .BI "int curl_mvprintf(const char *" format ", va_list " args ");"
 .br
 .BI "int curl_mvfprintf(FILE *" fd ", const char *" format ", va_list " args ");"
 .br
 .BI "int curl_mvsprintf(char *" buffer ", const char *" format ", va_list " args ");"
 .br
 .BI "int curl_mvsnprintf(char *" buffer ", size_t " maxlength ", const char *" format ", va_list " args ");"
 .br
 .BI "char *curl_maprintf(const char *" format ", ...);"
 .br
 .BI "char *curl_mvaprintf(const char *" format ", va_list " args ");"
 .SH DESCRIPTION
 These are all functions that produces output according to a format string and
 given arguments. These are mostly clones of the well-known C-style functions
 and there will be no detailed explanation of all available formatting rules
 and usage here.
 See this table for notable exceptions.
 .RS
 .TP
 .B curl_mprintf()
 Normal printf() clone.
 .TP
 .B curl_mfprintf()
 Normal fprinf() clone.
 .TP
 .B curl_msprintf()
 Normal sprintf() clone.
 .TP
 .B curl_msnprintf()
 snprintf() clone. Many systems don't have this. It is just like \fBsprintf\fP
 but with an extra argument after the buffer that specifies the length of the
 target buffer.
 .TP
 .B curl_mvprintf()
 Normal vprintf() clone.
 .TP
 .B curl_mvfprintf()
 Normal vfprintf() clone.
 .TP
 .B curl_mvsprintf()
 Normal vsprintf() clone.
 .TP
 .B curl_mvsnprintf()
 vsnprintf() clone.  Many systems don't have this. It is just like
 \fBvsprintf\fP but with an extra argument after the buffer that specifies the
 length of the target buffer.
 .TP
 .B curl_maprintf()
 Like printf() but returns the output string as a malloc()ed string. The
 returned string must be free()ed by the receiver.
 .TP
 .B curl_mvaprintf()
 Like curl_maprintf() but takes a va_list pointer argument instead of a
 variable amount of arguments.
 .RE
 To easily use all these cloned functions instead of the normal ones, #define
 _MPRINTF_REPLACE before you include the <curl/mprintf.h> file. Then all the
 normal names like printf, fprintf, sprintf etc will use the curl-functions
 instead.
 .SH RETURN VALUE
 The \fBcurl_maprintf\fP and \fBcurl_mvaprintf\fP functions return a pointer to
 a newly allocated string, or NULL it it failed.
 All other functions return the number of character they actually outputed.
 .SH "SEE ALSO"
 .BR printf "(3), " sprintf "(3), " fprintf "(3), " vprintf "(3) "
--- a/docs/curl_slist_append.3
+++ b/docs/curl_slist_append.3
@@ -0,0 +1,29 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_slist_append 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
 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_slist *" list,
 .BI "const char * "string ");"
 .ad
 .SH DESCRIPTION
 curl_slist_append() appends a specified string to a linked list of
 strings. The existing
 .I list
 should be passed as the first argument while the new list is returned from
 this function. The specified
 .I string
 has been appended when this function returns.
 .SH RETURN VALUE
 A null pointer is returned if anything went wrong, otherwise the new list
 pointer is returned.
 .SH "SEE ALSO"
 .BR curl_slist_free_all "(3), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_slist_free_all.3
+++ b/docs/curl_slist_free_all.3
@@ -0,0 +1,22 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_slist_free_all 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
 curl_slist_free_all - free an entire curl_slist list
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "void curl_slist_free_all(struct curl_slist *" list);
 .ad
 .SH DESCRIPTION
 curl_slist_free_all() removes all traces of a previously built curl_slist
 linked list.
 .SH RETURN VALUE
 Nothing.
 .SH "SEE ALSO"
 .BR curl_slist_append "(3), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_strequal.3
+++ b/docs/curl_strequal.3
@@ -0,0 +1,30 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_strequal 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
 .SH NAME
 curl_strequal, curl_strnequal - case insensitive string comparisons
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "int curl_strequal(char *" str1 ", char *" str2 ");"
 .sp
 .BI "int curl_strenqual(char *" str1 ", char *" str2 ", size_t " len ");"
 .SH DESCRIPTION
 The
 .B curl_strequal()
 function compares the two strings \fIstr1\fP and \fIstr2\fP, ignoring the case
 of the characters. It returns a non-zero (TRUE) integer if the strings are
 identical.
 .sp
 The \fBcurl_strnequal()\fP function is similar, except it only compares the
 first \fIlen\fP characters of \fIstr1\fP.
 .sp
 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
 Non-zero if the strings are identical. Zero if they're not.
 .SH "SEE ALSO"
 .BR strcmp "(3), " strcasecmp "(3)"
--- a/docs/curl_strnequal.3
+++ b/docs/curl_strnequal.3
@@ -0,0 +1 @@
 .so curl_strequal.3
--- a/docs/curl_unescape.3
+++ b/docs/curl_unescape.3
@@ -0,0 +1,27 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_unescape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_unescape - URL decodes the given string
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "char *curl_unescape( char *" url ", int "length " );"
 .ad
 .SH DESCRIPTION
 This function will convert the given URL encoded input string to a "plain
 string" and return that as a new allocated string. All input characters that
 are URL encoded (%XX where XX is a two-digit hexadecimal number, or +) will be
 converted to their plain text versions (up to a ? letter, no letters to the
 right of a ? letter will be converted).
 If the 'length' argument is set to 0, curl_unescape() will use strlen() on the
 input 'url' string to find out the size.
 You must free() the returned string when you're done with it.
 .SH RETURN VALUE
 A pointer to a zero terminated string or NULL if it failed.
 .SH "SEE ALSO"
 .I curl_escape(), RFC 2396
--- a/docs/curl_version.3
+++ b/docs/curl_version.3
@@ -0,0 +1,27 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH curl_version 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
 .SH NAME
 curl_version - returns the libcurl version string
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "char *curl_version( );"
 .ad
 .SH DESCRIPTION
 Returns a human readable string with the version number of libcurl and some of
 its important components (like OpenSSL version).
 Note: this returns the actual running lib's version, you might have installed
 a newer lib's include files in your system which may turn your LIBCURL_VERSION
 #define value to differ from this result.
 .SH RETURN VALUE
 A pointer to a zero terminated string.
 .SH "SEE ALSO"
 The
 .I LIBCURL_VERSION
 #define in <curl/curl.h>
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -0,0 +1,13 @@
 #
 # $Id$
 #
 AUTOMAKE_OPTIONS = foreign no-dependencies
 EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit.c postit2.c \
 	     win32sockets.c persistant.c ftpget.c Makefile.example \
 	     multithread.c getinmemory.c ftpupload.c httpput.c \
 	     simplessl.c ftpgetresp.c http-post.c
 all:
 	@echo "done"
--- a/docs/examples/Makefile.example
+++ b/docs/examples/Makefile.example
@@ -0,0 +1,42 @@
 #############################################################################
 #                                  _   _ ____  _     
 #  Project                     ___| | | |  _ \| |    
 #                             / __| | | | |_) | |    
 #                            | (__| |_| |  _ <| |___ 
 #                             \___|\___/|_| \_\_____|
 #
 # $Id$
 #
 # What to call the final executable
 TARGET = example
 # Which object files that the executable consists of
 OBJS= ftpget.o
 # What compiler to use
 CC = gcc
 # Compiler flags, -g for debug, -c to make an object file
 CFLAGS = -c -g
 # This should point to a directory that holds libcurl, if it isn't
 # in the system's standard lib dir
 # We also set a -L to include the directory where we have the openssl
 # libraries
 LDFLAGS = -L/home/dast/lib -L/usr/local/ssl/lib
 # We need -lcurl for the curl stuff
 # 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
 $(TARGET) : $(OBJS)
 	$(CC) $(LDFLAGS) $(LIBS) -o $(TARGET) $(OBJS)
 # Compile the source files into object files
 ftpget.o : ftpget.c
 	$(CC) $(CFLAGS) $<
--- a/docs/examples/README
+++ b/docs/examples/README
@@ -0,0 +1,22 @@
 EXAMPLES
 This directory is for tiny libcurl programming examples. They are meant to
 show some simple steps on how you can build your own application to take full
 advantage of libcurl.
 If you end up with other small but still useful example sources, please mail
 them for submission in future packages and on the web site.
 The Makefile.example is an example makefile that could be used to build these
 examples. Just edit the file according to your system and requirements first.
 Most examples should build fine using a command line like this:
  $ gcc `curl-config --cflags` `curl-config --libs` -o example example.c
 Try the php/examples/ directory for PHP programming snippets!
  *PLEASE* do not use the curl.haxx.se site as a test target for your libcurl
  applications/experiments. Even if the examples in this directory use that
  site as an example URL at some places, it doesn't mean that the URLs work or
  that we expect you to actually torture our web site with your tests! Thanks.
--- a/docs/examples/curlgtk.c
+++ b/docs/examples/curlgtk.c
@@ -0,0 +1,95 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 /* Copyright (c) 2000 David Odin (aka DindinX) for MandrakeSoft */
 /* an attempt to use the curl library in concert with a gtk-threaded application */
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include <curl/curl.h>
 #include <curl/types.h> /* new for v7 */
 #include <curl/easy.h> /* new for v7 */
 #include <pthread.h>
 GtkWidget *Bar;
 size_t my_read_func(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
  return fread(ptr, size, nmemb, stream);
 }
 int my_progress_func(GtkWidget *Bar, int t, int d)
 {
 /*  printf("%d / %d (%g %%)\n", d, t, d*100.0/t);*/
  gdk_threads_enter();
  gtk_progress_set_value(GTK_PROGRESS(Bar), d*100.0/t);
  gdk_threads_leave();
  return 0;
 }
 void *curl_thread(void *ptr)
 {
  CURL *curl;
  CURLcode res;
  FILE *outfile;
  gchar *url = ptr;
  curl = curl_easy_init();
  if(curl)
  {
    outfile = fopen("/tmp/test.curl", "w");
    curl_easy_setopt(curl, CURLOPT_URL, url);
    curl_easy_setopt(curl, CURLOPT_FILE, outfile);
    curl_easy_setopt(curl, CURLOPT_READFUNCTION, my_read_func);
    curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, my_progress_func);
    curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, Bar);
    res = curl_easy_perform(curl);
    fclose(outfile);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return NULL;
 }
 int main(int argc, char **argv)
 {
  GtkWidget *Window, *Frame, *Frame2;
  GtkAdjustment *adj;
  pthread_t curl_tid;
  /* Init thread */
  g_thread_init(NULL);
  gtk_init(&argc, &argv);
  Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
  Frame = gtk_frame_new(NULL);
  gtk_frame_set_shadow_type(GTK_FRAME(Frame), GTK_SHADOW_OUT);
  gtk_container_add(GTK_CONTAINER(Window), Frame);
  Frame2 = gtk_frame_new(NULL);
  gtk_frame_set_shadow_type(GTK_FRAME(Frame2), GTK_SHADOW_IN);
  gtk_container_add(GTK_CONTAINER(Frame), Frame2);
  gtk_container_set_border_width(GTK_CONTAINER(Frame2), 5);
  adj = (GtkAdjustment*)gtk_adjustment_new(0, 0, 100, 0, 0, 0);
  Bar = gtk_progress_bar_new_with_adjustment(adj);
  gtk_container_add(GTK_CONTAINER(Frame2), Bar);
  gtk_widget_show_all(Window);
  pthread_create(&curl_tid, NULL, curl_thread, argv[1]);
  gdk_threads_enter();
  gtk_main();
  gdk_threads_leave();
  return 0;
 }
--- a/docs/examples/ftpget.c
+++ b/docs/examples/ftpget.c
@@ -0,0 +1,83 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 /*
 * This is an example showing how to get a single file from an FTP server.
 * It delays the actual destination file creation until the first write
 * callback so that it won't create an empty file in case the remote file
 * doesn't exist or something else fails.
 */
 struct FtpFile {
  char *filename;
  FILE *stream;
 };
 int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  struct FtpFile *out=(struct FtpFile *)stream;
  if(out && !out->stream) {
    /* open file for writing */
    out->stream=fopen(out->filename, "wb");
    if(!out->stream)
      return -1; /* failure, can't open file to write */
  }
  return fwrite(buffer, size, nmemb, out->stream);
 }
 int main(void)
 {
  CURL *curl;
  CURLcode res;
  struct FtpFile ftpfile={
    "curl.tar.gz", /* name to store the file as if succesful */
    NULL
  };
  curl_global_init(CURL_GLOBAL_DEFAULT);
  curl = curl_easy_init();
  if(curl) {
    /* Get curl 7.9.2 from sunet.se's FTP site: */
    curl_easy_setopt(curl, CURLOPT_URL,
                     "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.9.2.tar.gz");
    /* Define our callback to get called when there's data to be written */
    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
    /* Set a pointer to our struct to pass to the callback */
    curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile);
    /* Switch on full protocol/debug output */
    curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
    if(CURLE_OK != res) {
      /* we failed */
      fprintf(stderr, "curl told us %d\n", res);
    }
  }
  if(ftpfile.stream)
    fclose(ftpfile.stream); /* close the local file */
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/ftpgetresp.c
+++ b/docs/examples/ftpgetresp.c
@@ -0,0 +1,61 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 /*
 * Similar to ftpget.c but this also stores the received response-lines
 * in a separate file using our own callback!
 *
 * This functionality was introduced in libcurl 7.9.3.
 */
 size_t
 write_response(void *ptr, size_t size, size_t nmemb, void *data)
 {
  FILE *writehere = (FILE *)data;
  return fwrite(ptr, size, nmemb, writehere);
 }
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  FILE *ftpfile;
  FILE *respfile;
  /* local file name to store the file as */
  ftpfile = fopen("ftp-list", "wb"); /* b is binary, needed on win32 */
  /* local file name to store the FTP server's response lines in */
  respfile = fopen("ftp-responses", "wb"); /* b is binary, needed on win32 */
  curl = curl_easy_init();
  if(curl) {
    /* Get a file listing from sunet */
    curl_easy_setopt(curl, CURLOPT_URL, "ftp://ftp.sunet.se/");
    curl_easy_setopt(curl, CURLOPT_FILE, ftpfile);
    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, write_response);
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, respfile);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  fclose(ftpfile); /* close the local file */
  fclose(respfile); /* close the response file */
  return 0;
 }
--- a/docs/examples/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/http-post.c
+++ b/docs/examples/http-post.c
@@ -0,0 +1,35 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 int main(void)
 {
  CURL *curl;
  CURLcode res;
  curl = curl_easy_init();
  if(curl) {
    /* First set the URL that is about to receive our POST. This URL can
       just as well be a https:// URL if that is what should receive the
       data. */
    curl_easy_setopt(curl, CURLOPT_URL, "http://postit.example.com/moo.cgi");
    /* Now specify the POST data */
    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "name=daniel&project=curl");
    /* Perform the request, res will get the return code */
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return 0;
 }
--- a/docs/examples/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/persistant.c
+++ b/docs/examples/persistant.c
@@ -0,0 +1,53 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <unistd.h>
 #include <curl/curl.h>
 /* to make this work under windows, use the win32-functions from the
   docs/examples/win32socket.c file as well */
 /* This example REQUIRES libcurl 7.7 or later */
 #if (LIBCURL_VERSION_NUM < 0x070700)
 #error Too old libcurl version, upgrade or stay away.
 #endif
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
 #ifdef MALLOCDEBUG
  /* this sends all memory debug messages to a specified logfile */
  curl_memdebug("memdump");
 #endif
  curl = curl_easy_init();
  if(curl) {
    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
    curl_easy_setopt(curl, CURLOPT_HEADER, 1);
    /* get the first document */
    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/");
    res = curl_easy_perform(curl);
    /* get another document from the same server using the same
       connection */
    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/docs/");
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return 0;
 }
--- a/docs/examples/postit.c
+++ b/docs/examples/postit.c
@@ -0,0 +1,71 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 *
 * Example code that uploads a file name 'foo' to a remote script that accepts
 * "HTML form based" (as described in RFC1738) uploads using HTTP POST.
 *
 * The imaginary form we'll fill in looks like:
 *
 * <form method="post" enctype="multipart/form-data" action="examplepost.cgi">
 * Enter file: <input type="file" name="sendfile" size="40">
 * Enter file name: <input type="text" name="filename" size="30">
 * <input type="submit" value="send" name="submit">
 * </form>
 *
 * This exact source code has not been verified to work.
 */
 /* to make this work under windows, use the win32-functions from the
   win32socket.c file as well */
 #include <stdio.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 int main(int argc, char **argv)
 {
  CURL *curl;
  CURLcode res;
  struct HttpPost *formpost=NULL;
  struct HttpPost *lastptr=NULL;
  /* Fill in the file upload field */
  curl_formparse("sendfile=@foo",
                 &formpost,
                 &lastptr);
  /* Fill in the filename field */
  curl_formparse("filename=foo",
                 &formpost,
                 &lastptr);
  /* Fill in the submit field too, even if this is rarely needed */
  curl_formparse("submit=send",
                 &formpost,
                 &lastptr);
  curl = curl_easy_init();
  if(curl) {
    /* what URL that receives this POST */
    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/examplepost.cgi");
    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
    /* then cleanup the formpost chain */
    curl_formfree(formpost);
  }
  return 0;
 }
--- a/docs/examples/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
@@ -0,0 +1,76 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 /* to make this work under windows, use the win32-functions from the
   win32socket.c file as well */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
 {
  written = fwrite(ptr, size, nmemb, (FILE *)stream);
  return written;
 }
 int main(int argc, char **argv)
 {
  CURL *curl_handle;
  char *headerfilename = "head.out";
  FILE *headerfile;
  char *bodyfilename = "body.out";
  FILE *bodyfile;
  /* init the curl session */
  curl_handle = curl_easy_init();
  /* set URL to get */
  curl_easy_setopt(curl_handle, CURLOPT_URL, "http://curl.haxx.se");
  /* no progress meter please */
  curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1);
  /* shut up completely */
  curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1);
  /* send all data to this function  */
  curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_data);
  /* open the files */
  headerfile = fopen(headerfilename,"w");
  if (headerfile == NULL) {
    curl_easy_cleanup(curl_handle);
    return -1;
  }
  bodyfile = fopen(bodyfilename,"w");
  if (bodyfile == NULL) {
    curl_easy_cleanup(curl_handle);
    return -1;
  }
  /* we want the headers to this file handle */
  curl_easy_setopt(curl_handle,   CURLOPT_WRITEHEADER ,headerfile);
  /* get it! */
  curl_easy_perform(curl_handle);
  /* close the header file */
  fclose(headerfile);
  /* cleanup curl stuff */
  curl_easy_cleanup(curl_handle);
  return 0;
 }
--- a/docs/examples/simple.c
+++ b/docs/examples/simple.c
@@ -0,0 +1,28 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * $Id$
 */
 #include <stdio.h>
 #include <curl/curl.h>
 int main(void)
 {
  CURL *curl;
  CURLcode res;
  curl = curl_easy_init();
  if(curl) {
    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return 0;
 }
--- a/docs/examples/simplessl.c
+++ b/docs/examples/simplessl.c
@@ -0,0 +1,115 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  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 *pCACertFile="cacert.pem"
  const char *pKeyName;
  const char *pKeyType;
  const char *pEngine;
 #if USE_ENGINE
  pKeyName  = "rsa_test";
  pKeyType  = "ENG";
  pEngine   = "chil";            /* for nChiper HSM... */
 #else
  pKeyName  = "testkey.pem";
  pKeyType  = "PEM";
  pEngine   = NULL;
 #endif
  const char *pPassphrase = NULL;
  headerfile = fopen("dumpit", "w");
  curl_global_init(CURL_GLOBAL_DEFAULT);
  curl = curl_easy_init();
  if(curl) {
    /* what call to write: */
    curl_easy_setopt(curl, CURLOPT_URL, "HTTPS://curl.haxx.se");
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, headerfile);
    while(1)                    /* do some ugly short cut... */
    {
       if (pEngine)             /* use crypto engine */
       {
          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE,pEngine) != CURLE_OK)
          {                     /* load the crypto engine */
             fprintf(stderr,"can't set crypto engine\n");
             break;
          }
          if (curl_easy_setopt(curl, CURLOPT_SSLENGINE_DEFAULT,1) != CURLE_OK)
          {                     /* set the crypto engine as default */
                                /* only needed for the first time you load
                                   a engine in a curl object... */
             fprintf(stderr,"can't set crypto engine as default\n");
             break;
          }
       }
                                /* cert is stored PEM coded in file... */
                                /* since PEM is default, we needn't set it for PEM */
       curl_easy_setopt(curl,CURLOPT_SSLCERTTYPE,"PEM");
                                /* set the cert for client authentication */
       curl_easy_setopt(curl,CURLOPT_SSLCERT,pCertFile);
                                /* sorry, for engine we must set the passphrase
                                   (if the key has one...) */
       if (pPassphrase)
          curl_easy_setopt(curl,CURLOPT_SSLKEYPASSWD,pPassphrase);
                                /* if we use a key stored in a crypto engine,
                                   we must set the key type to "ENG" */
       curl_easy_setopt(curl,CURLOPT_SSLKEYTYPE,pKeyType);
                                /* set the private key (file or ID in engine) */
       curl_easy_setopt(curl,CURLOPT_SSLKEY,pKeyName);
                                /* set the file with the certs vaildating the server */
       curl_easy_setopt(curl,CURLOPT_CAINFO,pCACertFile);
                                /* disconnect if we can't validate server's cert */
       curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,1);
       res = curl_easy_perform(curl);
       break;                   /* we are done... */
    }
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  curl_global_cleanup();
  return 0;
 }
--- a/docs/examples/win32sockets.c
+++ b/docs/examples/win32sockets.c
@@ -0,0 +1,49 @@
 /*
 * Note: This is only required if you use curl 7.8 or lower, later 
 * versions provide an option to curl_global_init() that does the
 * win32 initialization for you.
 */
 /*
 * These are example functions doing socket init that Windows
 * require. If you don't use windows, you can safely ignore this crap.
 */
 #include <windows.h>
 void win32_cleanup(void)
 {
  WSACleanup();
 }
 int win32_init(void)
 {
  WORD wVersionRequested;  
  WSADATA wsaData; 
  int err; 
  wVersionRequested = MAKEWORD(1, 1); 
  err = WSAStartup(wVersionRequested, &wsaData); 
  if (err != 0) 
    /* Tell the user that we couldn't find a useable */ 
    /* winsock.dll.     */ 
    return 1;
  /* Confirm that the Windows Sockets DLL supports 1.1.*/ 
  /* Note that if the DLL supports versions greater */ 
  /* than 1.1 in addition to 1.1, it will still return */ 
  /* 1.1 in wVersion since that is the version we */ 
  /* requested. */ 
  if ( LOBYTE( wsaData.wVersion ) != 1 || 
       HIBYTE( wsaData.wVersion ) != 1 ) { 
    /* Tell the user that we couldn't find a useable */ 
    /* winsock.dll. */ 
    WSACleanup(); 
    return 1; 
  }
  return 0; /* 0 is ok */
 }
--- a/docs/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-the-guide
+++ b/docs/libcurl-the-guide
@@ -0,0 +1,209 @@
 $Id$
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 PROGRAMMING WITH LIBCURL
 About this Document
 This document will attempt to describe the general principle and some basic
 approach to consider when programming with libcurl. The text will focus
 mainly on the C/C++ interface but might apply fairly well on other interfaces
 as well as they usually follow the C one pretty closely.
 This document will refer to 'the user' as the person writing the source code
 that uses libcurl. That would probably be you or someone in your position.
 What will be generally refered to as 'the program' will be the collected
 source code that you write that is using libcurl for transfers. The program
 is outside libcurl and libcurl is outside of the program.
 Building
  Compiling the Program
  Linking the Program with libcurl
  SSL or Not
 Global Preparation
 The program must initialize some of the libcurl functionality globally. That
 means it should be done exactly once, no matter how many times you intend to
 use the library. Once for your program's entire life time. This is done using
    curl_global_init()
 and it takes one parameter which is a bit pattern that tells libcurl what to
 intialize. Using CURL_GLOBAL_ALL will make it initialize all known internal
 sub modules, and might be a good default option. The current two bits that
 are specified are:
  CURL_GLOBAL_WIN32 which only does anything on Windows machines. When used on
  a Windows machine, it'll make libcurl intialize the win32 socket
  stuff. Without having that initialized properly, your program cannot use
  sockets properly. You should only do this once for each application, so if
  your program already does this or of another library in use does it, you
  should not tell libcurl to do this as well.
  CURL_GLOBAL_SSL which only does anything on libcurls compiled and built
  SSL-enabled. On these systems, this will make libcurl init OpenSSL properly
  for this application. This is only needed to do once for each application so
  if your program or another library already does this, this bit should not be
  needed.
 libcurl has a default protection mechanism that detects if curl_global_init()
 hasn't been called by the time curl_easy_perform() is called and if that is
 the case, libcurl runs the function itself with a guessed bit pattern. Please
 note that depending solely on this is not considered nice nor very good.
 When the program no longer uses libcurl, it should call
 curl_global_cleanup(), which is the opposite of the init call. It will then
 do the reversed operations to cleanup the resources the curl_global_init()
 call initialized.
 Repeated calls to curl_global_init() and curl_global_cleanup() should be
 avoided. They should be called once each.
 Handle the easy libcurl
 libcurl version 7 is oriented around the so called easy interface. All
 operations in the easy interface are prefixed with 'curl_easy'.
 Future libcurls will also offer the multi interface. More about that
 interface, what it is targeted for and how to use it is still only debated on
 the libcurl mailing list and developer web pages. Join up to discuss and
 figure out!
 To use the easy interface, you must first create yourself an easy handle. You
 need one handle for each easy session you want to perform. Basicly, you
 should use one handle for every thread you plan to use for transferring. You
 must never share the same handle in multiple threads.
 Get an easy handle with
    easyhandle = curl_easy_init();
 It returns an easy handle. Using that you proceed to the next step: setting
 up your preferred actions. A handle is just a logic entity for the upcoming
 transfer or series of transfers. One of the most basic properties to set in
 the handle is the URL. You set your preferred URL to transfer with
 CURLOPT_URL in a manner similar to:
    curl_easy_setopt(easyhandle, CURLOPT_URL, "http://curl.haxx.se/");
 Let's assume for a while that you want to receive data as the URL indentifies
 a remote resource you want to get here. Since you write a sort of application
 that needs this transfer, I assume that you would like to get the data passed
 to you directly instead of simply getting it passed to stdout. So, you write
 your own function that matches this prototype:
    size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
 You tell libcurl to pass all data to this function by issuing a function
 similar to this:
    curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, write_data);
 You can control what data your function get in the forth argument by setting
 another property:
    curl_easy_setopt(easyhandle, CURLOPT_FILE, &internal_struct);
 Using that property, you can easily pass local data between your application
 and the function that gets invoked by libcurl. libcurl itself won't touch the
 data you pass with CURLOPT_FILE.
 There are of course many more options you can set, and we'll get back to a
 few of them later. Let's instead continue to the actual transfer:
    success = curl_easy_perform(easyhandle);
 The curl_easy_perform() will connect to the remote site, do the necessary
 commands and receive the transfer. Whenever it receives data, it calls the
 callback function we previously set. The function may get one byte at a time,
 or it may get many kilobytes at once. libcurl delivers as much as possible as
 often as possible. Your callback function should return the number of bytes
 it "took care of". If that is not the exact same amount of bytes that was
 passed to it, libcurl will abort the operation and return with an error code.
 When the transfer is complete, the function returns a return code that
 informs you if it succeeded in its mission or not. If a return code isn't
 enough for you, you can use the CURLOPT_ERRORBUFFER to point libcurl to a
 buffer of yours where it'll store a human readable error message as well.
 If you then want to transfer another file, the handle is ready to be used
 again. Mind you, it is even preferred that you re-use an existing handle if
 you intend to make another transfer. libcurl will then attempt to re-use the
 previous
 When It Doesn't Work
 There will always be times when the transfer fails for some reason. You might
 have set the wrong libcurl option or misunderstood what the libcurl option
 actually does, or the remote server might return non-standard replies that
 confuse the library which then confuses your program.
 There's one golden rule when these things occur: set the CURLOPT_VERBOSE
 option to TRUE. It'll cause the library to spew out the entire protocol
 details it sends, some internal info and some received protcol data as well
 (especially when using FTP). If you're using HTTP, adding the headers in the
 received output to study is also a clever way to get a better understanding
 wht the server behaves the way it does. Include headers in the normal body
 output with CURLOPT_HEADER set TRUE.
 Upload Data to a Remote Site
 libcurl tries to keep a protocol independent approach to most transfers, thus
 uploading to a remote FTP site is very similar to uploading data to a HTTP
 server with a PUT request.
 Of course, first you either create an easy handle or you re-use one existing
 one. Then you set the URL to operate on just like before. This is the remote
 URL, that we now will upload.
 Since we write an application, we most likely want libcurl to get the upload
 data by asking us for it. To make it do that, we set the read callback and
 the custom pointer libcurl will pass to our read callback. The read callback
 should have a prototype similar to:
   size_t function(char *buffer, size_t size, size_t nitems, void *userp);
 Where buffer is the pointer to a buffer we fill in with data to upload and
 size*nitems is the size of the buffer. The 'userp' pointer is the custom
 pointer we set to point to a struct of ours to pass private data between the
 application and the callback.
    curl_easy_setopt(easyhandle, CURLOPT_READFUNCTION, read_function);
    curl_easy_setopt(easyhandle, CURLOPT_INFILE, &filedata);
 Tell libcurl that we want to upload:
    curl_easy_setopt(easyhandle, CURLOPT_UPLOAD, TRUE);
 A few protocols won't behave properly when uploads are done without any prior
 knowledge of the expected file size. HTTP PUT is one example [1]. So, set the
 upload file size using the CURLOPT_INFILESIZE like this:
    curl_easy_setopt(easyhandle, CURLOPT_INFILESIZE, file_size);
 So, then you call curl_easy_perform() this time, it'll perform all necessary
 operations and when it has invoked the upload it'll call your supplied
 callback to get the data to upload. The program should return as much data as
 possible in every invoke, as that is likely to make the upload perform as
 fast as possible. The callback should return the number of bytes it wrote in
 the buffer. Returning 0 will signal the end of the upload.
 -----
 Footnotes:
 [1] = HTTP PUT without knowing the size prior to transfer is indeed possible,
      but libcurl does not support the chunked transfers on uploading that is
      necessary for this feature to work. We'd gratefully appreciate patches
      that bring this functionality...
--- a/docs/libcurl.3
+++ b/docs/libcurl.3
@@ -0,0 +1,133 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" $Id$
 .\"
 .TH libcurl 5 "14 August 2001" "libcurl 7.8.1" "libcurl overview"
 .SH NAME
 libcurl \- client-side URL transfers
 .SH DESCRIPTION
 This is an overview on how to use libcurl in your c/c++ programs. There are
 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!
 All applications that use libcurl should call \fIcurl_global_init()\fP exactly
 once before any libcurl function can be used. After all usage of libcurl is
 complete, it \fBmust\fP call \fIcurl_global_cleanup()\fP. In between those two
 calls, you can use libcurl as described below.
 When using libcurl you init your session and get a handle, which you use as
 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.  \fIcurl_easy_setopt()\fP is there for this.
 When all is setup, you tell libcurl to perform the transfer using
 \fIcurl_easy_perform()\fP.  It will then do the entire operation and won't
 return until it is done (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
 \fIcurl_easy_cleanup()\fP.  If you want persistant connections, you don't
 cleanup immediately, but instead run ahead and perform other transfers using
 the same handle. See the chapter below for Persistant Connections.
 There is also a series of other helpful functions to use. They are:
 .RS
 .TP 10
 .B curl_version()
 displays the libcurl version
 .TP
 .B curl_getdate()
 converts a date string to time_t
 .TP
 .B curl_getenv()
 portable environment variable reader
 .TP
 .B curl_easy_getinfo()
 get information about a performed transfer
 .TP
 .B curl_formadd()
 helps building a HTTP form POST
 .TP
 .B curl_formparse()
 helps building a HTTP form POST (deprecated since 7.9 use curl_formadd()!)
 .TP
 .B curl_formfree()
 free a list built with curl_formparse()/curl_formadd()
 .TP
 .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"
 Starting 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.
 .SH "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!
 .SH "PORTABILITY"
 libcurl works
 .B exactly
 the same, on any of the platforms it compiles and builds on.
 There's only one caution, and that is the win32 platform that may(*) require
 you to init the winsock stuff before you use the libcurl functions. Details on
 this are noted on the curl_easy_init() man page.
 (*) = it appears as if users of the cygwin environment get this done
 automatically, also libcurl 7.8.1 and later can handle this for you.
 .SH "THREADS"
 Never ever call curl-functions simultaneously using the same handle from
 several threads. libcurl is thread-safe and can be used in any number of
 threads, but you must use separate curl handles if you want to use libcurl in
 more than one thread simultaneously.
 .SH "PERSISTANT CONNECTIONS"
 With libcurl 7.7, persistant connections were added. Persistant connections
 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
 .SH "COMPATIBILITY WITH OLDER LIBCURLS"
 Repeated curl_easy_perform() calls on the same handle were not supported in
 pre-7.7 versions, and caused confusion and undefined behaviour.
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -0,0 +1,5 @@
 SUBDIRS = curl
 EXTRA_DIST = README
 AUTOMAKE_OPTIONS = foreign no-dependencies
--- a/include/curl/Makefile.am
+++ b/include/curl/Makefile.am
@@ -0,0 +1,7 @@
 pkginclude_HEADERS = \
 	curl.h \
 	easy.h \
 	mprintf.h \
 	stdcheaders.h \
 	types.h
 pkgincludedir= $(includedir)/curl
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1,5 +1,5 @@
-#ifndef __CURL_H
+#ifndef __CURL_CURL_H
-#define __CURL_H
+#define __CURL_CURL_H
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
@@ -7,38 +7,41 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  The contents of this file are subject to the Mozilla Public License
+ * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
 *  Version 1.0 (the "License"); you may not use this file except in
 *  compliance with the License. You may obtain a copy of the License at
 *  http://www.mozilla.org/MPL/
 *
- *  Software distributed under the License is distributed on an "AS IS"
+ * In order to be useful for every potential user, curl and libcurl are
- *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *  License for the specific language governing rights and limitations
 *  under the License.
 *
- *  The Original Code is Curl.
+ * 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.
 *
- *  The Initial Developer of the Original Code is Daniel Stenberg.
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
- *  Portions created by the Initial Developer are Copyright (C) 1998.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
+
- * ------------------------------------------------------------
+#include <stdio.h>
- * Main author:
+/* The include stuff here is mainly for time_t! */
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+#ifdef vms
- *
+# include <types.h>
- * 	http://curl.haxx.nu
+# include <time.h>
- *
+#else
- * $Source$
+# include <sys/types.h>
- * $Revision$
+# if TIME_WITH_SYS_TIME
- * $Date$
+#  include <sys/time.h>
- * $Author$
+#  include <time.h>
- * $State$
+# else
- * $Locker$
+#  if HAVE_SYS_TIME_H
- *
+#   include <sys/time.h>
- * ------------------------------------------------------------
+#  else
- ****************************************************************************/
+#   include <time.h>
 #  endif
 # endif
 #endif /* defined (vms) */
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -46,240 +49,210 @@
 #define FALSE 0
 #endif
 #include <curl/types.h>
-#define CONF_DEFAULT 0
+#ifdef  __cplusplus
-#define CONF_PROXY   (1<<0) /* set if proxy is in use */
+extern "C" {
-#define CONF_PORT    (1<<1) /* set if different port than protcol-defines is
+#endif
                               used */
 #define CONF_HTTP    (1<<2) /* http get */
 #define CONF_GOPHER  (1<<3) /* gopher get */
 #define CONF_FTP     (1<<4) /* ftp get (binary mode) */
 #define CONF_VERBOSE (1<<5) /* talk a lot */
 #define CONF_TELNET  (1<<6)
 #define CONF_HEADER  (1<<8) /* throw the header out too */
 #define CONF_USERPWD (1<<9) /* user+passwd has been specified */
 #define CONF_NOPROGRESS (1<<10) /* shut off the progress meter (auto)
                                   see also _MUTE */
 #define CONF_NOBODY  (1<<11) /* use HEAD to get http document */
 #define CONF_FAILONERROR (1<<12) /* Makes urlget() fail with a return code
                                    WITHOUT writing anything to the output if
                                    a return code >=300 is returned from the
                                    server. */
 #define CONF_RANGE (1<<13) /* Byte-range request, specified parameter is set */
 #define CONF_UPLOAD (1<<14) /* this is an upload, only supported for ftp
                               currently */
 #define CONF_POST (1<<15) /* HTTP POST method */
 /* When getting an FTP directory, this switch makes the listing only show file
   names and nothing else. Makes machine parsing of the output possible. This
   enforces the NLST command to the ftp server, compared to the otherwise
   used: LIST. */
 #define CONF_FTPLISTONLY (1<<16)
 /* Set the referer string */
 #define CONF_REFERER (1<<17)
 #define CONF_PROXYUSERPWD (1<<18) /* Proxy user+passwd has been specified */
 /* For FTP, use PORT instead of PASV! */
 #define CONF_FTPPORT (1<<19)
 /* FTP: Append instead of overwrite on upload! */
 #define CONF_FTPAPPEND (1<<20)
 #define CONF_HTTPS (1<<21)  /* Use SSLeay for encrypted communication */
 #define CONF_NETRC (1<<22)  /* read user+password from .netrc */
 #define CONF_FOLLOWLOCATION (1<<23) /* get the page that the Location: tells
 				       us to get */
 #define CONF_FTPASCII (1<<24) /* use TYPE A for transfer */
 #define CONF_HTTPPOST (1<<25) /* this causes a multipart/form-data
 				 HTTP POST */
 #define CONF_NOPROT   (1<<26) /* host name specified without protocol */
 #define CONF_PUT      (1<<27) /* PUT the input file */
 #define CONF_MUTE     (1<<28) /* force NOPROGRESS */
 #define CONF_DICT     (1<<29) /* DICT:// protocol */
 #define CONF_FILE     (1<<30) /* FILE:// protocol */
 #define CONF_LDAP     (1<<31) /* LDAP:// protocol */
 struct HttpHeader {
  struct HttpHeader *next; /* next entry in the list */
  char *header; /* pointer to allocated line without newline */
 };
 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 */
 };
-/* All possible error codes from this version of urlget(). Future versions
+typedef int (*curl_progress_callback)(void *clientp,
-   may return other values, stay prepared. */
+                                      size_t dltotal,
                                      size_t dlnow,
                                      size_t ultotal,
                                      size_t ulnow);
 typedef size_t (*curl_write_callback)(char *buffer,
                                      size_t size,
                                      size_t nitems,
                                      void *outstream);
 typedef size_t (*curl_read_callback)(char *buffer,
                                     size_t size,
                                     size_t nitems,
                                     void *instream);
 typedef int (*curl_passwd_callback)(void *clientp,
                                    const char *prompt,
                                    char *buffer,
                                    int buflen);
 /* All possible error codes from all sorts of curl functions. Future versions
   may return other values, stay prepared.
   Always add new return codes last. Never *EVER* remove any. The return
   codes must remain the same!
 */
 typedef enum {
-  URG_OK = 0,
+  CURLE_OK = 0,
-  URG_UNSUPPORTED_PROTOCOL,
+  CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
-  URG_FAILED_INIT,
+  CURLE_FAILED_INIT,             /* 2 */
-  URG_URL_MALFORMAT,
+  CURLE_URL_MALFORMAT,           /* 3 */
-  URG_URL_MALFORMAT_USER,
+  CURLE_URL_MALFORMAT_USER,      /* 4 */
-  URG_COULDNT_RESOLVE_PROXY,
+  CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
-  URG_COULDNT_RESOLVE_HOST,
+  CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
-  URG_COULDNT_CONNECT,
+  CURLE_COULDNT_CONNECT,         /* 7 */
-  URG_FTP_WEIRD_SERVER_REPLY,
+  CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */
-  URG_FTP_ACCESS_DENIED,
+  CURLE_FTP_ACCESS_DENIED,       /* 9 */
-  URG_FTP_USER_PASSWORD_INCORRECT,
+  CURLE_FTP_USER_PASSWORD_INCORRECT, /* 10 */
-  URG_FTP_WEIRD_PASS_REPLY,
+  CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */
-  URG_FTP_WEIRD_USER_REPLY,
+  CURLE_FTP_WEIRD_USER_REPLY,    /* 12 */
-  URG_FTP_WEIRD_PASV_REPLY,
+  CURLE_FTP_WEIRD_PASV_REPLY,    /* 13 */
-  URG_FTP_WEIRD_227_FORMAT,
+  CURLE_FTP_WEIRD_227_FORMAT,    /* 14 */
-  URG_FTP_CANT_GET_HOST,
+  CURLE_FTP_CANT_GET_HOST,       /* 15 */
-  URG_FTP_CANT_RECONNECT,
+  CURLE_FTP_CANT_RECONNECT,      /* 16 */
-  URG_FTP_COULDNT_SET_BINARY,
+  CURLE_FTP_COULDNT_SET_BINARY,  /* 17 */
-  URG_PARTIAL_FILE,
+  CURLE_PARTIAL_FILE,            /* 18 */
-  URG_FTP_COULDNT_RETR_FILE,
+  CURLE_FTP_COULDNT_RETR_FILE,   /* 19 */
-  URG_FTP_WRITE_ERROR,
+  CURLE_FTP_WRITE_ERROR,         /* 20 */
-  URG_FTP_QUOTE_ERROR,
+  CURLE_FTP_QUOTE_ERROR,         /* 21 */
-  URG_HTTP_NOT_FOUND,
+  CURLE_HTTP_NOT_FOUND,          /* 22 */
-  URG_WRITE_ERROR,
+  CURLE_WRITE_ERROR,             /* 23 */
  CURLE_MALFORMAT_USER,          /* 24 - user name is illegally specified */
  CURLE_FTP_COULDNT_STOR_FILE,   /* 25 - failed FTP upload */
  CURLE_READ_ERROR,              /* 26 - could open/read from file */
  CURLE_OUT_OF_MEMORY,           /* 27 */
  CURLE_OPERATION_TIMEOUTED,     /* 28 - the timeout time was reached */
  CURLE_FTP_COULDNT_SET_ASCII,   /* 29 - TYPE A failed */
  CURLE_FTP_PORT_FAILED,         /* 30 - FTP PORT operation failed */
  CURLE_FTP_COULDNT_USE_REST,    /* 31 - the REST command failed */
  CURLE_FTP_COULDNT_GET_SIZE,    /* 32 - the SIZE command failed */
  CURLE_HTTP_RANGE_ERROR,        /* 33 - RANGE "command" didn't work */
  CURLE_HTTP_POST_ERROR,         /* 34 */
  CURLE_SSL_CONNECT_ERROR,       /* 35 - wrong when connecting with SSL */
  CURLE_FTP_BAD_DOWNLOAD_RESUME, /* 36 - couldn't resume download */
  CURLE_FILE_COULDNT_READ_FILE,  /* 37 */
  CURLE_LDAP_CANNOT_BIND,        /* 38 */
  CURLE_LDAP_SEARCH_FAILED,      /* 39 */
  CURLE_LIBRARY_NOT_FOUND,       /* 40 */
  CURLE_FUNCTION_NOT_FOUND,      /* 41 */
  CURLE_ABORTED_BY_CALLBACK,     /* 42 */
  CURLE_BAD_FUNCTION_ARGUMENT,   /* 43 */
  CURLE_BAD_CALLING_ORDER,       /* 44 */
  CURLE_HTTP_PORT_FAILED,        /* 45 - HTTP Interface operation failed */
  CURLE_BAD_PASSWORD_ENTERED,    /* 46 - my_getpass() returns fail */
  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_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 */
-  URG_MALFORMAT_USER, /* the user name is illegally specified */
+  CURL_LAST /* never use! */
-  URG_FTP_COULDNT_STOR_FILE, /* failed FTP upload */
+} CURLcode;
  URG_READ_ERROR, /* could open/read from file */
-  URG_OUT_OF_MEMORY,
+/* this was the error code 50 in 7.7.3 and a few earlier versions, this
-  URG_OPERATION_TIMEOUTED, /* the timeout time was reached */
+   is no longer used by libcurl but is instead #defined here only to not
-  URG_FTP_COULDNT_SET_ASCII, /* TYPE A failed */
+   make programs break */
-
+#define CURLE_ALREADY_COMPLETE 99999
  URG_FTP_PORT_FAILED, /* FTP PORT operation failed */
  URG_FTP_COULDNT_USE_REST, /* the REST command failed */
  URG_FTP_COULDNT_GET_SIZE, /* the SIZE command failed */
  URG_HTTP_RANGE_ERROR, /* The RANGE "command" didn't seem to work */
  URG_HTTP_POST_ERROR,
  URG_SSL_CONNECT_ERROR, /* something was wrong when connecting with SSL */
  URG_FTP_BAD_DOWNLOAD_RESUME, /* couldn't resume download */
  URG_FILE_COULDNT_READ_FILE,
  URG_LDAP_CANNOT_BIND,
  URG_LDAP_SEARCH_FAILED,
  URG_LIBRARY_NOT_FOUND,
  URG_FUNCTION_NOT_FOUND,
  URL_LAST
 } UrgError;
 /* This is just to make older programs not break: */
-#define URG_FTP_PARTIAL_FILE URG_PARTIAL_FILE
+#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
-#define URGTAG_DONE -1
+#define CURL_ERROR_SIZE 256
 #define URGTAG_LAST -1
 #define URGTAG_END -1
-#define URLGET_ERROR_SIZE 256
+/* name is uppercase CURLOPT_<name>,
-
+   type is one of the defined CURLOPTTYPE_<type>
 /* maximum URL length we deal with */
 #define URL_MAX_LENGTH 4096 
 #define URL_MAX_LENGTH_TXT "4095"
 /* name is uppercase URGTAG_<name>,
   type is one of the defined URGTYPE_<type>
   number is unique identifier */
-#define T(name,type,number) URGTAG_ ## name = URGTYPE_ ## type + number
+#ifdef CINIT
 #undef CINIT
 #endif
 #define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
 /* long may be 32 or 64 bits, but we should never depend on anything else
   but 32 */
-#define URGTYPE_LONG          0
+#define CURLOPTTYPE_LONG          0
-#define URGTYPE_OBJECTPOINT   10000
+#define CURLOPTTYPE_OBJECTPOINT   10000
-#define URGTYPE_FUNCTIONPOINT 20000
+#define CURLOPTTYPE_FUNCTIONPOINT 20000
 typedef enum {
-  URGTAG_NOTHING, /* the first unused */
+  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. */
-  T(FILE, OBJECTPOINT, 1),
+  CINIT(FILE, OBJECTPOINT, 1),
  /* The full URL to get/put */
-  T(URL,  OBJECTPOINT, 2),
+  CINIT(URL,  OBJECTPOINT, 2),
  /* Port number to connect to, if other than default. Specify the CONF_PORT
-     flag in the URGTAG_FLAGS to activate this */
+     flag in the CURLOPT_FLAGS to activate this */
-  T(PORT, LONG, 3),
+  CINIT(PORT, LONG, 3),
-  /* Name of proxy to use. Specify the CONF_PROXY flag in the URGTAG_FLAGS to
+  /* Name of proxy to use. Specify the CONF_PROXY flag in the CURLOPT_FLAGS to
     activate this */
-  T(PROXY, OBJECTPOINT, 4),
+  CINIT(PROXY, OBJECTPOINT, 4),
  /* Name and password to use when fetching. Specify the CONF_USERPWD flag in
-     the URGTAG_FLAGS to activate this */
+     the CURLOPT_FLAGS to activate this */
-  T(USERPWD, OBJECTPOINT, 5),
+  CINIT(USERPWD, OBJECTPOINT, 5),
  /* Name and password to use with Proxy. Specify the CONF_PROXYUSERPWD 
-     flag in the URGTAG_FLAGS to activate this */
+     flag in the CURLOPT_FLAGS to activate this */
-  T(PROXYUSERPWD, OBJECTPOINT, 6),
+  CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
  /* Range to get, specified as an ASCII string. Specify the CONF_RANGE flag
-     in the URGTAG_FLAGS to activate this */
+     in the CURLOPT_FLAGS to activate this */
-  T(RANGE, OBJECTPOINT, 7),
+  CINIT(RANGE, OBJECTPOINT, 7),
-  /* Configuration flags */
+  /* not used */
  T(FLAGS, LONG, 8),
  /* Specified file stream to upload from (use as input): */
-  T(INFILE, OBJECTPOINT, 9),
+  CINIT(INFILE, OBJECTPOINT, 9),
-  /* Buffer to receive error messages in, must be at least URLGET_ERROR_SIZE
+  /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
-     bytes big. If this is not used, error messages go to stderr instead: */
+   * bytes big. If this is not used, error messages go to stderr instead: */
-  T(ERRORBUFFER, OBJECTPOINT, 10),
+  CINIT(ERRORBUFFER, OBJECTPOINT, 10),
  /* Function that will be called to store the output (instead of fwrite). The
-     parameters will use fwrite() syntax, make sure to follow them. */
+   * parameters will use fwrite() syntax, make sure to follow them. */
-  T(WRITEFUNCTION, FUNCTIONPOINT, 11),
+  CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
  /* Function that will be called to read the input (instead of fread). The
-     parameters will use fread() syntax, make sure to follow them. */
+   * parameters will use fread() syntax, make sure to follow them. */
-  T(READFUNCTION, FUNCTIONPOINT, 12),
+  CINIT(READFUNCTION, FUNCTIONPOINT, 12),
  /* Time-out the read operation after this amount of seconds */
-  T(TIMEOUT, LONG, 13),
+  CINIT(TIMEOUT, LONG, 13),
-  /* If the URGTAG_INFILE is used, this can be used to inform urlget about how
+  /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
-     large the file being sent really is. That allows better error checking
+   * how large the file being sent really is. That allows better error
-     and better verifies that the upload was succcessful. -1 means unknown
+   * checking and better verifies that the upload was succcessful. -1 means
-     size. */
+   * unknown size. */
-  T(INFILESIZE, LONG, 14),
+  CINIT(INFILESIZE, LONG, 14),
  /* POST input fields. */
-  T(POSTFIELDS, OBJECTPOINT, 15),
+  CINIT(POSTFIELDS, OBJECTPOINT, 15),
  /* Set the referer page (needed by some CGIs) */
-  T(REFERER, OBJECTPOINT, 16),
+  CINIT(REFERER, OBJECTPOINT, 16),
  /* Set the FTP PORT string (interface name, named or numerical IP address)
     Use i.e '-' to use default address. */
-  T(FTPPORT, OBJECTPOINT, 17),
+  CINIT(FTPPORT, OBJECTPOINT, 17),
  /* Set the User-Agent string (examined by some CGIs) */
-  T(USERAGENT, OBJECTPOINT, 18),
+  CINIT(USERAGENT, OBJECTPOINT, 18),
  /* If the download receives less than "low speed limit" bytes/second
   * during "low speed time" seconds, the operations is aborted.
@@ -288,87 +261,262 @@ typedef enum {
   */
  /* Set the "low speed limit" */
-  T(LOW_SPEED_LIMIT, LONG , 19),
+  CINIT(LOW_SPEED_LIMIT, LONG , 19),
  /* Set the "low speed time" */
-  T(LOW_SPEED_TIME, LONG, 20),
+  CINIT(LOW_SPEED_TIME, LONG, 20),
  /* Set the continuation offset */
-  T(RESUME_FROM, LONG, 21),
+  CINIT(RESUME_FROM, LONG, 21),
  /* Set cookie in request: */
-  T(COOKIE, OBJECTPOINT, 22),
+  CINIT(COOKIE, OBJECTPOINT, 22),
  /* This points to a linked list of headers, struct HttpHeader kind */
-  T(HTTPHEADER, OBJECTPOINT, 23),
+  CINIT(HTTPHEADER, OBJECTPOINT, 23),
  /* This points to a linked list of post entries, struct HttpPost */
-  T(HTTPPOST, OBJECTPOINT, 24),
+  CINIT(HTTPPOST, OBJECTPOINT, 24),
  /* name of the file keeping your private SSL-certificate */
-  T(SSLCERT, OBJECTPOINT, 25),
+  CINIT(SSLCERT, OBJECTPOINT, 25),
-  /* password for the SSL-certificate */
+  /* password for the SSL-private key, keep this for compatibility */
-  T(SSLCERTPASSWD, OBJECTPOINT, 26),
+  CINIT(SSLCERTPASSWD, OBJECTPOINT, 26),
  /* password for the SSL private key */
  CINIT(SSLKEYPASSWD, OBJECTPOINT, 26),
  /* send TYPE parameter? */
-  T(CRLF, LONG, 27),
+  CINIT(CRLF, LONG, 27),
  /* send linked-list of QUOTE commands */
-  T(QUOTE, OBJECTPOINT, 28),
+  CINIT(QUOTE, OBJECTPOINT, 28),
-  /* send FILE * to store headers to */
+  /* send FILE * or void * to store headers to, if you use a callback it
-  T(WRITEHEADER, OBJECTPOINT, 29),
+     is simply passed to the callback unmodified */
-
+  CINIT(WRITEHEADER, OBJECTPOINT, 29),
 #ifdef MULTIDOC
  /* send linked list of MoreDoc structs */
  T(MOREDOCS, OBJECTPOINT, 30),
 #endif
  /* point to a file to read the initial cookies from, also enables
     "cookie awareness" */
-  T(COOKIEFILE, OBJECTPOINT, 31),
+  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. */
-  T(SSLVERSION, LONG, 32),
+  CINIT(SSLVERSION, LONG, 32),
  /* What kind of HTTP time condition to use, see defines */
-  T(TIMECONDITION, LONG, 33),
+  CINIT(TIMECONDITION, LONG, 33),
  /* Time to use with the above condition. Specified in number of seconds
     since 1 Jan 1970 */
-  T(TIMEVALUE, LONG, 34),
+  CINIT(TIMEVALUE, LONG, 34),
  /* HTTP request, for odd commands like DELETE, TRACE and others */
  /* OBSOLETE DEFINE, left for tradition only */
-  T(HTTPREQUEST, OBJECTPOINT, 35),
+  CINIT(HTTPREQUEST, OBJECTPOINT, 35),
  /* Custom request, for customizing the get command like
     HTTP: DELETE, TRACE and others
     FTP: to use a different list command
     */
-  T(CUSTOMREQUEST, OBJECTPOINT, 36),
+  CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
  /* HTTP request, for odd commands like DELETE, TRACE and others */
-  T(STDERR, OBJECTPOINT, 37),
+  CINIT(STDERR, OBJECTPOINT, 37),
-  /* Progress mode sets alternative progress mode displays, the only
+  /* 38 is not used */
     one defined today is 1 which makes the #-style progress bar. */
  T(PROGRESSMODE, LONG, 38),
  /* send linked-list of post-transfer QUOTE commands */
-  T(POSTQUOTE, OBJECTPOINT, 39),
+  CINIT(POSTQUOTE, OBJECTPOINT, 39),
  /* Pass a pointer to string of the output using full variable-replacement
     as described elsewhere. */
-  T(WRITEINFO, OBJECTPOINT, 40),
+  CINIT(WRITEINFO, OBJECTPOINT, 40),
-  URGTAG_LASTENTRY /* the last unusued */
+  /* Previous FLAG bits */
-} UrgTag;
+  CINIT(VERBOSE, LONG, 41),      /* talk a lot */
  CINIT(HEADER, LONG, 42),       /* throw the header out too */
  CINIT(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
  CINIT(NOBODY, LONG, 44),       /* use HEAD to get http document */
  CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */
  CINIT(UPLOAD, LONG, 46),       /* this is an upload */
  CINIT(POST, LONG, 47),         /* HTTP POST method */
  CINIT(FTPLISTONLY, LONG, 48),  /* Use NLST when listing ftp dir */
  CINIT(FTPAPPEND, LONG, 50),    /* Append instead of overwrite on upload! */
  CINIT(NETRC, LONG, 51),        /* read user+password from .netrc */
  CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
  /* This FTPASCII name is now obsolete, to be removed, use the TRANSFERTEXT
     instead. It goes for more protocols than just ftp... */
  CINIT(FTPASCII, LONG, 53),     /* use TYPE A for transfer */
  CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
  CINIT(PUT, LONG, 54),          /* PUT the input file */
  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
   * prototype defines. */
  CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
  /* Data passed to the progress callback */
  CINIT(PROGRESSDATA, OBJECTPOINT, 57),
  /* We want the referer field set automatically when following locations */
  CINIT(AUTOREFERER, LONG, 58),
  /* Port of the proxy, can be set in the proxy string as well with:
     "[host]:[port]" */
  CINIT(PROXYPORT, LONG, 59),
  /* size of the POST input data, if strlen() is not good to use */
  CINIT(POSTFIELDSIZE, LONG, 60),
  /* tunnel non-http operations through a HTTP proxy */
  CINIT(HTTPPROXYTUNNEL, LONG, 61),
  /* Set the interface string to use as outgoing network interface */
  CINIT(INTERFACE, OBJECTPOINT, 62),
  /* Set the krb4 security level, this also enables krb4 awareness.  This is a
   * string, 'clear', 'safe', 'confidential' or 'private'.  If the string is
   * set but doesn't match one of these, 'private' will be used.  */
  CINIT(KRB4LEVEL, OBJECTPOINT, 63),
  /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
  CINIT(SSL_VERIFYPEER, LONG, 64),
  /* The CApath or CAfile used to validate the peer certificate
     this option is used only if SSL_VERIFYPEER is true */
  CINIT(CAINFO, OBJECTPOINT, 65),
  /* Function pointer to replace the internal password prompt */
  CINIT(PASSWDFUNCTION, FUNCTIONPOINT, 66),
  /* Custom pointer that gets passed as first argument to the password
     function */
  CINIT(PASSWDDATA, OBJECTPOINT, 67),
  /* Maximum number of http redirects to follow */
  CINIT(MAXREDIRS, LONG, 68),
  /* Pass a pointer to a time_t to get a possible date of the requested
     document! Pass a NULL to shut it off. */
  CINIT(FILETIME, OBJECTPOINT, 69),
  /* This points to a linked list of telnet options */
  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
  /* Max amount of cached alive connections */
  CINIT(MAXCONNECTS, LONG, 71),
  /* What policy to use when closing connections when the cache is filled
     up */
  CINIT(CLOSEPOLICY, LONG, 72),
  /* Callback to use when CURLCLOSEPOLICY_CALLBACK is set */
  CINIT(CLOSEFUNCTION, FUNCTIONPOINT, 73),
  /* Set to explicitly use a new connection for the upcoming transfer.
     Do not use this unless you're absolutely sure of this, as it makes the
     operation slower and is less friendly for the network. */
  CINIT(FRESH_CONNECT, LONG, 74),
  /* Set to explicitly forbid the upcoming transfer's connection to be re-used
     when done. Do not use this unless you're absolutely sure of this, as it
     makes the operation slower and is less friendly for the network. */
  CINIT(FORBID_REUSE, LONG, 75),
  /* Set to a file name that contains random data for libcurl to use to
     seed the random engine when doing SSL connects. */
  CINIT(RANDOM_FILE, OBJECTPOINT, 76),
  /* Set to the Entropy Gathering Daemon socket pathname */
  CINIT(EGDSOCKET, OBJECTPOINT, 77),
  /* Time-out connect operations after this amount of seconds, if connects
     are OK within this time, then fine... This only aborts the connect
     phase. [Only works on unix-style/SIGALRM operating systems] */
  CINIT(CONNECTTIMEOUT, LONG, 78),
  /* Function that will be called to store headers (instead of fwrite). The
   * 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 */
 };
 #define CURL_PROGRESS_STATS 0 /* default progress display */
 #define CURL_PROGRESS_BAR   1
 typedef enum {
  TIMECOND_NONE,
@@ -378,55 +526,173 @@ typedef enum {
  TIMECOND_LASTMOD,
  TIMECOND_LAST
-} TimeCond;
+} curl_TimeCond;
 #ifdef __BEOS__
 #include <support/SupportDefs.h>
 #else
 #ifndef __cplusplus        /* (rabe) */
 typedef char bool;
 #endif                     /* (rabe) */
 #endif
 /**********************************************************************
 *
 * >>> urlget() interface #defines changed in v5! <<<
 *
 * You enter parameters as tags. Tags are specified as a pair of parameters.
 * The first parameter in a pair is the tag identifier, telling urlget what
 * kind of tag it is, and the second is the data. The tags may come in any
 * order but MUST ALWAYS BE TERMINATED with an ending URGTAG_DONE (which
 * needs no data).
 *
 * _Very_ simple example:
 *
 * curl_urlget(URGTAG_URL, "http://www.fts.frontec.se/~dast/", URGTAG_DONE);
 *
 ***********************************************************************/
-UrgError curl_urlget(UrgTag, ...);
+/* These functions are in the libcurl, they're here for portable reasons and
   they are used by the 'curl' client. They really should be moved to some kind
   of "portability library" since it has nothing to do with file transfers and
   might be usable to other programs...
   NOTE: they return TRUE if the strings match *case insensitively*.
 */
 extern int (curl_strequal)(const char *s1, const char *s2);
 extern int (curl_strnequal)(const char *s1, const char *s2, size_t n);
 #define strequal(a,b) curl_strequal(a,b)
 #define strnequal(a,b,c) curl_strnequal(a,b,c)
 /* external form function */
-int curl_FormParse(char *string,
+int curl_formparse(char *string,
                   struct HttpPost **httppost,
                   struct HttpPost **last_post);
-/* Unix and Win32 getenv function call */
+/* name is uppercase CURLFORM_<name> */
-char *curl_GetEnv(char *variable);
+#ifdef CFINIT
 #undef CFINIT
 #endif
 #define CFINIT(name) CURLFORM_ ## name
-/* returns ascii string of the libcurl version */
+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(const char *variable);
 /* Returns a static ascii string of the libcurl version. */
 char *curl_version(void);
-/* This is the version number */
+/* Escape and unescape URL encoding in strings. The functions return a new
-#define LIBCURL_VERSION "6.5.2"
+ * allocated string or NULL if an error occurred.  */
 char *curl_escape(const char *string, int length);
 char *curl_unescape(const char *string, int length);
-/* linked-list structure for QUOTE */
+/* 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.9.3-pre2"
 #define LIBCURL_VERSION_NUM 0x070903
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
 	char			*data;
 	struct curl_slist	*next;
 };
-struct curl_slist *curl_slist_append(struct curl_slist *list, char *data);
+struct curl_slist *curl_slist_append(struct curl_slist *, const char *);
-void curl_slist_free_all(struct curl_slist *list);
+void curl_slist_free_all(struct curl_slist *);
-#endif /* __URLGET_H */
+/*
 * NAME curl_getdate()
 *
 * DESCRIPTION
 *
 * Returns the time, in seconds since 1 Jan 1970 of the time string given in
 * the first argument. The time argument in the second parameter is for cases
 * where the specified time is relative now, like 'two weeks' or 'tomorrow'
 * etc.
 */
 time_t curl_getdate(const char *p, const time_t *now);
 #define CURLINFO_STRING   0x100000
 #define CURLINFO_LONG     0x200000
 #define CURLINFO_DOUBLE   0x300000
 #define CURLINFO_MASK     0x0fffff
 #define CURLINFO_TYPEMASK 0xf00000
 typedef enum {
  CURLINFO_NONE, /* first, never use this */
  CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
  CURLINFO_HTTP_CODE        = CURLINFO_LONG   + 2,
  CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
  CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
  CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
  CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6,
  CURLINFO_SIZE_UPLOAD      = CURLINFO_DOUBLE + 7,
  CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,
  CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,
  CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,
  CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,
  CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,
  CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG   + 13,
  CURLINFO_FILETIME         = CURLINFO_LONG   + 14,
  CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
  CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
  CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
  CURLINFO_LASTONE          = 18
 } CURLINFO;
 /* unfortunately, the easy.h include file needs the options and info stuff
   before it can be included! */
 #include <curl/easy.h> /* nothing in curl is fun without the easy stuff */
 typedef enum {
  CURLCLOSEPOLICY_NONE, /* first, never use this */
  CURLCLOSEPOLICY_OLDEST,
  CURLCLOSEPOLICY_LEAST_RECENTLY_USED,
  CURLCLOSEPOLICY_LEAST_TRAFFIC,
  CURLCLOSEPOLICY_SLOWEST,
  CURLCLOSEPOLICY_CALLBACK,
  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
 }
 #endif
 #endif /* __CURL_CURL_H */
--- a/include/curl/easy.h
+++ b/include/curl/easy.h
@@ -0,0 +1,68 @@
 #ifndef __CURL_EASY_H
 #define __CURL_EASY_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$
 *****************************************************************************/
 #ifdef  __cplusplus
 extern "C" {
 #endif
 CURL *curl_easy_init(void);
 CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
 CURLcode curl_easy_perform(CURL *curl);
 void curl_easy_cleanup(CURL *curl);
 /*
 * NAME curl_easy_getinfo()
 *
 * DESCRIPTION
 *
 * Request internal information from the curl session with this function.  The
 * third argument MUST be a pointer to a long, a pointer to a char * or a
 * pointer to a double (as the documentation describes elsewhere).  The data
 * pointed to will be filled in accordingly and can be relied upon only if the
 * function returns CURLE_OK.  This function is intended to get used *AFTER* a
 * performed transfer, all results from this function are undefined until the
 * transfer is completed.
 */
 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
 #endif
--- a/include/curl/getdate.h
+++ b/include/curl/getdate.h
--- a/include/curl/mprintf.h
+++ b/include/curl/mprintf.h
@@ -2,27 +2,14 @@
 *
 * $Id$
 *
- * The contents of this file are subject to the Mozilla Public License
+ * Permission to use, copy, modify, and distribute this software for any
- * Version 1.0 (the "License"); you may not use this file except in
+ * purpose with or without fee is hereby granted, provided that the above
- * compliance with the License. You may obtain a copy of the License at
+ * copyright notice and this permission notice appear in all copies.
 * http://www.mozilla.org/MPL/ 
 *
- * Software distributed under the License is distributed on an "AS IS"
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * the License for the specific language governing rights and limitations
+ * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * under the License. 
+ * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
 *
 * The Original Code is Triacle.
 *
 * The Initial Developers of the Original Code are Bjorn Reese and
 * Daniel Stenberg.
 *
 * Portions created by Initial Developers are
 *
 *   Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
 *   All Rights Reserved. 
 *
 * Contributor(s):
 *
 *************************************************************************
 *
@@ -67,27 +54,30 @@
 #define H_MPRINTF
 #include <stdarg.h>
 #include <stdio.h> /* needed for FILE */
-int mprintf(const char *format, ...);
+int curl_mprintf(const char *format, ...);
-int mfprintf(FILE *fd, const char *format, ...);
+int curl_mfprintf(FILE *fd, const char *format, ...);
-int msprintf(char *buffer, const char *format, ...);
+int curl_msprintf(char *buffer, const char *format, ...);
-int msnprintf(char *buffer, size_t maxlength, const char *format, ...);
+int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);
-int mvprintf(const char *format, va_list args);
+int curl_mvprintf(const char *format, va_list args);
-int mvfprintf(FILE *fd, const char *format, va_list args);
+int curl_mvfprintf(FILE *fd, const char *format, va_list args);
-int mvsprintf(char *buffer, const char *format, va_list args);
+int curl_mvsprintf(char *buffer, const char *format, va_list args);
-int mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
+int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
-char *maprintf(const char *format, ...);
+char *curl_maprintf(const char *format, ...);
-char *mvaprintf(const char *format, va_list args);
+char *curl_mvaprintf(const char *format, va_list args);
 #ifdef _MPRINTF_REPLACE
-# define printf mprintf
+# define printf curl_mprintf
-# define fprintf mfprintf
+# define fprintf curl_mfprintf
-# define sprintf msprintf
+# define sprintf curl_msprintf
-# define snprintf msnprintf
+# define snprintf curl_msnprintf
-# define vprintf mvprintf
+# define vprintf curl_mvprintf
-# define vfprintf mvfprintf
+# define vfprintf curl_mvfprintf
-# define vsprintf mvsprintf
+# define vsprintf curl_mvsprintf
-# define vsnprintf mvsnprintf
+# define vsnprintf curl_mvsnprintf
 # define aprintf curl_maprintf
 # define vaprintf curl_mvaprintf
 #endif
 #endif /* H_MPRINTF */
--- a/include/curl/stdcheaders.h
+++ b/include/curl/stdcheaders.h
@@ -7,38 +7,21 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  The contents of this file are subject to the Mozilla Public License
+ * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
 *  Version 1.0 (the "License"); you may not use this file except in
 *  compliance with the License. You may obtain a copy of the License at
 *  http://www.mozilla.org/MPL/
 *
- *  Software distributed under the License is distributed on an "AS IS"
+ * In order to be useful for every potential user, curl and libcurl are
- *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *  License for the specific language governing rights and limitations
 *  under the License.
 *
- *  The Original Code is Curl.
+ * 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.
 *
- *  The Initial Developer of the Original Code is Daniel Stenberg.
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
- *  Portions created by the Initial Developer are Copyright (C) 1998.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
--- a/Show More
+++ b/Show More