7.6.1-pre3

GetLine() didn't properly act on -1 lengths returned from Curl_read()
Added #define ssize_t int since ssize_t doesn't seem to exist in normal
2001-02-07 09:49:06 +00:00 · 2001-02-07 09:31:03 +00:00 · 2001-02-07 09:23:54 +00:00 · 2001-02-07 08:36:23 +00:00 · 2001-02-06 09:12:39 +00:00 · 2001-02-06 09:08:24 +00:00
411 changed files with 30267 additions and 11189 deletions
--- a/3128
+++ b/3128
--- a/CHANGES.0
+++ b/CHANGES.0
--- a/68
+++ b/68
@@ -1,68 +0,0 @@
 Date: 1999-08-04
 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/22
+++ b/22
@@ -0,0 +1,22 @@
 This file is only present in the CVS - never in release archives.
 This contains information about other files and things that the CVS repository
 keeps in its inner sanctum.
 CHANGES.0     contains ancient changes.
 memanalyze.pl is for analyzing the output generated by curl if -DMALLOCDEBUG
              is used when compiling
 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:
 automake
 aclocal
 autoheader
 autoconf
 ./configure
 make
--- a/31
+++ b/31
@@ -1,31 +0,0 @@
 Date: 19 November 1999
             Frequently Asked Questions about Curl
 1. 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.
 2. Does curl support resume?
  Yes. Both ways on FTP, download ways on HTTP.
 3. 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!
--- a/46
+++ b/46
@@ -1,46 +0,0 @@
 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/195
+++ b/195
@@ -1,195 +0,0 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
                                How To Compile
 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.
 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) 2000, 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,28 @@
 COPYRIGHT AND PERMISSION NOTICE
 Copyright (c) 2000, 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 and that both the above copyright notice(s) and
 this permission notice appear in supporting documentation.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 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,44 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = curl.1
+EXTRA_DIST = \
 	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \
 	config-win32.h reconf packages/README Makefile.dist
-EXTRA_DIST = $(man_MANS)
+SUBDIRS = docs lib src include tests packages
-SUBDIRS = lib src
+# create a root makefile in the distribution:
 dist-hook:
 	cp $(srcdir)/Makefile.dist $(distdir)/Makefile
 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 .
--- 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) 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) 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,6 +29,10 @@ 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 src; make -f Makefile.m32
@@ -58,8 +42,16 @@ mingw32-ssl:
 	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
 	cd ..\src
 	nmake -f Makefile.vc6
 vc-ssl:
 	cd lib
 	nmake -f Makefile.vc6 release-ssl
 	cd ..\src
 	nmake -f Makefile.vc6
 cygwin:
 	./configure
--- a/35
+++ b/35
@@ -8,21 +8,42 @@ 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 document 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    -- ftp://ftp.sunet.se/pub/www/utilities/curl/
-        Germany -- ftp://ftp.fu-berlin.de/pub/unix/network/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:
        cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl login
     (just press enter when asked for password)
        cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl co .
     (now, you'll get all the latest sources downloaded into your current
     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/90
+++ b/90
@@ -1,90 +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
 - I'm gonna introduce HTTP "pipelining". Curl should be able
   to request for several HTTP documents in one connect. It is 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:
--- a/acconfig.h
+++ b/acconfig.h
@@ -10,3 +10,36 @@
 /* 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
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -0,0 +1,75 @@
 #serial 12
 dnl By default, many hosts won't let programs access large files;
 dnl one must use special compiler options to get large-file access to work.
 dnl For more details about this brain damage please see:
 dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
 dnl Written by Paul Eggert <eggert@twinsun.com>.
 dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_TEST_INCLUDES
 AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
  [[#include <sys/types.h>
    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
  ]])
 dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
 AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
     [$3=no
      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
 $5
        ,
 	[$6], 
 	,
 	[AC_TRY_COMPILE([#define $1 $2]
 AC_SYS_LARGEFILE_TEST_INCLUDES
 $5
 	   ,
 	   [$6],
 	   [$3=$2])])])
   if test "[$]$3" != no; then
     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
   fi])
 AC_DEFUN(AC_SYS_LARGEFILE,
  [AC_ARG_ENABLE(largefile,
     [  --disable-largefile     omit support for large files])
   if test "$enable_largefile" != no; then
     AC_CACHE_CHECK([for special C compiler options needed for large files],
       ac_cv_sys_largefile_CC,
       [ac_cv_sys_largefile_CC=no
        if test "$GCC" != yes; then
 	  # IRIX 6.2 and later do not support large files by default,
 	  # so use the C compiler's -n32 option if that helps.
 	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
 	    [ac_save_CC="$CC"
 	     CC="$CC -n32"
 	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
 	       ac_cv_sys_largefile_CC=' -n32')
 	     CC="$ac_save_CC"])
        fi])
     if test "$ac_cv_sys_largefile_CC" != no; then
       CC="$CC$ac_cv_sys_largefile_CC"
     fi
     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
       ac_cv_sys_file_offset_bits,
       [Number of bits in a file offset, on hosts where this is settable.])
     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
       ac_cv_sys_largefile_source,
       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
       [#include <stdio.h>], [return !ftello;])
     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
       ac_cv_sys_large_files,
       [Define for large files, on AIX-style hosts.])
 dnl	lftp does not need ftello, and _XOPEN_SOURCE=500 makes resolv.h fail.
 dnl     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
 dnl       ac_cv_sys_xopen_source,
 dnl       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
 dnl       [#include <stdio.h>], [return !ftello;])
   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/config-win32.h
+++ b/config-win32.h
@@ -23,6 +23,9 @@
 /* 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 if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
@@ -71,6 +74,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,7 +93,7 @@
 /*#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*/
@@ -114,7 +120,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 +152,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
@@ -169,3 +169,16 @@
 /* Define if you have the setvbuf function.  */
 #define HAVE_SETVBUF 1
 /* Define if you have the RAND_screen function when using SSL  */
 #define HAVE_RAND_SCREEN 1
 /*************************************************
 * 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
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -22,8 +23,7 @@
 # the same distribution terms that you use for the rest of that program.
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to <config-patches@gnu.org>.
 # Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -36,6 +36,20 @@
 # (but try to keep the structure clean).
 #
 # Use $HOST_CC if defined. $CC may point to a cross-compiler
 if test x"$CC_FOR_BUILD" = x; then
  if test x"$HOST_CC" != x; then
    CC_FOR_BUILD="$HOST_CC"
  else
    if test x"$CC" != x; then
      CC_FOR_BUILD="$CC"
    else
      CC_FOR_BUILD=cc
    fi
  fi
 fi
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -53,6 +67,43 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:NetBSD:*:*)
 	# Netbsd (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
 	# Determine the machine/vendor (is the vendor relevant).
 	case "${UNAME_MACHINE}" in
 	    amiga) machine=m68k-cbm ;;
 	    arm32) machine=arm-unknown ;;
 	    atari*) machine=m68k-atari ;;
 	    sun3*) machine=m68k-sun ;;
 	    mac68k) machine=m68k-apple ;;
 	    macppc) machine=powerpc-apple ;;
 	    hp3[0-9][05]) machine=m68k-hp ;;
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format.
 	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep __ELF__ >/dev/null
 	then
 	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 	    # Return netbsd for either.  FIX?
 	    os=netbsd
 	else
 	    os=netbsdelf
 	fi
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
    alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -62,45 +113,61 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	cat <<EOF >$dummy.s
 	.data
 \$Lformat:
 	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
 	.text
 	.globl main
 	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
+	.frame \$30,16,\$26,0
-	.prologue 0
+	ldgp \$29,0(\$27)
-	.long 0x47e03d80 # implver $0
+	.prologue 1
-	lda \$2,259
+	.long 0x47e03d80 # implver \$0
-	.long 0x47e20c21 # amask $2,$1
+	lda \$2,-1
-	srl \$1,8,\$2
+	.long 0x47e20c21 # amask \$2,\$1
-	sll \$2,2,\$2
+	lda \$16,\$Lformat
-	sll \$0,3,\$0
+	mov \$0,\$17
-	addl \$1,\$0,\$0
+	not \$1,\$18
-	addl \$2,\$0,\$0
+	jsr \$26,printf
-	ret \$31,(\$26),1
+	ldgp \$29,0(\$26)
 	mov 0,\$16
 	jsr \$26,exit
 	.end main
 EOF
-	${CC-cc} $dummy.s -o $dummy 2>/dev/null
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./$dummy
+		case `./$dummy` in
-		case "$?" in
+			0-0)
 			7)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
    Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
 	exit 0 ;;
    21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -108,9 +175,6 @@ EOF
    Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-cbm-sysv4
 	exit 0;;
    amiga:NetBSD:*:*)
      echo m68k-cbm-netbsd${UNAME_RELEASE}
      exit 0 ;;
    amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -135,16 +199,16 @@ EOF
    wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
    arm32:NetBSD:*:*)
 	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
    SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -197,21 +261,38 @@ EOF
    aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
    atari*:NetBSD:*:*)
 	echo m68k-atari-netbsd${UNAME_RELEASE}
 	exit 0 ;;
    atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    sun3*:NetBSD:*:*)
+    # The situation for MiNT is a little confusing.  The machine name
-	echo m68k-sun-netbsd${UNAME_RELEASE}
+    # can be virtually everything (everything which is not
    # "atarist" or "atariste" at least should have a processor
    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
    # to the lowercase version "mint" (or "freemint").  Finally
    # the system name "TOS" denotes a system which is actually not
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
        exit 0 ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
        echo m68k-milan-mint${UNAME_RELEASE}
        exit 0 ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
        echo m68k-hades-mint${UNAME_RELEASE}
        exit 0 ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit 0 ;;
    sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
    mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -224,9 +305,6 @@ EOF
    powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
    macppc:NetBSD:*:*)
        echo powerpc-apple-netbsd${UNAME_RELEASE}
        exit 0 ;;
    RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -236,12 +314,13 @@ EOF
    VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -260,7 +339,7 @@ EOF
 	  exit (-1);
 	}
 EOF
-	${CC-cc} $dummy.c -o $dummy \
+	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 	  && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
@@ -281,15 +360,18 @@ EOF
    AViiON:dgux:*:*)
        # DG/UX returns AViiON for all architectures
        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	then
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
 	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
+	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 	    fi
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
        else echo i586-dg-dgux${UNAME_RELEASE}
        fi
 	exit 0 ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -326,7 +408,7 @@ EOF
 			exit(0);
 			}
 EOF
-		${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -355,7 +437,7 @@ EOF
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
    *:BOSX:*:*)
@@ -374,8 +456,10 @@ EOF
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
+	    9000/[678][0-9][0-9])
              sed 's/^              //' << EOF >$dummy.c
              #define _HPUX_SOURCE
              #include <stdlib.h>
              #include <unistd.h>
@@ -406,7 +490,7 @@ EOF
                  exit (0);
              }
 EOF
-	(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -438,7 +522,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -448,10 +532,7 @@ EOF
    9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE*:*:*)
+    *9??*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
    *9??*:MPE*:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -470,6 +551,9 @@ EOF
    parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
    hppa*:OpenBSD:*:*)
 	echo hppa-unknown-openbsd
 	exit 0 ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
        exit 0 ;;
@@ -500,49 +584,40 @@ EOF
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*T3E:*:*:*)
-	echo t3e-cray-unicosmk${UNAME_RELEASE}
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
        exit 0 ;;
    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
    F301:UNIX_System_V:*:*)
       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
       exit 0 ;;
    hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:FreeBSD:*:*)
 	if test -x /usr/bin/objformat; then
 	    if test "elf" = "`/usr/bin/objformat`"; then
 		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
 		exit 0
 	    fi
 	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
    *:NetBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
    *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
@@ -552,6 +627,15 @@ EOF
    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i386-pc-interix
 	exit 0 ;;
    i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit 0 ;;
    p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
 	exit 0 ;;
@@ -562,16 +646,11 @@ EOF
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
    *:Linux:*:*)
 #	# uname on the ARM produces all sorts of strangeness, and we need to
 #	# filter it out.
 #	case "$UNAME_MACHINE" in
 #	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
 #	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
 #	esac
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
+	# first see if it will tell us. cd to the root directory to prevent
-	ld_help_string=`ld --help 2>&1`
+	# problems with other programs or directories called `ld' in the path.
 	ld_help_string=`cd /; ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
@@ -579,53 +658,124 @@ EOF
 				    s/ .*//
 				    p'`
        case "$ld_supported_emulations" in
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  *ia64)
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+		echo "${UNAME_MACHINE}-unknown-linux"
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+		exit 0
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+		;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  i?86linux)
-	  elf32arm)   echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+		exit 0
 		;;
 	  elf_i?86)
 		echo "${UNAME_MACHINE}-pc-linux"
 		exit 0
 		;;
 	  i?86coff)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0
 		;;
 	  sparclinux)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
 		exit 0
 		;;
 	  armlinux)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
 		exit 0
 		;;
 	  elf32arm*)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
 		exit 0
 		;;
 	  armelf_linux*)
 		echo "${UNAME_MACHINE}-unknown-linux-gnu"
 		exit 0
 		;;
 	  m68klinux)
 		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
 		exit 0
 		;;
 	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
 		cat >$dummy.c <<EOF
 #include <features.h>
 #if defined(__GLIBC__)
 extern char __libc_version[];
 extern char __libc_release[];
 #endif
 main(argc, argv)
     int argc;
     char *argv[];
 {
 #if defined(__GLIBC__)
  printf("%s %s\n", __libc_version, __libc_release);
 #else
  printf("unkown\n");
 #endif
  return 0;
 }
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
 			./$dummy | grep 1\.99 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
 		fi
 		rm -f $dummy.c $dummy
 		echo powerpc-unknown-linux-gnu${LIBC}
 		exit 0
 		;;
 	esac
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >$dummy.s
+		cat <<EOF >$dummy.s
-		.globl main
+			.data
-		.ent main
+		\$Lformat:
-	main:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-		.frame \$30,0,\$26,0
+
-		.prologue 0
+			.text
-		.long 0x47e03d80 # implver $0
+			.globl main
-		lda \$2,259
+			.align 4
-		.long 0x47e20c21 # amask $2,$1
+			.ent main
-		srl \$1,8,\$2
+		main:
-		sll \$2,2,\$2
+			.frame \$30,16,\$26,0
-		sll \$0,3,\$0
+			ldgp \$29,0(\$27)
-		addl \$1,\$0,\$0
+			.prologue 1
-		addl \$2,\$0,\$0
+			.long 0x47e03d80 # implver \$0
-		ret \$31,(\$26),1
+			lda \$2,-1
-		.end main
+			.long 0x47e20c21 # amask \$2,\$1
 			lda \$16,\$Lformat
 			mov \$0,\$17
 			not \$1,\$18
 			jsr \$26,printf
 			ldgp \$29,0(\$26)
 			mov 0,\$16
 			jsr \$26,exit
 			.end main
 EOF
 		LIBC=""
-		${CC-cc} $dummy.s -o $dummy 2>/dev/null
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./$dummy
+			case `./$dummy` in
-			case "$?" in
+			0-0)
 			7)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
 			esac
 			objdump --private-headers $dummy | \
@@ -639,6 +789,7 @@ EOF
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -652,8 +803,10 @@ EOF
  return 0;
 }
 EOF
-	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
 	elif test "${UNAME_MACHINE}" = "s390"; then
 	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -675,6 +828,7 @@ EOF
 	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -695,7 +849,7 @@ EOF
  return 0;
 }
 EOF
-	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
@@ -712,10 +866,20 @@ EOF
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
    i?86:*:5:7*)
        # Fixed at (any) Pentium or better
        UNAME_MACHINE=i586
        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
 	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
 	else
 	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
    i?86:*:3.2:*)
@@ -727,19 +891,20 @@ EOF
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
 		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:UnixWare:*:*)
+    i?86:*DOS:*:*)
-	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 	    && UNAME_MACHINE=i586
 	fi
 	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
 	exit 0 ;;
    pc:*:*:*)
 	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
        # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
@@ -825,7 +990,7 @@ EOF
    news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
@@ -853,6 +1018,27 @@ EOF
    *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
    *:Darwin:*:*)
 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
 	fi
 	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	exit 0 ;;
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
    NSR-W:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
 	exit 0 ;;
    DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 	exit 0 ;;
 esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -959,7 +1145,7 @@ main ()
 }
 EOF
-${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 # Apollos put the system type in the environment.
--- a/config.h.in
+++ b/config.h.in
@@ -1,225 +0,0 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* Define if on AIX 3.
   System headers sometimes define this.
   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 #undef _ALL_SOURCE
 #endif
 /* Define to empty if the keyword does not work.  */
 #undef const
 /* Define 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
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #undef TIME_WITH_SYS_TIME
 /* Define cpu-machine-OS */
 #undef OS
 /* The number of bytes in a long double.  */
 #undef SIZEOF_LONG_DOUBLE
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
 /* Define if you have the RAND_status function.  */
 #undef HAVE_RAND_STATUS
 /* Define if you have the closesocket function.  */
 #undef HAVE_CLOSESOCKET
 /* Define if you have the gethostbyaddr function.  */
 #undef HAVE_GETHOSTBYADDR
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 /* Define if you have the getpass function.  */
 #undef HAVE_GETPASS
 /* Define if you have the getservbyname function.  */
 #undef HAVE_GETSERVBYNAME
 /* Define if you have the gettimeofday function.  */
 #undef HAVE_GETTIMEOFDAY
 /* Define if you have the inet_addr function.  */
 #undef HAVE_INET_ADDR
 /* Define if you have the inet_ntoa function.  */
 #undef HAVE_INET_NTOA
 /* Define if you have the perror function.  */
 #undef HAVE_PERROR
 /* Define if you have the select function.  */
 #undef HAVE_SELECT
 /* Define if you have the setvbuf function.  */
 #undef HAVE_SETVBUF
 /* Define if you have the socket function.  */
 #undef HAVE_SOCKET
 /* Define if you have the strcasecmp function.  */
 #undef HAVE_STRCASECMP
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME
 /* Define if you have the strstr function.  */
 #undef HAVE_STRSTR
 /* Define if you have the tcgetattr function.  */
 #undef HAVE_TCGETATTR
 /* Define if you have the tcsetattr function.  */
 #undef HAVE_TCSETATTR
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 /* Define if you have the <arpa/inet.h> header file.  */
 #undef HAVE_ARPA_INET_H
 /* Define if you have the <crypto.h> header file.  */
 #undef HAVE_CRYPTO_H
 /* Define if you have the <dlfcn.h> header file.  */
 #undef HAVE_DLFCN_H
 /* Define if you have the <err.h> header file.  */
 #undef HAVE_ERR_H
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 /* Define if you have the <getopt.h> header file.  */
 #undef HAVE_GETOPT_H
 /* Define if you have the <io.h> header file.  */
 #undef HAVE_IO_H
 /* Define if you have the <net/if.h> header file.  */
 #undef HAVE_NET_IF_H
 /* Define if you have the <netdb.h> header file.  */
 #undef HAVE_NETDB_H
 /* Define if you have the <netinet/in.h> header file.  */
 #undef HAVE_NETINET_IN_H
 /* Define if you have the <openssl/crypto.h> header file.  */
 #undef HAVE_OPENSSL_CRYPTO_H
 /* Define if you have the <openssl/err.h> header file.  */
 #undef HAVE_OPENSSL_ERR_H
 /* Define if you have the <openssl/pem.h> header file.  */
 #undef HAVE_OPENSSL_PEM_H
 /* Define if you have the <openssl/rsa.h> header file.  */
 #undef HAVE_OPENSSL_RSA_H
 /* Define if you have the <openssl/ssl.h> header file.  */
 #undef HAVE_OPENSSL_SSL_H
 /* Define if you have the <openssl/x509.h> header file.  */
 #undef HAVE_OPENSSL_X509_H
 /* Define if you have the <pem.h> header file.  */
 #undef HAVE_PEM_H
 /* Define if you have the <rsa.h> header file.  */
 #undef HAVE_RSA_H
 /* Define if you have the <sgtty.h> header file.  */
 #undef HAVE_SGTTY_H
 /* Define if you have the <ssl.h> header file.  */
 #undef HAVE_SSL_H
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 /* Define if you have the <sys/socket.h> header file.  */
 #undef HAVE_SYS_SOCKET_H
 /* Define if you have the <sys/sockio.h> header file.  */
 #undef HAVE_SYS_SOCKIO_H
 /* Define if you have the <sys/stat.h> header file.  */
 #undef HAVE_SYS_STAT_H
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 /* 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 if you have the <time.h> header file.  */
 #undef HAVE_TIME_H
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 /* Define if you have the <winsock.h> header file.  */
 #undef HAVE_WINSOCK_H
 /* Define if you have the <x509.h> header file.  */
 #undef HAVE_X509_H
 /* Define if you have the crypto library (-lcrypto).  */
 #undef HAVE_LIBCRYPTO
 /* Define if you have the dl library (-ldl).  */
 #undef HAVE_LIBDL
 /* Define if you have the nsl library (-lnsl).  */
 #undef HAVE_LIBNSL
 /* Define if you have the resolve library (-lresolve).  */
 #undef HAVE_LIBRESOLVE
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
 /* Define if you have the ssl library (-lssl).  */
 #undef HAVE_LIBSSL
 /* Define if you have the ucb library (-lucb).  */
 #undef HAVE_LIBUCB
 /* Name of package */
 #undef PACKAGE
 /* Version number of package */
 #undef VERSION
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 #
 # 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 +27,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Written by Per Bothner <bothner@cygnus.com>.
 # Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -68,7 +73,7 @@ esac
 # 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*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -98,11 +103,21 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
 		;;
 	-scout)
 		;;
 	-wrs)
 		os=-vxworks
 		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 +136,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,23 +161,36 @@ 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 \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| 580 | i960 | h8300 \
-		| hppa2.0w \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| hppa64 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| mipstx39 | mipstx39el | armv[34][lb] \
+		| alphaev6[78] \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
 		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
 		| thumb | d10v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
 		;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -172,28 +203,49 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	# FIXME: clean up the formatting here.
 	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | xmp-* | ymp-* \
-	      | hppa2.0w-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | hppa2.0n-* | hppa64-* \
 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
 	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mipstx39-* | mipstx39el-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | f301-* | armv*-*)
+	      | mipstx39-* | mipstx39el-* | mcore-* \
 	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
 	      | bs2000-*)
 		;;
 	# 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
 		;;
@@ -223,6 +275,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
 	apollo68bsd)
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -299,6 +355,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
 		;;
@@ -317,6 +377,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 +400,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,17 +432,16 @@ 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)
@@ -376,6 +460,22 @@ case $basic_machine in
 		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
 		;;
 	i386-go32 | go32)
 		basic_machine=i386-unknown
 		os=-go32
 		;;
 	i386-mingw32 | mingw32)
 		basic_machine=i386-unknown
 		os=-mingw32
 		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -404,6 +504,10 @@ case $basic_machine in
 	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 +522,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-unknown
 		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 +562,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 +591,28 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
 	mon960)
 		basic_machine=i960-intel
 		os=-mon960
 		;;
 	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,19 +630,19 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | k6 | 6x86)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -519,12 +666,20 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
 	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 +687,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 +698,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 +745,18 @@ 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
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -600,6 +774,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 +801,14 @@ 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
 		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -630,6 +816,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 +827,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
@@ -659,7 +858,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -671,6 +870,16 @@ 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
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -724,14 +933,34 @@ 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* \
 	      | -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*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
 		    x86-* | i[34567]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 +970,12 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
 		;;
 	-wince*)
 		os=-wince
 		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -756,12 +991,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 +1028,18 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
 	-ose*)
 		os=-ose
 		;;
 	-es1800*)
 		os=-ose
 		;;
 	-xenix)
 		os=-xenix
 		;;
        -*mint | -*MiNT)
 	        os=-mint
 		;;
 	-none)
 		;;
 	*)
@@ -815,7 +1065,7 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
@@ -839,6 +1089,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 +1110,15 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
 	*-wec)
 		os=-proelf
 		;;
 	*-winbond)
 		os=-proelf
 		;;
 	*-oki)
 		os=-proelf
 		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -914,6 +1182,18 @@ case $basic_machine in
 	f301-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
 		os=-coff
 		;;
 	*-*bug)
 		os=-coff
 		;;
 	*-apple)
 		os=-macos
 		;;
 	*-atari*)
 		os=-mint
 		;;
 	*)
 		os=-none
 		;;
@@ -935,10 +1215,10 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
-			-hpux*)
+			-beos*)
-				vendor=hp
+				vendor=be
 				;;
-			-mpeix*)
+			-hpux*)
 				vendor=hp
 				;;
 			-mpeix*)
@@ -959,7 +1239,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -971,6 +1251,15 @@ case $basic_machine in
 			-aux*)
 				vendor=apple
 				;;
 			-hms*)
 				vendor=hitachi
 				;;
 			-mpw* | -macos*)
 				vendor=apple
 				;;
 			-*mint | -*MiNT)
 				vendor=atari
 				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
--- a/configure.in
+++ b/configure.in
@@ -2,26 +2,386 @@ 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")
+
 VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
 AM_INIT_AUTOMAKE(curl,$VERSION)
 AM_PROG_LIBTOOL
 dnl
 dnl Detect the canonical host and target build environment
 dnl
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 dnl Check for AIX weirdos
 AC_AIX
 dnl check for how to do large files
 AC_SYS_LARGEFILE
 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="-Wall -pedantic -g" 
       ;;
  esac ],
       AC_MSG_RESULT(no)
 )
 dnl
 dnl check for working getaddrinfo()
 dnl
 AC_DEFUN(CURL_CHECK_WORKING_GETADDRINFO,[
  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
  AC_TRY_RUN( [
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 void main(void) {
    struct addrinfo hints, *ai;
    int error;
    memset(&hints, 0, sizeof(hints));
    hints.ai_family = AF_UNSPEC;
    hints.ai_socktype = SOCK_STREAM;
    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
    if (error) {
        exit(1);
    }
    else {
        exit(0);
    }
 }
 ],[
  ac_cv_working_getaddrinfo="yes"
 ],[
  ac_cv_working_getaddrinfo="no"
 ],[
  ac_cv_working_getaddrinfo="yes"
 ])])
 if test "$ac_cv_working_getaddrinfo" = "yes"; then
  AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works])
  AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
 fi
 ])
 AC_DEFUN(CURL_CHECK_LOCALTIME_R,
 [
  dnl check for a few thread-safe functions
  AC_CHECK_FUNCS(localtime_r,[
    AC_MSG_CHECKING(whether localtime_r is declared)
    AC_EGREP_CPP(localtime_r,[
 #include <time.h>],[
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(whether localtime_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(localtime_r,[
 #define _REENTRANT
 #include <time.h>],[
 	AC_DEFINE(NEED_REENTRANT)
 	AC_MSG_RESULT(yes)],
 	AC_MSG_RESULT(no))])])
 ])
 AC_DEFUN(CURL_CHECK_INET_NTOA_R,
 [
  dnl determine if function definition for inet_ntoa_r exists.
  AC_CHECK_FUNCS(inet_ntoa_r,[
    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
    AC_EGREP_CPP(inet_ntoa_r,[
 #include <arpa/inet.h>],[
      AC_DEFINE(HAVE_INET_NTOA_R_DECL)
      AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
      AC_EGREP_CPP(inet_ntoa_r,[
 #define _REENTRANT
 #include <arpa/inet.h>],[
 	AC_DEFINE(HAVE_INET_NTOA_R_DECL)
 	AC_DEFINE(NEED_REENTRANT)
 	AC_MSG_RESULT(yes)],
 	AC_MSG_RESULT(no))])])
 ])
 AC_DEFUN(CURL_CHECK_GETHOSTBYADDR_R,
 [
  dnl check for number of arguments to gethostbyaddr_r. it might take
  dnl either 5, 7, or 8 arguments.
  AC_CHECK_FUNCS(gethostbyaddr_r,[
    AC_MSG_CHECKING(if gethostbyaddr_r takes 5 arguments)
    AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 struct hostent_data hdata;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
      ac_cv_gethostbyaddr_args=5],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(if gethostbyaddr_r with -D_REENTRANT takes 5 arguments)
      AC_TRY_COMPILE([
 #define _REENTRANT
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 struct hostent_data hdata;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
 	AC_DEFINE(NEED_REENTRANT)
 	ac_cv_gethostbyaddr_args=5],[
 	AC_MSG_RESULT(no)
 	AC_MSG_CHECKING(if gethostbyaddr_r takes 7 arguments)
 	AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 char buffer[8192];
 int h_errnop;
 struct hostent * hp;
 hp = gethostbyaddr_r(address, length, type, &h,
                     buffer, 8192, &h_errnop);],[
 	  AC_MSG_RESULT(yes)
 	  AC_DEFINE(HAVE_GETHOSTBYADDR_R_7)
 	  ac_cv_gethostbyaddr_args=7],[
 	  AC_MSG_RESULT(no)
 	  AC_MSG_CHECKING(if gethostbyaddr_r takes 8 arguments)
 	  AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netdb.h>],[
 char * address;
 int length;
 int type;
 struct hostent h;
 char buffer[8192];
 int h_errnop;
 struct hostent * hp;
 int rc;
 rc = gethostbyaddr_r(address, length, type, &h,
                     buffer, 8192, &hp, &h_errnop);],[
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8)
 	    ac_cv_gethostbyaddr_args=8],[
 	    AC_MSG_RESULT(no)
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
 ])
 AC_DEFUN(CURL_CHECK_GETHOSTBYNAME_R,
 [
  dnl check for number of arguments to gethostbyname_r. it might take
  dnl either 3, 5, or 6 arguments.
  AC_CHECK_FUNCS(gethostbyname_r,[
    AC_MSG_CHECKING(if gethostbyname_r takes 3 arguments)
    AC_TRY_RUN([
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent h;
 struct hostent_data hdata;
 char *name = "localhost";
 int rc;
 memset(&h, 0, sizeof(struct hostent));
 memset(&hdata, 0, sizeof(struct hostent_data));
 rc = gethostbyname_r(name, &h, &hdata);
 exit (rc != 0 ? 1 : 0); }],[
      AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
      ac_cv_gethostbyname_args=3],[
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(if gethostbyname_r with -D_REENTRANT takes 3 arguments)
      AC_TRY_RUN([
 #define _REENTRANT
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent h;
 struct hostent_data hdata;
 char *name = "localhost";
 int rc;
 memset(&h, 0, sizeof(struct hostent));
 memset(&hdata, 0, sizeof(struct hostent_data));
 rc = gethostbyname_r(name, &h, &hdata);
 exit (rc != 0 ? 1 : 0); }],[
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
 	AC_DEFINE(NEED_REENTRANT)
 	ac_cv_gethostbyname_args=3],[
 	AC_MSG_RESULT(no)
 	AC_MSG_CHECKING(if gethostbyname_r takes 5 arguments)
 	AC_TRY_RUN([
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent *hp;
 struct hostent h;
 char *name = "localhost";
 char buffer[8192];
 int h_errno;
 hp = gethostbyname_r(name, &h, buffer, 8192, &h_errno);
 exit (hp == NULL ? 1 : 0); }],[
 	  AC_MSG_RESULT(yes)
 	  AC_DEFINE(HAVE_GETHOSTBYNAME_R_5)
          ac_cv_gethostbyname_args=5],[
 	  AC_MSG_RESULT(no)
 	  AC_MSG_CHECKING(if gethostbyname_r takes 6 arguments)
 	  AC_TRY_RUN([
 #include <sys/types.h>
 #include <netdb.h>
 int
 main () {
 struct hostent h;
 struct hostent *hp;
 char *name = "localhost";
 char buf[8192];
 int rc;
 int h_errno;
 rc = gethostbyname_r(name, &h, buf, 8192, &hp, &h_errno);
 exit (rc != 0 ? 1 : 0); }],[
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6)
            ac_cv_gethostbyname_args=6],[
 	    AC_MSG_RESULT(no)
 	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"],
 	    [ac_cv_gethostbyname_args=0])],
 	  [ac_cv_gethostbyname_args=0])],
 	[ac_cv_gethostbyname_args=0])],
      [ac_cv_gethostbyname_args=0])])
 ])
 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))
@@ -31,6 +391,92 @@ AC_CHECK_FUNC(gethostname, , AC_CHECK_LIB(ucb, gethostname))
 dnl dl lib?
 AC_CHECK_FUNC(dlopen, , AC_CHECK_LIB(dl, dlopen))
 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 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
 dnl **********************************************************************
@@ -56,7 +502,8 @@ else
  	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"
+        dnl	LIBS="$LIBS -L$OPT_SSL/lib"
        LDFLAGS="$LDFLAGS -L$OPT_SSL/lib"
 	CPPFLAGS="$CPPFLAGS -I$OPT_SSL/include/openssl -I$OPT_SSL/include"
 	AC_MSG_RESULT([$OPT_SSL])
  fi
@@ -69,6 +516,23 @@ else
    dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
    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)
@@ -77,6 +541,12 @@ else
    fi
  fi
  dnl these can only exist if openssl exists
  AC_CHECK_FUNCS( RAND_status \
                  RAND_screen )
 fi
 dnl **********************************************************************
@@ -111,6 +581,35 @@ 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()
 fi
 dnl **********************************************************************
 dnl Back to "normal" configuring
 dnl **********************************************************************
@@ -119,15 +618,19 @@ dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
        unistd.h \
        malloc.h \
        stdlib.h \
        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 \
        sys/time.h \
        getopt.h \
        sys/param.h \
        termios.h \
@@ -156,6 +659,9 @@ AC_CHECK_SIZEOF(long double, 8)
 # check for 'long long'
 AC_CHECK_SIZEOF(long long, 4)
 # check for ssize_t
 AC_CHECK_TYPE(ssize_t, int)
 dnl Get system canonical name
 AC_CANONICAL_HOST
 AC_DEFINE_UNQUOTED(OS, "${host}")
@@ -163,7 +669,7 @@ AC_DEFINE_UNQUOTED(OS, "${host}")
 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 \
@@ -171,6 +677,8 @@ AC_CHECK_FUNCS( socket \
                strftime \
                uname \
                strcasecmp \
                stricmp \
                strcmpi \
                gethostname \
                gethostbyaddr \
                getservbyname \
@@ -180,13 +688,22 @@ AC_CHECK_FUNCS( socket \
                tcsetattr \
                tcgetattr \
                perror \
                getpass \
                closesocket \
                setvbuf \
-                RAND_status
+                sigaction \
                signal \
                getpass_r \
                strlcat
 )
 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 )
@@ -196,7 +713,6 @@ 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, 
@@ -204,9 +720,18 @@ dnl   $PATH:/usr/bin/:/usr/local/bin )
 dnl AC_SUBST(RANLIB)
 AC_OUTPUT( Makefile \
 	   docs/Makefile \
           docs/examples/Makefile \
 	   include/Makefile \
 	   include/curl/Makefile \
 	   src/Makefile \
-           lib/Makefile )
+           lib/Makefile \
-dnl	   perl/checklinks.pl \
+           tests/Makefile \
-dnl	   perl/getlinks.pl \
+           tests/data/Makefile \
-dnl        perl/formfind.pl \
+	   packages/Makefile \
-dnl	   perl/recursiveftpget.pl  )
+	   packages/Win32/Makefile \
 	   packages/Linux/Makefile \
 	   packages/Linux/RPM/Makefile \
 	   packages/Linux/RPM/curl.spec \
 	   packages/Linux/RPM/curl-ssl.spec )
--- 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
@@ -0,0 +1,56 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 BUGS
  Curl has grown substantially from that day, several years ago, when I
  started fiddling with it. When I write this, there are 16500 lines of source
  code, and by the time you read this it has probably grown even more.
  Of course there are lots of bugs left. And lots of misfeatures.
  To help us make curl the stable and solid product we want it to be, we need
  bug reports and bug fixes. If you can't fix a bug yourself and submit a fix
  for it, try to report an as detailed report as possible to the curl mailing
  list to allow one of us to have a go at a solution. You should also post
  your bug/problem at curl's bug tracking system over at
        http://sourceforge.net/bugs/?group_id=976
  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
  need to supply your operating system's name and version number (uname -a
  under a unix is fine), what version of curl you're using (curl -v is fine),
  what URL you were working with and anything else you think matters.
  If curl crashed, causing a core dump (in unix), there is hardly any use to
  send that huge file to anyone of us. Unless we have an exact same system
  setup as you, we can't do much with it. What we instead ask of you is to get
  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.
  HOW TO GET A STACK TRACE with a common unix debugger
  ====================================================
  First, you must make sure that you compile all sources with -g and that you
  don't 'strip' the final executable.
  Run the program until it bangs.
  Run your debugger on the core file, like '<debugger> curl core'. <debugger>
  should be replaced with the name of your debugger, in most cases that will
  be 'gdb', but 'dbx' and others also occur.
  When the debugger has finished loading the core file and presents you a
  prompt, you can give the compiler instructions. Enter 'where' (without the
  quotes) and press return.
  The list that is presented is the stack trace. If everything worked, it is
  supposed to contain the chain of functions that were called when curl
  crashed.
--- a/docs/CONTRIBUTE
+++ b/docs/CONTRIBUTE
@@ -0,0 +1,99 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 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.
 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.
 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 enfore 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.
 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 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 my life 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.
 Test Cases
 Since the introduction of the test suite, we will get the possibility to
 quickly verify that the main features are working as supposed to. To maintain
 this situation and improve it, all new features and functions that are added
 need tro be tested. 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,566 @@
 Updated: February 2, 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 ?
 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 PHP?
 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.6 Can you tell me what error code 142 means?
  4.7 How do I keep usernames 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 persistant 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, GOPHER, LDAP, DICT, TELNET and FILE.
  We spell it cURL or just curl.
  1.2 What is libcurl?
  libcurl is a reliable, higly portable multiprotocol file transfer library.
  Any application is free to use libcurl, even commercial or closed-source
  ones.
  1.3 What is cURL not?
  Curl is *not*, I repeat, *not* a wget clone even though that is a very
  common misconception. Never, during curl's development, have I 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 behaviour 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,
  Windows, Amiga, BeOS, OS/2, OS X, QNX etc.
  1.4 When will you make curl do XXXX ?
  I love suggestions of what to change in order to make curl and libcurl
  better. I do however believe in a few rules when it comes to the future of
  curl:
  * It 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 one single tool that does every
    imaginable thing. That's also one of the great advantages of having the
    core of curl as a library: libcurl.
  * I 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.
  * I focus on protocol related issues and improvements. If you wanna do more
    magic with the supported protocols than curl currently does, chances are
    big I will agree. If you wanna add more protocols, I may very well
    agree.
  * If you want me to make all the work while you wait for me to implement it
    for you, that is not a very friendly attitude. I spend a considerable time
    already on maintaining and developing curl. In order to get more out of
    me, I trust you will offer some of your time and efforts in return.
  * If you write the code, chances are bigger that it will get into curl
    faster.
 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 RSASEF 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 I doubt there would be much
  problems using a different library. I just don't know any other free one and
  that has limited my possibilities to develop against anything else.
  If anyone does "port" curl to use a commercial SSL library, I am 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 page to find
  accurate and up-to-date pointers to recent OpenSSL DDLs and other binary
  packages.
  2.4. Does cURL support Socks (RFC 1928) ?
  No. Nobody has wanted it that badly yet. I would appriciate patches that
  brings 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 resume both ways on FTP, download ways on 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', 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'.
  I have described this in some detail in the README.curl file, and if you
  don't understand it the first time, read it again before you post questions
  about this to the mailing list. I would also suggest that you read 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 transfering 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 PHP?
  PHP4 has the ability to use libcurl as an internal module if built with that
  option enabled. You then get a set of extra functions that can be used
  within your PHP programs. You find all details about those functions in the
  curl section in the PHP manual, see the online version at:
        http://www.php.net/manual/ref.curl.php
  PHP also offers the option to run a command line, and then you can of course
  invoke the curl tool using a command line. This is the way to use curl if
  you're using PHP3 or PHP4 built without curl module support.
 4. Running Problems
  4.1. 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.
  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 qoute 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
  (included in 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. I'll make a short transcript
  here. 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.6. Can you tell me what error code 142 means?
  All error codes that are larger than the highest documented error code means
  that curl has existed due to a timeout. There was no nice way for curl to
  abort from such a condition and that's why it got this undocumented
  error. This should not occur in releases after 7.4.1.
  4.7. How do I keep usernames and passwords secret in Curl command lines?
  I see this problem as two parts:
  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 tho 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.
  Evesdropping is very easy.
  4.8 I found a bug!
  It is not a bug if the behaviour 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.
 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.
  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!
  5.2 How can I receive all data into a large memory chunk?
  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 receivied 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?
  The easy interface of libcurl does not support multiple requests using the
  same connection. The only available way to do multiple requests is to
  init/perform/cleanup for each request.
  5.4 Does libcurl do Winsock initing on win32 systems?
  No.
  On win32 systems, you need to init the winsock stuff manually, libcurl will
  not do that for you. WSAStartup() and WSACleanup() should be used
  accordingly. The reason for this is of course that a single application may
  use several different libraries and parts, and there's no reason for every
  single library to do this.
  5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
  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 persistant connections?
  This is closely related to issue 5.3. Since libcurl has no real support
  for doing multiple file transfers, there's no support for Keep-Alive or
  persistant connections either.
  This is of course subject to change as soon as libcurl gets support for
  multiple files. Feel free to join in and make this change happen sooner!
 6. License Issues
  NOTE: This section is now updated to concern curl 7.5.2 or later!
  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 don'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 carefully picked this license years ago 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
@@ -1,14 +1,25 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 FEATURES
 Misc
 - full URL syntax
 - custom maximum download time
 - custom least download speed acceptable
 - custom output result after completion
 - multiple URLs
 - 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
 - redirectable stderr
 - use selected network interface for outgoing traffic
 HTTP
 - GET
@@ -19,24 +30,29 @@ HTTP
 - authentication
 - resume
 - follow redirects
 - maximum amount of redirects to follow
 - custom HTTP request
- - cookie get/send
+ - cookie get/send fully parsed
- - custom headers (that can replace internally generated headers)
+ - understands the netscape cookie file format
 - 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
 - kerberos security
 - PORT or PASV
 - single file size information (compare to HTTP HEAD)
 - 'type=' URL support
@@ -47,9 +63,11 @@ 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
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -0,0 +1,327 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
                                How To Compile
 Curl has been compiled and built on numerous different operating systems. The
 way to proceed is mainly divided in two different ways: the unix way or the
 windows way.
 If you're using Windows (95, 98, NT) or OS/2, you should continue reading from
 the Win32 or OS/2 headers further down. All other systems should be capable of
 being installed as described below.
 UNIX
 ====
   The configure script *always* tries to find a working SSL library unless
   explicitly told not to.  If you have OpenSSL installed in the default
   search path for your compiler/linker, you don't need to do anything
   special:
        ./configure
   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 it installed in your system, you can run configure like this:
        ./configure --without-ssl
   If you have OpenSSL installed, but with the libraries in one place and the
   header files somewhere else, you'll have to set the LDFLAGS and CPPFLAGS
   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.
   To install curl on your system, run
     make install
   This will copy curl to /usr/local/bin/ (or $prefix/bin if you used the
   --prefix option to configure) and it copies the man pages, the lib and the
   include files to suitable places.
   To make sure everything runs as supposed, run the test suite:
     make test
   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 (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.
   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
     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 your system support shared libraries, but you want to built a static
     version only, you can disable building the shared version by using:
       ./configure --disable-shared
     If you're a curl developer and use gcc, you might want to enable more
     debug options with the --enable-debug option.
 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.
        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 '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.
        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.
 PORTS
 =====
   Just to show off, this is a probably incomplete list of known hardware and
   operating systems that curl has been compiled for:
        - Ultrix
        - SINIX-Z v5
        - Alpha DEC OSF 4
        - Alpha Digital UNIX v3.2
        - Alpha FreeBSD 4.1
        - Alpha Linux 2.2.16
        - Alpha Tru64 v5.0 5.1
        - HP-PA HP-UX 9.X 10.X 11.X
        - MIPS IRIX 6.2, 6.5
        - Power AIX 4.2, 4.3.1, 4.3.2
        - PowerPC Darwin 1.0
        - PowerPC Linux
        - PowerPC Mac OS X
        - Sparc Linux
        - Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7, 8
        - Sparc SunOS 4.1.X
        - i386 BeOS
        - i386 FreeBSD
        - 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 OpenBSD
        - StrongARM NetBSD 1.4.1
 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,274 @@
                                     Updated for curl 7.6 on January 26, 2001
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 INTERNALS
 The project is kind of split in two. The library and the client. The client
 part uses the library, but the library is meant to be designed to allow other
 applications to use it.
 Thus, 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, I do make an effort to avoid '#ifdef WIN32'. All
 conditionals that deal with features *should* instead be in the format
 '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
 I 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
 =======
 As described elsewhere, libcurl is meant to get two different "layers" of
 interfaces. At the present point only the high-level, the "easy", interface
 has been fully implemented and documented. We assume the easy-interface in
 this description, the low-level interface will be documented when fully
 implemented.
 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.
 All printf()-style functions use the supplied clones in lib/mprintf.c. This
 makes sure we stay absolutely platform independent.
 curl_easy_init() allocates an internal struct and makes some initializations.
 The returned handle does not revail internals.
 curl_easy_setopt() takes a 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.
 curl_easy_perform() does a whole lot of things:
 It starts off in the lib/easy.c file by calling curl_transfer(), but the main
 work is lib/url.c. The function first 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 connected, 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).
 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. curl_transfer() then calls _Tranfer() 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.
 When completed, the curl_easy_cleanup() should be called to free up used
 resources.
 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.
 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.
 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 destined to be changed to follow this pattern in the
 future.)
 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 that several times if many URLs were
 specified on the command line or config file.
 Memory Debugging
 ================
 The file named lib/memdebug.c contains debug-versions of a few
 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
 is then analyzed after a complete session,
 memanalyze.pl is a perl script present only 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.
 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 README
 file in the test directory.
 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.
 You must have autoconf installed to build release archives.
--- a/docs/LIBCURL
+++ b/docs/LIBCURL
@@ -0,0 +1,61 @@
                         _ _ _                     _ 
                        | (_) |__   ___ _   _ _ __| |
                        | | | '_ \ / __| | | | '__| |
                        | | | |_) | (__| |_| | |  | |
                        |_|_|_.__/ \___|\__,_|_|  |_|
                     How To Use Libcurl In Your Program
 Interfaces
 libcurl currently offers two different interfaces to the URL transfer
 engine. They can be seen as one low-level and one high-level, in the sense
 that the low-level one will allow you to deal with a lot more details but on
 the other hand not offer as many fancy features (such as Location:
 following). The high-level interface is supposed to be a built-in
 implementation of the low-level interface. You will not be able to mix
 function calls from the different layers.
 As we currently ONLY support the high-level interface, the so called easy
 interface, I will not attempt to describe any low-level functions at this
 point.
 Function descriptions
 The interface is meant to be very simple for very simple
 implementations. Thus, we have minimized the number of entries.
 The Easy Interface
 When using the easy interface, you init your easy-session and get a handle,
 which you use as input to the following interface functions you use.
 You continue by setting all the options you want in the upcoming transfer,
 most important among them is the URL itself. You might want to set some
 callbacks as well that will be called from the library when data is available
 etc.
 When all is setup, you tell libcurl to perform the transfer. It will then do
 the entire operation and won't return until it is done or failed.
 After the transfer has been made, you cleanup the easy-session's handle and
 libcurl is entirely off the hook!
        curl_easy_init() 
        curl_easy_setopt() 
        curl_easy_perform() 
        curl_easy_cleanup() 
 While the above four functions are the main functions to use in the easy
 interface, there is a series of helpful functions to use. They are:
        curl_version()        - displays the libcurl version
        curl_getdate()        - converts a date string to time_t
        curl_getenv()         - portable environment variable reader
        curl_formparse()      - helps building a HTTP form POST
        curl_slist_append()   - builds a linked list
        curl_slist_free_all() - frees a whole curl_slist
 Read the separate man pages for these functions for details!
--- 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
@@ -122,33 +122,39 @@ UPLOADING
 FTP
-   Upload all data on stdin to a specified ftp site:
+  Upload all data on stdin to a specified ftp site:
        curl -t ftp://ftp.upload.com/myfile
-   Upload data from a specified file, login with user and password:
+  Upload data from a specified file, login with user and password:
        curl -T uploadfile -u user:passwd ftp://ftp.upload.com/myfile
-   Upload a local file to the remote site, and use the local file name remote
+  Upload a local file to the remote site, and use the local file name remote
-   too:
+  too:
        curl -T uploadfile -u user:passwd ftp://ftp.upload.com/
-   NOTE: Curl is not currently supporing ftp upload through a proxy! The reason
+  Upload a local file to get appended to the remote file using ftp:
-   for this is simply that proxies are seldomly configured to allow this and
+
-   that no author has supplied code that makes it possible!
+        curl -T localfile -a ftp://ftp.upload.com/remotefile
  Curl also supports ftp upload through a proxy, but only if the proxy is
  configured to allow that kind of tunneling. If it does, you can run curl in
  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:
+  Upload all data on stdin to a specified http site:
        curl -t http://www.upload.com/myfile
-   Note that the http server must've been configured to accept PUT before this
+  Note that the http server must've been configured to accept PUT before this
-   can be done successfully.
+  can be done successfully.
-   For other ways to do http data upload, see the POST section below.
+  For other ways to do http data upload, see the POST section below.
 VERBOSE / DEBUG
@@ -174,7 +180,7 @@ DETAILED INFORMATION
  Store the HTTP headers in a separate file:
-        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
@@ -190,6 +196,41 @@ 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.
@@ -241,6 +282,8 @@ REFERER
        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
@@ -359,17 +402,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.
@@ -383,14 +435,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
@@ -441,13 +493,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
@@ -455,11 +508,21 @@ 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 SSLeay to be installed and used when curl is built. If
+  Secure HTTP requires SSL libraries to be installed and used when curl is
-  that is done, curl is capable of retrieving and posting documents using the
+  built. If that is done, curl is capable of retrieving and posting documents
-  HTTPS procotol.
+  using the HTTPS procotol.
  Example:
@@ -472,9 +535,10 @@ HTTPS
  browsers (Netscape and MSEI both use the so called PKCS#12 format). If you
  want curl to use the certificates you use with your (favourite) browser, you
  may need to download/compile a converter that can convert your browser's
-  formatted certificates to PEM formatted ones. Dr Stephen N. Henson has
+  formatted certificates to PEM formatted ones. This kind of converter is
-  written a patch for SSLeay that adds this functionality. You can get his
+  included in recent versions of OpenSSL, and for older versions Dr Stephen
-  patch (that requires an SSLeay installation) from his site at:
+  N. Henson has written a patch for SSLeay that adds this functionality. You
  can get his patch (that requires an SSLeay installation) from his site at:
  http://www.drh-consultancy.demon.co.uk/
  Example on how to automatically retrieve a document using a certificate with
@@ -494,6 +558,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 -certfile [file you saved] -out [PEMfile]
 RESUMING FILE TRANSFERS
 To continue a file transfer where it was previously aborted, curl supports
@@ -601,13 +685,73 @@ ENVIRONMENT VARIABLES
  The usage of the -x/--proxy flag overrides the environment variables.
 NETRC
  Unix introduced the .netrc concept a long time ago. It is a way for a user
  to specify name and password for commonly visited ftp sites in a file so
  that you don't have to type them in each time you visit those sites. You
  realize this is a big security risk if someone else gets hold of your
  passwords, so therefor most unix programs won't read this file unless it is
  only readable by yourself (curl doesn't care though).
  Curl supports .netrc files if told so (using the -n/--netrc option). This is
  not restricted to only ftp, but curl can use it for all protocols where
  authentication is used.
  A very simple .netrc file could look something like:
        machine curl.haxx.se login iamdaniel password mysecret
 CUSTOM OUTPUT
  To better allow script programmers to get to know about the progress of
  curl, the -w/--write-out option was introduced. Using this, you can specify
  what information from the previous transfer you want to extract.
  To display the amount of bytes downloaded together with some text and an
  ending newline:
        curl -w 'We downloaded %{size_download} bytes\n' www.download.com
 KERBEROS4 FTP TRANSFER
  Curl supports kerberos4 for FTP transfers. You need the kerberos package
  installed and used at curl build time for it to be used.
  First, get the krb-ticket the normal way, like with the kauth tool. Then use
  curl in way similar to:
        curl --krb4 private ftp://krb4site.com -u username:fakepwd
  There's no use for a password on the -u switch, but a blank one will make
  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.
  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.
 MAILING LIST
  We have an open mailing list to discuss curl, its development and things
  relevant to this.
-  To subscribe, mail curl-request@contactor.se with "subscribe <your email
+  To subscribe, mail curl-request@contactor.se with "subscribe <fill in your
-  address>" in the body.
+  email address>" in the body.
  To post to the list, mail curl@contactor.se.
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -0,0 +1,26 @@
 #
 # $Id$
 #
 AUTOMAKE_OPTIONS = foreign no-dependencies
 man_MANS = \
 	curl.1 \
 	curl_easy_cleanup.3 \
 	curl_easy_getinfo.3 \
 	curl_easy_init.3 \
 	curl_easy_perform.3 \
 	curl_easy_setopt.3 \
 	curl_formparse.3 \
 	curl_formfree.3 \
 	curl_getdate.3 \
 	curl_getenv.3 \
 	curl_slist_append.3 \
 	curl_slist_free_all.3 \
 	curl_version.3
 EXTRA_DIST = $(man_MANS) \
 	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \
 	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting
 SUBDIRS = examples
--- a/docs/README.win32
+++ b/docs/README.win32
@@ -0,0 +1,24 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 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.
  Some documentation in this archive will be tricky to read for Windows
  people, as they come in unix-style man pages. You can either download a
  freely available nroff binary for win32 (*pointers appriciated*), convert
  the files into plain-text on your neighbor's unix machine or run over to the
  curl web site and view them as plain HTML.
  The main curl.1 man page is "built-in". Use a command line similar to this
  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/TODO
+++ b/docs/TODO
@@ -0,0 +1,100 @@
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
                            | (__| |_| |  _ <| |___ 
                             \___|\___/|_| \_\_____|
 TODO
 For the future
 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...)
 * Make SSL session ids get used if multiple HTTPS documents from the same
   host is requested.
 * Make the curl tool support URLs that start with @ that would then mean that
   the following is a plain list with URLs to download. Thus @filename.txt
   reads a list of URLs from a local file. A fancy option would then be to
   support @http://whatever.com that would first load a list and then get the
   URLs mentioned in the list. I figure -O or something would have to be
   implied by such an action.
 * Improve the regular progress meter with --continue is used. It should be
   noticable when there's a resume going on.
 * Add a command line option that allows the output file to get the same time
   stamp as the remote file. We already are capable of fetching the remote
   file's date.
 * Make the SSL layer option capable of using the Mozilla Security Services as
   an alternative to OpenSSL:
   http://www.mozilla.org/projects/security/pki/nss/
 * Make sure the low-level interface works. highlevel.c should basically be
   possible to write using that interface. Document the low-level interface
 * Make the easy-interface support multiple file transfers. If they're done
   to the same host, they should use persistant connections or similar.
   Figure out a nice design for this.
 * Add asynchronous name resolving, as this enables full timeout support for
   fork() systems.
 * Move non-URL related functions that are used by both the lib and the curl
   application to a separate "portability lib".
 * Add support for other languages than C.  C++ (rumours have been heard about
   something being worked on in this area) and perl (we have seen the first
   versions of this!) comes to mind. Python anyone?
 * "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.
 * Authentication: NTLM. It would be cool to support 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.
 * 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.
 * 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 and support
   Where ever it would fit.  configure 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.
 * 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:
--- a/docs/TheArtOfHttpScripting
+++ b/docs/TheArtOfHttpScripting
@@ -0,0 +1,346 @@
 Author:  Daniel Stenberg <daniel@haxx.se>
 Date:    September 15, 2000
 Version: 0.3
                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 isse 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 favourite 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 refered 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]
 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 occations, 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
 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.
 http://www.openssl.org is the home of the OpenSSL project
 http://curl.haxx.se is the home of the cURL project
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -2,18 +2,19 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "13 March 2000" "Curl 6.5" "Curl Manual"
+.TH curl 1 "19 January 2001" "Curl 7.6" "Curl Manual"
 .SH NAME
 curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
 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 +38,26 @@ 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
 Starting with curl 7.6, you can specify any amount of URLs on the command
 line. They will be fetched in a sequential manner in the specified order.
 .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 used more than once, the last one will be the one to be
 used.
 .IP "-b/--cookie <name=data>"
 (HTTP)
 Pass the data to the HTTP server as a cookie. It is supposedly the
@@ -67,11 +76,17 @@ format.
 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 used more than once, the last one will be the one to be
 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
 data sent to stdout to be in text mode for win32 systems.
 If this option is used twice, the second one will disable ASCII usage.
 .IP "-c/--continue"
 .B Deprecated. Use '-C -' instead.
 Continue/Resume a previous file transfer. This instructs curl to
 continue appending data on the file where it was previously left,
 possibly because of a broken connection to the server. There must be
@@ -87,17 +102,45 @@ to the destination.
 If used with uploads, the ftp server command SIZE will not be used by
 curl. Upload resume is for FTP only.
 HTTP resume is only possible with HTTP/1.1 or later servers.
 If this option is used serveral 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. Note
-Sends the specified data in a POST request to the HTTP server. Note
+that the data is sent exactly as specified with no extra processing (with all
-that the data is sent exactly as specified with no extra processing.
+newlines cut off).  The data is expected to be "url-encoded". This will cause
-The data is expected to be "url-encoded". This will cause curl to
+curl to pass the data to the server using the content-type
-pass the data to the server using the content-type
+application/x-www-form-urlencoded. Compare to -F. If more than one -d/--data
-application/x-www-form-urlencoded. Compare to -F.
+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.
 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 serveral 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 serveral 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 serveral times, the last one will be used.
 If this option is used serveral times, the ones following the first will
 append data.
 .IP "-D/--dump-header <file>"
 (HTTP/FTP)
 Write the HTTP headers to this file. Write the FTP file info to this
@@ -106,11 +149,17 @@ 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 serveral 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 serveral times, the last one will be used.
 .IP "-E/--cert <certificate[:password]>"
 (HTTPS)
 Tells curl to use the specified certificate file when getting a file
@@ -118,6 +167,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 serveral 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 serveral 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 +182,109 @@ 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 "-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 serveral 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 serveral 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.
+
 If this option is used serveral times, the last one will be used.
 .IP "-M/--manual"
 Manual. Display the huge help text.
 .IP "-n/--netrc"
@@ -204,25 +304,42 @@ A quick and very simple example of how to setup a
 to allow curl to ftp to the machine host.domain.com with user name
 'myself' and password 'secret' should look similar to:
-.B "machine host.domain.com 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 #[num] in the <file> specifier. That variable
+multiple documents, you can use '#' followed by a number in the <file>
-will be replaced with the current string for the URL being fetched. Like in:
+specifier. That variable will be replaced with the current string for the URL
 being fetched. Like in:
  curl http://{one,two}.site.com -o "file_#1.txt"
 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
@@ -244,6 +361,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 serveral times, the last one will be used.
 .IP "-q"
 If used as the first parameter on the command line, the
 .I $HOME/.curlrc
@@ -256,6 +375,8 @@ 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 "-r/--range <range>"
 (HTTP/FTP)
 Retrieve a byte range (i.e a partial document) from a HTTP/1.1 or FTP
@@ -293,12 +414,19 @@ 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 serveral times, the last one will be used.
 .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.
 If this option is used twice, the second will again disable show error.
 .IP "-t/--upload"
 .B Deprecated. Use '-T -' instead.
 Transfer the stdin data to the specified file. Curl will read
 everything from stdin until EOF and store with the supplied name. If
 this is used on a http(s) server, the PUT command will be used.
@@ -310,18 +438,35 @@ really prove to Curl that there is no file name or curl will
 think that your last directory name is the remote file name to
 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.
 If this option is used serveral 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 serveral 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 serveral 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.
@@ -375,15 +520,25 @@ The total amount of bytes that were downloaded.
 .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 serveral 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
 port 1080.
 If this option is used serveral times, the last one will be used.
 .IP "-X/--request <command>"
 (HTTP)
 Specifies a custom request to use when communicating with the HTTP server.
@@ -393,14 +548,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 serveral 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 serveral 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 serveral 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
@@ -408,11 +569,15 @@ 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 serveral 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.
@@ -422,12 +587,18 @@ Forces curl to use SSL version 2 when negotiating with a remote SSL server.
 .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 serveral times, the last one will be used.
 .SH FILES
 .I ~/.curlrc
 .RS
@@ -482,7 +653,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
@@ -540,23 +711,34 @@ 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 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 <Daniel.Stenberg@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@sth.frontec.se>
+ - Kjell Ericson <Kjell.Ericson@haxx.se>
 - Troy Engel <tengel@sonic.net>
 - Ryan Nelson <ryan@inch.com>
- - Bjorn Stenberg <Bjorn.Stenberg@sth.frontec.se>
+ - Björn Stenberg <Bjorn.Stenberg@haxx.se>
 - Angus Mackay <amackay@gus.ml.org>
 - Eric Young <eay@cryptsoft.com>
 - Simon Dick <simond@totally.irrelevant.org>
@@ -574,9 +756,9 @@ If you do find any (or have other suggestions), mail Daniel Stenberg
 - 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>
+ - Jörn Hartroth <Joern.Hartroth@computer.org>
 - Matthew Clarke <clamat@van.maves.ca>
- - Linus Nielsen <Linus.Nielsen@haxx.nu>
+ - Linus Nielsen <Linus.Nielsen@haxx.se>
 - Felix von Leitner <felix@convergence.de>
 - Dan Zitter <dzitter@zitter.net>
 - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
@@ -586,8 +768,30 @@ If you do find any (or have other suggestions), mail Daniel Stenberg
 - Ellis Pritchard <ellis@citria.com>
 - Damien Adant <dams@usa.net>
 - Chris <cbayliss@csc.come>
 - Marco G. Salvagno <mgs@whiz.cjb.net>
 - Paul Marquis <pmarquis@iname.com>
 - David LeBlanc <dleblanc@qnx.com>
 - Rich Gray at Plus Technologies
 - Luong Dinh Dung <u8luong@lhsystems.hu>
 - Torsten Foertsch <torsten.foertsch@gmx.net>
 - Kristian Köhntopp <kris@koehntopp.de>
 - Fred Noz <FNoz@siac.com>
 - Caolan McNamara <caolan@csn.ul.ie>
 - Albert Chin-A-Young <china@thewrittenword.com>
 - Stephen Kick <skick@epicrealm.com>
 - Martin Hedenfalk <mhe@stacken.kth.se>
 - Richard Prescott
 - Jason S. Priebe <priebe@wral-tv.com>
 - T. Bharath <TBharath@responsenetworks.com>
 - Alexander Kourakos <awk@users.sourceforge.net>
 - James Griffiths <griffiths_james@yahoo.com>
 - Loic Dachary <loic@senga.org>
 - Robert Weaver <robert.weaver@sabre.com>
 - Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
 - Jun-ichiro itojun Hagino <itojun@iijlab.net>
 .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,25 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_easy_cleanup 3 "22 May 2000" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_easy_cleanup - End a libcurl "easy" session
 .SH SYNOPSIS
 .B #include <curl/easy.h>
 .sp
 .BI "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.
 .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_getinfo.3
+++ b/docs/curl_easy_getinfo.3
@@ -0,0 +1,100 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_easy_init 3 "4 February 2001" "Curl 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/easy.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_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.
 (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,28 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_easy_init 3 "26 September 2000" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_easy_init - Start a libcurl "easy" session
 .SH SYNOPSIS
 .B #include <curl/easy.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, you need to init the winsock stuff manually, libcurl will
 not do that for you. WSAStartup() and WSACleanup() should be used accordingly.
 .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), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_easy_perform.3
+++ b/docs/curl_easy_perform.3
@@ -0,0 +1,33 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_easy_perform 3 "25 Jan 2001" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_easy_perform - Do the actual transfer in a "easy" session
 .SH SYNOPSIS
 .B #include <curl/easy.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.
 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 willo 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,421 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_easy_setopt 3 "2 February 2001" "Curl 7.5" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - Set curl easy-session options
 .SH SYNOPSIS
 .B #include <curl/easy.h>
 .sp
 .BI "CURLcode curl_easy_setopt(CURL *" handle ", CURLoption "option ", ...);
 .ad
 .SH DESCRIPTION
 curl_easy_setopt() is called to tell libcurl how to behave in a number of
 ways. Most operations in libcurl have default actions, and by using the
 appropriate options you can make them behave differently (as documented).  All
 options are set with the
 .I option
 followed by a parameter. That parameter can be a long, a function pointer or
 an object pointer, all depending on what the option in question 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 calls in the setup phase.
 The
 .I "handle"
 is the return code from the
 .I "curl_easy_init"
 call.
 .SH OPTIONS
 These options are in a bit of random order, but you'll figure it out!
 .TP 0.8i
 .B CURLOPT_FILE
 Data pointer to pass instead of FILE * to the file write function. Note that
 if you specify the
 .I CURLOPT_WRITEFUNCTION
 , this is the pointer you'll get as input.
 NOTE: If you're using libcurl as a win32 .DLL, you MUST use a
 .I CURLOPT_WRITEFUNCTION
 if you set the
 .I CURLOPT_FILE
 option.
 .TP
 .B CURLOPT_WRITEFUNCTION
 Function pointer that should use match the following prototype:
 .BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
 This function gets called by libcurl as soon as there is received data that
 needs to be written down. The size of the data pointed to by
 .I ptr 
 is
 .I size
 multiplied with
 .I nmemb.
 Return the number of bytes actually written or return -1 to signal error to the library (it will cause it to abort the transfer).
 .TP
 .B CURLOPT_INFILE
 Data pointer to pass instead of FILE * to the file read function. Note that if
 you specify the
 .I CURLOPT_READFUNCTION
 , this is the pointer you'll get as input.
 NOTE: If you're using libcurl as a win32 .DLL, you MUST use a
 .I CURLOPT_READFUNCTION
 if you set the
 .I CURLOPT_INFILE
 option.
 .TP
 .B CURLOPT_READFUNCTION
 Function pointer that should use match the following prototype:
 .BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
 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
 .I ptr
 may be filled with at most
 .I size
 multiplied with
 .I nmemb
 number of bytes. Your function must return the actual number of bytes that you
 stored in that memory area. Returning -1 will signal an error to the library
 and cause it to abort the current transfer immediately.
 .TP
 .B CURLOPT_INFILESIZE
 When uploading a file to a remote site, this option should be used to tell
 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. NOTE: this option is currently required!
 .TP
 .B CURLOPT_PROXY
 If you need libcurl to use a http proxy to access the outside world, set the
 proxy string with this option. The parameter should be a char * to a zero
 terminated string. 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.
 .TP
 .B CURLOPT_PROXYPORT
 Set this long with this option to set the proxy port to use unless it is
 specified in the proxy string CURLOPT_PROXY.
 .TP
 .B CURLOPT_HTTPPROXYTUNNEL
 Set the parameter to non-zero to get the library to tunnel all non-HTTP
 operations through the given HTTP proxy. Do note that there is a big
 difference to use a proxy and to tunnel through it. If you don't know what
 this means, you probably don't want this tunnel 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.
 .TP
 .B CURLOPT_HEADER
 A non-zero parameter tells the library to include the header in the
 output. This is only relevant for protocols that actually has a header
 preceeding the data (like HTTP).
 .TP
 .B CURLOPT_NOPROGRESS
 A non-zero parameter tells the library to shut of the built-in progress meter
 completely. (NOTE: future versions of the lib is likely to not have any
 built-in progress meter at all).
 .TP
 .B CURLOPT_NOBODY
 A non-zero parameter tells the library to not include the body-part in the
 output. This is only relevant for protocols that have a separate header and
 body part.
 .TP
 .B CURLOPT_FAILONERROR
 A non-zero parameter tells the library to fail silently if the HTTP code
 returned is equal or larger than 300. The default action would be to return
 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.
 .TP
 .B CURLOPT_FTPLISTONLY
 A non-zero parameter tells the library to just list the names of an ftp
 directory, instead of doing a full directory listin that would include file
 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
 .I ~/.netrc
 file to find user name and password for the remote site you are about to
 access. Do note that curl does not verify that the file has the correct
 properties set (as the standard unix ftp client does), and that only machine
 name, user name and password is taken into account (init macros and similar
 things aren't supported).
 .TP
 .B CURLOPT_FOLLOWLOCATION
 A non-zero parameter tells the library to follow any Location: header that the
 server sends as part of a HTTP header. NOTE that this means that the library
 will resend the same request on the new location and follow new Location:
 headers all the way until no more such headers are returned.
 .TP
 .B CURLOPT_TRANSFERTEXT
 A non-zero parameter tells the library to use ASCII mode for ftp transfers,
 instead of the default binary transfer. For LDAP transfers it gets the data in
 plain text instead of HTML and for win32 systems it does not set the stdout to
 binary mode. This option can be useable when transfering text data between
 system with different views on certain characters, such as newlines or
 similar.
 .TP
 .B CURLOPT_PUT
 A non-zero parameter tells the library to use HTTP PUT a file. The file to put
 must be set with CURLOPT_INFILE and CURLOPT_INFILESIZE.
 .TP
 .B CURLOPT_MUTE
 A non-zero parameter tells the library to be completely quiet.
 .TP
 .B CURLOPT_USERPWD
 Pass a char * as parameter, which should be [username]:[password] to use for
 the connection. If the password is left out, you will be prompted for it.
 .TP
 .B CURLOPT_PROXYUSERPWD
 Pass a char * as parameter, which should be [username]:[password] to use for
 the connection to the HTTP proxy. If the password is left out, you will be
 prompted for it.
 .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. The HTTP
 transfers also support several intervals, separated with commas as in
 .I "X-Y,N-M".
 .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.
 .TP
 .B CURLOPT_TIMEOUT
 Pass a long as parameter containing the maximum time in seconds that you allow
 the libcurl transfer operation to take. Do note that normally, name lookups
 maky take a considerable time and that limiting the operation to less than a
 few minutes risk aborting perfectly normal operations.
 .TP
 .B CURLOPT_POSTFIELDS
 Pass a char * as parameter, which should be the full data to post in a HTTP
 post operation. See also the CURLOPT_POST.
 .TP
 .B CURLOPT_POSTFIELDSIZE
 If you want to post data to the server without letting libcurl do a strlen()
 to measure the data size, this option must be used. Also, when this option is
 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 data
 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.
 .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.
 .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.
 .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 'struct
 curl_slist' structs properly filled in. Use
 .I curl_slist_append(3)
 to create the list and
 .I curl_slist_free_all(3)
 to clean up an entire list.
 .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
 .I curl_formparse(3)
 as documented.
 .TP
 .B CURLOPT_SSLCERT
 Pass a pointer to a zero terminated string as parameter. The string should be
 the file name of your certficicate in PEM format.
 .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.
 .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
 .I curl_slist_append(3)
 to append strings (commands) to the list, and clear the entire list afterwards
 with
 .I curl_slist_free_all(3)
 .TP
 .B CURLOPT_POSTQUOTE
 Pass a pointer to a linked list of FTP commands to pass to the server after
 your ftp transfer request. The linked list should be a fully valid list of
 struct curl_slist structs properly filled in as described for
 .I "CURLOPT_QUOTE"
 .TP
 .B CURLOPT_WRITEHEADER
 Pass a FILE * to be used to write the header part of the received data to.
 .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
 cookie data format or just regular HTTP-style headers dumped to a file.
 .TP
 .B CURLOPT_SSLVERSION
 Pass a long as parameter. Set what version of SSL to attempt to use, 2 or
 3. By default, the SSL library will try to solve this by itself although some
 servers make this difficult why you at times will have to use this option.
 .TP
 .B CURLOPT_TIMECONDITION
 Pass a long as parameter. This defines how the CURLOPT_TIMEVALUE time value is
 treated. You can set this parameter to TIMECOND_IFMODSINCE or
 TIMECOND_IFUNMODSINCE. This is aa HTTP-only feature. (TBD)
 .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 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_WRITEINFO
 (NOT PRESENT IN 7.4 or later!)
 Pass a pointer to a zero terminated string as parameter. It will be used to
 report information after a successful request. This string may contain
 variables that will be substituted by their contents when output. Described
 elsewhere.
 .TP
 .B CURLOPT_PROGRESSFUNCTION
 Function pointer that should match the
 .BI curl_progress_callback
 prototype found in
 .I <curl/curl.h>
 This function gets called by libcurl instead of its internal
 equivalent. 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
 CURLE_ABORTED_BY_CALLBACK.
 .TP
 .B CURLOPT_PROGRESSDATA
 Pass a pointer that will be untouched by libcurl and passed as the first
 argument in the progress callback set with
 .I CURLOPT_PROGRESSFUNCTION
 .
 .TP
 .B CURLOPT_SSL_VERIFYPEER
 Pass a long that is set to a non-zero value to make curl verify the peer's
 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 curl_passwd_callback function that will then be called
 instead of the internal one if libcurl requests a password. The function must
 match this prototype:
 .BI "int my_getpass(void *client, char *prompt, char* buffer, int buflen );"
 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.
 .I client
 is a generic pointer, see CURLOPT_PASSWDDATA.
 .I prompt
 is a zero-terminated string that is text that prefixes the input request.
 .I buffer
 is a pointer to data where the entered password should be stored and
 .I buflen
 is the maximum number of bytes that may be written in the buffer.
 (Added in 7.4.2)
 .TP
 .B CURLOPT_PASSWDDATA
 Pass a void * to whatever data you want. The passed pointer will be the first
 argument sent to the specifed CURLOPT_PASSWDFUNCTION function. (Added in
 7.4.2)
 .TP
 .B CURLOPT_FILETIME
 Pass a long. If it is a non-zero value, libcurl will attempt to get the
 modification date of the remote document in this operation. This requires that
 the remote server sends the time or replies to a time querying command. The
 curl_easy_getinfo() function with the CURLINFO_FILETIME argument can be used
 after a transfer to extract the received time (if any). (Added in 7.5)
 .TP
 .B CURLOPT_MAXREDIRS
 Pass a long. The set number will be the redirection limit. If that many
 redirections have been followed, the next redirect will cause an error. This
 option only makes sense if the CURLOPT_FOLLOWLOCATION is used at the same
 time. (Added in 7.5)
 .PP
 .SH RETURN VALUE
 0 means the option was set properly, non-zero means an error as
 .I <curl/curl.h>
 defines
 .SH "SEE ALSO"
 .BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_formfree.3
+++ b/docs/curl_formfree.3
@@ -0,0 +1,23 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_formfree 3 "17 November 2000" "Curl 7.5" "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_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) "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_formparse.3
+++ b/docs/curl_formparse.3
@@ -0,0 +1,62 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_formparse 3 "6 June 2000" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_formparse - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "CURLcode *curl_formparse(char *" string, "struct HttpPost **" firstitem,
 .BI "struct HttpPost ** "lastitem ");"
 .ad
 .SH DESCRIPTION
 curl_formparse() is used to append sections when building a multipart/formdata
 HTTP POST. Append one section at a time until you've added all the sections
 you want included and then you pass the
 .I firstitem
 pointer as parameter to CURLOPT_HTTPPOST.
 .I lastitem
 is set after each call and on repeated invokes it should be left as set to
 allow repeated invokes to find the end of the list in a faster way.
 .I string
 must be a zero terminated string following the following syntax.
 .SH "FORM PARSE STRINGS"
 The
 .I string 
 parameter must be using one of the following patterns. Note that the []
 letters should not be included in the real-life string.
 .TP 0.8i
 .B [name]=[contents]
 Add a form field named 'name' with the contents 'contents'. This is the
 typcial contents of the HTML tag <input type=text>.
 .TP
 .B [name]=@[filename]
 Add a form field named 'name' with the contents as read from the local file
 named 'filename'. This is the typcial contents of the HTML tag <input
 type=file>.
 .TP
 .B [name]=@[filename1,filename2,...]
 Add a form field named 'name' with the contents as read from the local files
 named 'filename1' and 'filename2'. This is identical to the upper, except that
 you get the contents of several files in one section.
 .TP
 .B [name]=@[filename];[content-type]
 Whenever you specify a file to read from, you can optionally specify the
 content-type as well. The content-type is passed to the server together with
 the contents of the file. curl_formparse() will guess content-type for a
 number of well-known extensions and otherwise it will set it to binary. You
 can override the internal decision by using this option.
 .TP
 .B [name]=@[filename1,filename2,...];[content-type]
 When you specify several files to read the contents from, you can set the
 content-type for all of them in the same way as with a single file.
 .PP
 .SH RETURN VALUE
 Returns non-zero if an error occurs.
 .SH "SEE ALSO"
 .BR curl_easy_setopt "(3) "
 .SH BUGS
 Surely there are some, you tell me!
--- a/docs/curl_getdate.3
+++ b/docs/curl_getdate.3
@@ -0,0 +1,80 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_getdate 3 "2 June 2000" "Curl 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]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_getenv 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_getenv - return value for environment name
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
 .BI "char *curl_getenv(char *" name ");
 .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_slist_append.3
+++ b/docs/curl_slist_append.3
@@ -0,0 +1,29 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_slist_append 3 "2 June 2000" "Curl 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_slit *" list,
 .BI "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]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_slist_free_all 3 "2 June 2000" "Curl 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_slit *" 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_version.3
+++ b/docs/curl_version.3
@@ -0,0 +1,27 @@
 .\" You can view this file with:
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
 .TH curl_version 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_version - returns the libcurl version string
 .SH SYNOPSIS
 .B #include <curl/easy.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).
 Do note that 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,11 @@
 #
 # $Id$
 #
 AUTOMAKE_OPTIONS = foreign no-dependencies
 EXTRA_DIST = 
 	README curlgtk.c sepheaders.c simple.c
 all:
 	@echo "done"
--- a/docs/examples/README
+++ b/docs/examples/README
@@ -0,0 +1,8 @@
 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.
--- a/docs/examples/curlgtk.c
+++ b/docs/examples/curlgtk.c
@@ -0,0 +1,87 @@
 /* curlgtk.c */
 /* 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/sepheaders.c
+++ b/docs/examples/sepheaders.c
@@ -0,0 +1,63 @@
 #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, FILE *stream)
 {
  written = fwrite(ptr,size,nmemb,outfile);
  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,26 @@
 #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;
  FILE *headerfile;
  headerfile = fopen("dumpit", "w");
  curl = curl_easy_init();
  if(curl) {
    /* what call to write: */
    curl_easy_setopt(curl, CURLOPT_URL, "curl.haxx.se");
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, headerfile);
    res = curl_easy_perform(curl);
    /* always cleanup */
    curl_easy_cleanup(curl);
  }
  return 0;
 }
--- 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) 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.
+ *****************************************************************************/
- *
+
- * ------------------------------------------------------------
+#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,76 +49,11 @@
 #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 */
@@ -126,160 +64,191 @@ struct HttpPost {
 			    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 */
 };
-/* 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,
                                      FILE *outstream);
 typedef size_t (*curl_read_callback)(char *buffer,
                                     size_t size,
                                     size_t nitems,
                                     FILE *instream);
 typedef int (*curl_passwd_callback)(void *clientp,
                                    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,
-  URG_FAILED_INIT,
+  CURLE_FAILED_INIT,
-  URG_URL_MALFORMAT,
+  CURLE_URL_MALFORMAT,
-  URG_URL_MALFORMAT_USER,
+  CURLE_URL_MALFORMAT_USER,
-  URG_COULDNT_RESOLVE_PROXY,
+  CURLE_COULDNT_RESOLVE_PROXY,
-  URG_COULDNT_RESOLVE_HOST,
+  CURLE_COULDNT_RESOLVE_HOST,
-  URG_COULDNT_CONNECT,
+  CURLE_COULDNT_CONNECT,
-  URG_FTP_WEIRD_SERVER_REPLY,
+  CURLE_FTP_WEIRD_SERVER_REPLY,
-  URG_FTP_ACCESS_DENIED,
+  CURLE_FTP_ACCESS_DENIED,
-  URG_FTP_USER_PASSWORD_INCORRECT,
+  CURLE_FTP_USER_PASSWORD_INCORRECT,
-  URG_FTP_WEIRD_PASS_REPLY,
+  CURLE_FTP_WEIRD_PASS_REPLY,
-  URG_FTP_WEIRD_USER_REPLY,
+  CURLE_FTP_WEIRD_USER_REPLY,
-  URG_FTP_WEIRD_PASV_REPLY,
+  CURLE_FTP_WEIRD_PASV_REPLY,
-  URG_FTP_WEIRD_227_FORMAT,
+  CURLE_FTP_WEIRD_227_FORMAT,
-  URG_FTP_CANT_GET_HOST,
+  CURLE_FTP_CANT_GET_HOST,
-  URG_FTP_CANT_RECONNECT,
+  CURLE_FTP_CANT_RECONNECT,
-  URG_FTP_COULDNT_SET_BINARY,
+  CURLE_FTP_COULDNT_SET_BINARY,
-  URG_PARTIAL_FILE,
+  CURLE_PARTIAL_FILE,
-  URG_FTP_COULDNT_RETR_FILE,
+  CURLE_FTP_COULDNT_RETR_FILE,
-  URG_FTP_WRITE_ERROR,
+  CURLE_FTP_WRITE_ERROR,
-  URG_FTP_QUOTE_ERROR,
+  CURLE_FTP_QUOTE_ERROR,
-  URG_HTTP_NOT_FOUND,
+  CURLE_HTTP_NOT_FOUND,
-  URG_WRITE_ERROR,
+  CURLE_WRITE_ERROR,
-  URG_MALFORMAT_USER, /* the user name is illegally specified */
+  CURLE_MALFORMAT_USER, /* the user name is illegally specified */
-  URG_FTP_COULDNT_STOR_FILE, /* failed FTP upload */
+  CURLE_FTP_COULDNT_STOR_FILE, /* failed FTP upload */
-  URG_READ_ERROR, /* could open/read from file */
+  CURLE_READ_ERROR, /* could open/read from file */
-  URG_OUT_OF_MEMORY,
+  CURLE_OUT_OF_MEMORY,
-  URG_OPERATION_TIMEOUTED, /* the timeout time was reached */
+  CURLE_OPERATION_TIMEOUTED, /* the timeout time was reached */
-  URG_FTP_COULDNT_SET_ASCII, /* TYPE A failed */
+  CURLE_FTP_COULDNT_SET_ASCII, /* TYPE A failed */
-  URG_FTP_PORT_FAILED, /* FTP PORT operation failed */
+  CURLE_FTP_PORT_FAILED, /* FTP PORT operation failed */
-  URG_FTP_COULDNT_USE_REST, /* the REST command failed */
+  CURLE_FTP_COULDNT_USE_REST, /* the REST command failed */
-  URG_FTP_COULDNT_GET_SIZE, /* the SIZE command failed */
+  CURLE_FTP_COULDNT_GET_SIZE, /* the SIZE command failed */
-  URG_HTTP_RANGE_ERROR, /* The RANGE "command" didn't seem to work */
+  CURLE_HTTP_RANGE_ERROR, /* The RANGE "command" didn't seem to work */
-  URG_HTTP_POST_ERROR,
+  CURLE_HTTP_POST_ERROR,
-  URG_SSL_CONNECT_ERROR, /* something was wrong when connecting with SSL */
+  CURLE_SSL_CONNECT_ERROR, /* something was wrong when connecting with SSL */
-  URG_FTP_BAD_DOWNLOAD_RESUME, /* couldn't resume download */
+  CURLE_FTP_BAD_DOWNLOAD_RESUME, /* couldn't resume download */
-  URG_FILE_COULDNT_READ_FILE,
+  CURLE_FILE_COULDNT_READ_FILE,
-  URG_LDAP_CANNOT_BIND,
+  CURLE_LDAP_CANNOT_BIND,
-  URG_LDAP_SEARCH_FAILED,
+  CURLE_LDAP_SEARCH_FAILED,
-  URG_LIBRARY_NOT_FOUND,
+  CURLE_LIBRARY_NOT_FOUND,
-  URG_FUNCTION_NOT_FOUND,
+  CURLE_FUNCTION_NOT_FOUND,
  CURLE_ABORTED_BY_CALLBACK,
  CURLE_BAD_FUNCTION_ARGUMENT,
  CURLE_BAD_CALLING_ORDER,
-  URL_LAST
+  CURLE_HTTP_PORT_FAILED, /* HTTP Interface operation failed */
-} UrgError;
+
  CURLE_BAD_PASSWORD_ENTERED, /* when the my_getpass() returns fail */
  CURLE_TOO_MANY_REDIRECTS , /* catch endless re-direct loops */
  CURL_LAST
 } CURLcode;
 /* 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. */
-  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),
 #if 0
  /* Configuration flags */
-  T(FLAGS, LONG, 8),
+  CINIT(FLAGS, LONG, 8),
-
+#endif
  /* 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 +257,157 @@ 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 */
-  T(SSLCERTPASSWD, OBJECTPOINT, 26),
+  CINIT(SSLCERTPASSWD, 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 */
-  T(WRITEHEADER, OBJECTPOINT, 29),
+  CINIT(WRITEHEADER, OBJECTPOINT, 29),
 #ifdef MULTIDOC
  /* send linked list of MoreDoc structs */
-  T(MOREDOCS, OBJECTPOINT, 30),
+  CINIT(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 */
-  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
     one defined today is 1 which makes the #-style progress bar. */
  T(PROGRESSMODE, LONG, 38),
 #if 0
  /* Progress mode set alternative progress mode displays. Alternative
     ones should now be made by the client, not the lib! */     
  CINIT(PROGRESSMODE, LONG, 38),
 #endif
  /* send linked-list of post-transfer QUOTE commands */
-  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 */
-#define CURL_PROGRESS_STATS 0 /* default progress display */
+  CINIT(FTPAPPEND, LONG, 50),    /* Append instead of overwrite on upload! */
-#define CURL_PROGRESS_BAR   1
+  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),         /* force NOPROGRESS */
  /* 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),
  CURLOPT_LASTENTRY /* the last unusued */
 } CURLoption;
 typedef enum {
  TIMECOND_NONE,
@@ -382,45 +421,41 @@ typedef enum {
 #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 */
+/* cleanup a form: */
-char *curl_GetEnv(char *variable);
+void curl_formfree(struct HttpPost *form);
-/* returns ascii string of the libcurl version */
+/* Unix and Win32 getenv function call, this returns a malloc()'ed string that
   MUST be free()ed after usage is complete. */
 char *curl_getenv(char *variable);
 /* Returns a static ascii string of the libcurl version. */
 char *curl_version(void);
 /* This is the version number */
-#define LIBCURL_VERSION "6.5"
+#define LIBCURL_VERSION "7.6.1-pre3"
 #define LIBCURL_VERSION_NUM 0x070601
-/* linked-list structure for QUOTE */
+/* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
 	char			*data;
 	struct curl_slist	*next;
@@ -429,4 +464,240 @@ struct curl_slist {
 struct curl_slist *curl_slist_append(struct curl_slist *list, char *data);
 void curl_slist_free_all(struct curl_slist *list);
-#endif /* __URLGET_H */
+/*
 * NAME	curl_init()
 *
 * DESCRIPTION
 *
 * Inits libcurl globally. This must be used before any libcurl calls can
 * be used. This may install global plug-ins or whatever. (This does not
 * do winsock inits in Windows.)
 *
 * EXAMPLE
 *
 * curl_init();
 *
 */
 CURLcode curl_init(void);
 /*
 * NAME	curl_init()
 *
 * DESCRIPTION
 *
 * Frees libcurl globally. This must be used after all libcurl calls have
 * been used. This may remove global plug-ins or whatever. (This does not
 * do winsock cleanups in Windows.)
 *
 * EXAMPLE
 *
 * curl_free(curl);
 *
 */
 void curl_free(void);
 /*
 * NAME curl_open()
 *
 * DESCRIPTION
 *
 * Opens a general curl session. It does not try to connect or do anything
 * on the network because of this call. The specified URL is only required
 * to enable curl to figure out what protocol to "activate".
 *
 * A session should be looked upon as a series of requests to a single host.  A
 * session interacts with one host only, using one single protocol.
 *
 * The URL is not required. If set to "" or NULL, it can still be set later
 * using the curl_setopt() function. If the curl_connect() function is called
 * without the URL being known, it will return error.
 *
 * EXAMPLE
 *
 * CURLcode result;
 * CURL *curl;
 * result = curl_open(&curl, "http://curl.haxx.nu/libcurl/");
 * if(result != CURL_OK) {
 *   return result;
 * }
 * */
 CURLcode curl_open(CURL **curl, char *url);
 /*
 * NAME curl_setopt()
 *
 * DESCRIPTION
 *
 * Sets a particular option to the specified value.
 *
 * EXAMPLE
 *
 * CURL curl;
 * curl_setopt(curl, CURL_HTTP_FOLLOW_LOCATION, TRUE);
 */
 CURLcode curl_setopt(CURL *handle, CURLoption option, ...);
 /*
 * NAME curl_close()
 *
 * DESCRIPTION
 *
 * Closes a session previously opened with curl_open()
 *
 * EXAMPLE
 *
 * CURL *curl;
 * CURLcode result;
 *
 * result = curl_close(curl);
 */
 CURLcode curl_close(CURL *curl); /* the opposite of curl_open() */
 CURLcode curl_read(CURLconnect *c_conn, char *buf, size_t buffersize,
                   ssize_t *n);
 CURLcode curl_write(CURLconnect *c_conn, char *buf, size_t amount,
                    size_t *n);
 /*
 * NAME curl_connect()
 *
 * DESCRIPTION
 *
 * Connects to the peer server and performs the initial setup. This function
 * writes a connect handle to its second argument that is a unique handle for
 * this connect. This allows multiple connects from the same handle returned
 * by curl_open().
 *
 * EXAMPLE
 *
 * CURLCode result;
 * CURL curl;
 * CURLconnect connect;
 * result = curl_connect(curl, &connect);
 */
 CURLcode curl_connect(CURL *curl, CURLconnect **in_connect);
 /*
 * NAME curl_do()
 *
 * DESCRIPTION
 *
 * (Note: May 3rd 2000: this function does not currently allow you to
 * specify a document, it will use the one set previously)
 *
 * This function asks for the particular document, file or resource that
 * resides on the server we have connected to. You may specify a full URL,
 * just an absolute path or even a relative path. That means, if you're just
 * getting one file from the remote site, you can use the same URL as input
 * for both curl_open() as well as for this function.
 *
 * In the even there is a host name, port number, user name or password parts
 * in the URL, you can use the 'flags' argument to ignore them completely, or
 * at your choice, make the function fail if you're trying to get a URL from
 * different host than you connected to with curl_connect().
 *
 * You can only get one document at a time using the same connection. When one
 * document has been received you can although request again.
 *
 * When the transfer is done, curl_done() MUST be called.
 *
 * EXAMPLE
 *
 * CURLCode result;
 * char *url;
 * CURLconnect *connect;
 * result = curl_do(connect, url, CURL_DO_NONE); */
 CURLcode curl_do(CURLconnect *in_conn);
 /*
 * NAME curl_done()
 *
 * DESCRIPTION
 *
 * When the transfer following a curl_do() call is done, this function should
 * get called.
 *
 * EXAMPLE
 *
 * CURLCode result;
 * char *url;
 * CURLconnect *connect;
 * result = curl_done(connect); */
 CURLcode curl_done(CURLconnect *connect);
 /*
 * NAME curl_disconnect()
 *
 * DESCRIPTION
 *
 * Disconnects from the peer server and performs connection cleanup.
 *
 * EXAMPLE
 *
 * CURLcode result;
 * CURLconnect *connect;
 * result = curl_disconnect(connect); */
 CURLcode curl_disconnect(CURLconnect *connect);
 /*
 * 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_LASTONE          = 17
 } CURLINFO;
 /*
 * NAME curl_getinfo()
 *
 * DESCRIPTION
 *
 * Request internal information from the curl session with this function.
 * The third argument MUST be a pointer to a long or a pointer to a char *.
 * 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 are undefined before the transfer is completed.
 */
 CURLcode curl_getinfo(CURL *curl, CURLINFO info, ...);
 #ifdef  __cplusplus
 }
 #endif
 #endif /* __CURL_CURL_H */
--- a/include/curl/easy.h
+++ b/include/curl/easy.h
@@ -0,0 +1,53 @@
 #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, ...);
 #ifdef  __cplusplus
 }
 #endif
 #endif
--- 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):
 *
 *************************************************************************
 *
@@ -68,26 +55,28 @@
 #include <stdarg.h>
-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/include/curl/types.h
+++ b/include/curl/types.h
@@ -0,0 +1,28 @@
 #ifndef __CURL_TYPES_H
 #define __CURL_TYPES_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$
 *****************************************************************************/
 typedef void CURL;
 typedef void CURLconnect;
 #endif /* __CURL_TYPES_H */
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,16 +2,50 @@
 # $Id$
 #
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libcurl.a
+EXTRA_DIST = getdate.y \
       Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \
       libcurl.def dllinit.c
 lib_LTLIBRARIES = libcurl.la
 # Some flags needed when trying to cause warnings ;-)
-CFLAGS = -g #-Wall -pedantic
+# CFLAGS = -DMALLOCDEBUG -g # -Wall #-pedantic
 INCLUDES = -I$(top_srcdir)/include
-libcurl_a_SOURCES = \
+
 libcurl_la_LDFLAGS = -version-info 1:0:0
 # This flag accepts an argument of the form current[:revision[:age]]. So,
 # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
 # 1.
 #
 # If either revision or age are omitted, they default to 0. Also note that age
 # must be less than or equal to the current interface number.
 #
 # Here are a set of rules to help you update your library version information: 
 #
 # 1.Start with version information of 0:0:0 for each libtool library.
 #
 # 2.Update the version information only immediately before a public release of
 # your software. More frequent updates are unnecessary, and only guarantee
 # that the current interface number gets larger faster.
 #
 # 3.If the library source code has changed at all since the last update, then
 # increment revision (c:r:a becomes c:r+1:a).
 #
 # 4.If any interfaces have been added, removed, or changed since the last
 # update, increment current, and set revision to 0.
 #
 # 5.If any interfaces have been added since the last public release, then
 # increment age.
 #
 # 6.If any interfaces have been removed since the last public release, then
 # set age to 0.
 #
 libcurl_la_SOURCES = \
 arpa_telnet.h  file.c         getpass.h      netrc.h        timeval.c \
 base64.c       file.h         hostip.c       progress.c     timeval.h \
 base64.h       formdata.c     hostip.h       progress.h     \
@@ -19,11 +53,14 @@ cookie.c       formdata.h     http.c         sendf.c        \
 cookie.h       ftp.c          http.h         sendf.h        url.c \
 dict.c         ftp.h          if2ip.c        speedcheck.c   url.h \
 dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h \
-download.c     getdate.h      ldap.c         ssluse.c       version.c \
+getdate.h      ldap.c         ssluse.c       version.c \
-download.h     getenv.c       ldap.h         ssluse.h       \
+getenv.c       ldap.h         ssluse.h       \
 escape.c       getenv.h       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
-writeout.c writeout.h
+getinfo.c transfer.c strequal.c strequal.h easy.c \
 security.h security.c krb4.c krb4.h memdebug.c memdebug.h inet_ntoa_r.h
 noinst_HEADERS = setup.h transfer.h
 # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
 $(srcdir)/getdate.c: getdate.y
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -0,0 +1,74 @@
 ############################################################
 #  Makefile.b32 - Borland's C++ Compiler 5.X
 #
 #  'lib' directory
 #
 #  Requires 'Makefile.b32.resp'
 #
 #  Written by Jaepil Kim, pit@paradise.net.nz
 ############################################################
 # Setup environment
 CXX	   = bcc32
 RM	   = del
 LIB	   = tlib
 TOPDIR	   = ..
 CURNTDIR   = .
 CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro
 DEFINES    = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS
 INCDIRS    = -I$(CURNTDIR);$(TOPDIR)/include/
 # 'BCCDIR' has to be set up in your c:\autoexec.bat
 # i.e. SET BCCDIR = c:\Borland\BCC55
 # where c:\Borland\BCC55 is the compiler is installed
 LINKLIB	   = $(BCCDIR)/lib/psdk/wsock32.lib
 LIBCURLLIB = libcurl.lib
 .SUFFIXES: .c
 SOURCES	   = \
 	base64.c \
 	cookie.c \
 	transfer.c \
 	escape.c \
 	formdata.c \
 	ftp.c \
 	http.c \
 	ldap.c \
 	dict.c \
 	telnet.c \
 	getdate.c \
 	getenv.c \
 	getpass.c \
 	hostip.c \
 	if2ip.c \
 	mprintf.c \
 	netrc.c \
 	progress.c \
 	sendf.c \
 	speedcheck.c \
 	ssluse.c \
 	timeval.c \
 	url.c \
 	file.c \
 	getinfo.c \
 	version.c \
 	easy.c \
 	strequal.c
 OBJECTS = $(SOURCES:.c=.obj)
 .c.obj:
 	$(CXX) -c $(INCDIRS) $(CXXFLAGS) $(DEFINES) $<
 all:	$(LIBCURLLIB)
 clean:
 	$(RM) $(LIBCURLLIB)
        $(RM) *.obj
 $(LIBCURLLIB):  $(LINKLIB) $(OBJECTS) Makefile.b32.resp
 	$(RM) $(LIBCURLLIB)
 	$(LIB) $(LIBCURLLIB) @Makefile.b32.resp
--- a/lib/Makefile.b32.resp
+++ b/lib/Makefile.b32.resp
@@ -0,0 +1,28 @@
 +base64.obj &
 +cookie.obj &
 +transfer.obj &
 +escape.obj &
 +formdata.obj &
 +ftp.obj &
 +http.obj &
 +ldap.obj &
 +dict.obj &
 +telnet.obj &
 +getdate.obj &
 +getenv.obj &
 +getpass.obj &
 +hostip.obj &
 +if2ip.obj &
 +mprintf.obj &
 +netrc.obj &
 +progress.obj &
 +sendf.obj &
 +speedcheck.obj &
 +ssluse.obj &
 +timeval.obj &
 +url.obj &
 +file.obj &
 +getinfo.obj &
 +version.obj &
 +easy.obj &
 +strequal.obj
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,281 +0,0 @@
 # Makefile.in generated automatically by automake 1.4 from Makefile.am
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 #
 # $Id$
 #
 SHELL = @SHELL@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 sbindir = @sbindir@
 libexecdir = @libexecdir@
 datadir = @datadir@
 sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
 libdir = @libdir@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 DESTDIR =
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 CC = @CC@
 MAKEINFO = @MAKEINFO@
 NROFF = @NROFF@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 YACC = @YACC@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 noinst_LIBRARIES = libcurl.a
 # Some flags needed when trying to cause warnings ;-)
 CFLAGS = -g #-Wall -pedantic
 INCLUDES = -I$(top_srcdir)/include
 libcurl_a_SOURCES =  arpa_telnet.h  file.c         getpass.h      netrc.h        timeval.c base64.c       file.h         hostip.c       progress.c     timeval.h base64.h       formdata.c     hostip.h       progress.h     cookie.c       formdata.h     http.c         sendf.c        cookie.h       ftp.c          http.h         sendf.h        url.c dict.c         ftp.h          if2ip.c        speedcheck.c   url.h dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h download.c     getdate.h      ldap.c         ssluse.c       version.c download.h     getenv.c       ldap.h         ssluse.h       escape.c       getenv.h       mprintf.c      telnet.c       escape.h       getpass.c      netrc.c        telnet.h       writeout.c writeout.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h ../src/config.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../src
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libcurl_a_LIBADD = 
 libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
 formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
 speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
 escape.o mprintf.o telnet.o getpass.o netrc.o writeout.o
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libcurl_a_SOURCES)
 OBJECTS = $(libcurl_a_OBJECTS)
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps lib/Makefile
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 mostlyclean-noinstLIBRARIES:
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 distclean-noinstLIBRARIES:
 maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 .s.o:
 	$(COMPILE) -c $<
 .S.o:
 	$(COMPILE) -c $<
 mostlyclean-compile:
 	-rm -f *.o core *.core
 clean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 maintainer-clean-compile:
 libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
 	-rm -f libcurl.a
 	$(AR) cru libcurl.a $(libcurl_a_OBJECTS) $(libcurl_a_LIBADD)
 	$(RANLIB) libcurl.a
 tags: TAGS
 ID: $(HEADERS) $(SOURCES) $(LISP)
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	here=`pwd` && cd $(srcdir) \
 	  && mkid -f$$here/ID $$unique $(LISP)
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 mostlyclean-tags:
 clean-tags:
 distclean-tags:
 	-rm -f TAGS ID
 maintainer-clean-tags:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = lib
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
 	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
 info-am:
 info: info-am
 dvi-am:
 dvi: dvi-am
 check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
 install-exec-am:
 install-exec: install-exec-am
 install-data-am:
 install-data: install-data-am
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 mostlyclean-generic:
 clean-generic:
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-tags mostlyclean-generic
 mostlyclean: mostlyclean-am
 clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
 		mostlyclean-am
 clean: clean-am
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-tags distclean-generic clean-am
 distclean: distclean-am
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
 		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 maintainer-clean: maintainer-clean-am
 .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
 check-am installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
 $(srcdir)/getdate.c: getdate.y
 	cd $(srcdir) && \
 	  $(YACC) $(YFLAGS) getdate.y; \
 	  mv -f y.tab.c getdate.c
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,67 +1,81 @@
-#############################################################
+#############################################################
-## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
+## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
-## optionally OpenSSL (0.9.4)
+## optionally OpenSSL (0.9.6)
-## Use: make -f Makefile.m32
+## Use: make -f Makefile.m32
-##
+##
-## Comments to: Troy Engel <tengel@sonic.net> or
+## Comments to: Troy Engel <tengel@sonic.net> or
-##              Joern Hartroth <hartroth@acm.org>
+##              Joern Hartroth <hartroth@acm.org>
-
+
-CC = gcc
+CC = gcc
-AR = ar
+AR = ar
-RANLIB = ranlib
+RANLIB = ranlib
-OPENSSL_PATH = ../../openssl-0.9.4
+STRIP = strip -g
-
+OPENSSL_PATH = ../../openssl-0.9.6
-########################################################
+
-## Nothing more to do below this line!
+########################################################
-
+## Nothing more to do below this line!
-INCLUDES = -I. -I.. -I../include
+
-CFLAGS = -g -O2
+INCLUDES = -I. -I.. -I../include -I../src
-ifdef SSL
+CFLAGS = -g -O2 -DMINGW32
-  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
+ifdef SSL
-  CFLAGS += -DUSE_SSLEAY
+  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
-endif
+  CFLAGS += -DUSE_SSLEAY
-COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+  DLL_LIBS = -leay32 -lssl32 -lRSAglue
-
+endif
-libcurl_a_LIBRARIES = libcurl.a
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
-
+
-libcurl_a_SOURCES =  base64.c getenv.c if2ip.h progress.h  \
+libcurl_a_LIBRARIES = libcurl.a
-base64.h getenv.h mprintf.c setup.h url.c download.c getpass.c \
+
-mprintf.h ssluse.c url.h download.h hostip.c netrc.c ssluse.h \
+libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
-urldata.h formdata.c hostip.h netrc.h stdcheaders.h formdata.h \
+	file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h	\
-if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
+	cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c	\
-ftp.c ftp.h getpass.c getpass.h version.c timeval.c  timeval.h cookie.c \
+	ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h		\
-cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
+	urldata.h transfer.c getdate.h ldap.c ssluse.c version.c transfer.h getenv.c	\
-http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h
+	ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c	\
-
+	telnet.h getinfo.c strequal.c strequal.h easy.c security.h		\
-libcurl_a_OBJECTS =  base64.o getenv.o mprintf.o url.o download.o \
+	security.c krb4.c
-getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
+
-sendf.o speedcheck.o ftp.o getpass.o version.o timeval.o \
+libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
-cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o
+	formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
-
+	speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \
-LIBRARIES =  $(libcurl_a_LIBRARIES)
+	getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
-SOURCES = $(libcurl_a_SOURCES)
+	strequal.o easy.o security.o krb4.o
-OBJECTS = $(libcurl_a_OBJECTS)
+
-
+LIBRARIES =  $(libcurl_a_LIBRARIES)
-
+SOURCES = $(libcurl_a_SOURCES)
-all: libcurl.a
+OBJECTS = $(libcurl_a_OBJECTS)
-
+
-libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
+
-	-@erase libcurl.a
+all: libcurl.a libcurl.dll libcurldll.a
-	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
+
-	$(RANLIB) libcurl.a
+libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-
+	-@erase libcurl.a
-.c.o:
+	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
-	$(COMPILE) -c $<
+	$(RANLIB) libcurl.a
-
+	$(STRIP) $@
-.s.o:
+
-	$(COMPILE) -c $<
+# remove the last line above to keep debug info
-
+
-.S.o:
+libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
-	$(COMPILE) -c $<
+	-@erase $@
-
+	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32
-clean:
+	$(STRIP) $@
-	-@erase $(libcurl_a_OBJECTS)
+
-
+# remove the last line above to keep debug info
-distrib: clean
+
-	-@erase $(libcurl_a_LIBRARIES)
+.c.o:
-	
+	$(COMPILE) -c $<
 .s.o:
 	$(COMPILE) -c $<
 .S.o:
 	$(COMPILE) -c $<
 clean:
 	-@erase $(libcurl_a_OBJECTS)
 distrib: clean
 	-@erase $(libcurl_a_LIBRARIES)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -1,315 +1,347 @@
-#############################################################
+#############################################################
-## Makefile for building libcurl.lib with MSVC6
+## Makefile for building libcurl.lib with MSVC6
-## Use: nmake -f makefile.vc6 [release | release-ssl | debug]
+## Use: nmake -f makefile.vc6 [release | release-ssl | debug]
-##      (default is release)
+##      (default is release)
-##
+##
-## Comments to: Troy Engel <tengel@sonic.net>
+## Comments to: Troy Engel <tengel@sonic.net>
-
+## Updated by: Craig Davison <cd@securityfocus.com>
-PROGRAM_NAME = libcurl.lib
+
-OPENSSL_PATH = ../../openssl-0.9.3a
+PROGRAM_NAME = libcurl.lib
-
+PROGRAM_NAME_DEBUG = libcurld.lib
-########################################################
+OPENSSL_PATH = ../../openssl-0.9.6
-## Nothing more to do below this line!
+
-
+########################################################
-## Release
+## Nothing more to do below this line!
-CCR = cl.exe /ML /O2 /D "NDEBUG"
+
-LINKR = link.exe -lib
+## Release
-
+CCR = cl.exe /MD /O2 /D "NDEBUG"
-## Debug
+LINKR = link.exe -lib /out:$(PROGRAM_NAME)
-CCD = cl.exe /MLd /Gm /ZI /Od /D "_DEBUG" /GZ
+
-LINKD = link.exe -lib
+## Debug
-
+CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
-## SSL Release
+LINKD = link.exe -lib /out:$(PROGRAM_NAME_DEBUG)
-CCRS = cl.exe /ML /O2 /D "NDEBUG" /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
+
-LINKRS = link.exe -lib /LIBPATH:$(OPENSSL_PATH)/out32dll
+## SSL Release
-
+CCRS = cl.exe /MD /O2 /D "NDEBUG" /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/include" /I "$(OPENSSL_PATH)/include/openssl"
-CFLAGS = /nologo /W3 /GX /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+LINKRS = link.exe -lib /out:$(PROGRAM_NAME) /LIBPATH:$(OPENSSL_PATH)/out32dll
-LFLAGS = /nologo /out:$(PROGRAM_NAME)
+
-LINKLIBS = kernel32.lib wsock32.lib
+CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
-LINKSLIBS = libeay32.lib ssleay32.lib RSAglue.lib
+LFLAGS = /nologo
-
+LINKLIBS = wsock32.lib
-RELEASE_OBJS= \
+LINKSLIBS = libeay32.lib ssleay32.lib RSAglue.lib
-	base64r.obj \
+
-	cookier.obj \
+RELEASE_OBJS= \
-	downloadr.obj \
+	base64r.obj \
-	escaper.obj \
+	cookier.obj \
-	formdatar.obj \
+	transferr.obj \
-	ftpr.obj \
+	escaper.obj \
-	httpr.obj \
+	formdatar.obj \
-	dictr.obj \
+	ftpr.obj \
-	telnetr.obj \
+	httpr.obj \
-	getdater.obj \
+	ldapr.obj \
-	getenvr.obj \
+	dictr.obj \
-	getpassr.obj \
+	telnetr.obj \
-	hostipr.obj \
+	getdater.obj \
-	if2ipr.obj \
+	getenvr.obj \
-	mprintfr.obj \
+	getpassr.obj \
-	netrcr.obj \
+	hostipr.obj \
-	progressr.obj \
+	if2ipr.obj \
-	sendfr.obj \
+	mprintfr.obj \
-	speedcheckr.obj \
+	netrcr.obj \
-	ssluser.obj \
+	progressr.obj \
-	timevalr.obj \
+	sendfr.obj \
-	uploadr.obj \
+	speedcheckr.obj \
-	urlr.obj \
+	ssluser.obj \
-	filer.obj \
+	timevalr.obj \
-	versionr.obj
+	urlr.obj \
-
+	filer.obj \
-DEBUG_OBJS= \
+	getinfor.obj \
-	base64d.obj \
+	versionr.obj \
-	cookied.obj \
+	easyr.obj \
-	downloadd.obj \
+	strequalr.obj
-	escaped.obj \
+
-	formdatad.obj \
+DEBUG_OBJS= \
-	ftpd.obj \
+	base64d.obj \
-	httpd.obj \
+	cookied.obj \
-	dictd.obj \
+	transferd.obj \
-	telnetd.obj \
+	escaped.obj \
-	getdated.obj \
+	formdatad.obj \
-	getenvd.obj \
+	ftpd.obj \
-	getpassd.obj \
+	httpd.obj \
-	hostipd.obj \
+	ldapd.obj \
-	if2ipd.obj \
+	dictd.obj \
-	mprintfd.obj \
+	telnetd.obj \
-	netrcd.obj \
+	getdated.obj \
-	progressd.obj \
+	getenvd.obj \
-	sendfd.obj \
+	getpassd.obj \
-	speedcheckd.obj \
+	hostipd.obj \
-	sslused.obj \
+	if2ipd.obj \
-	timevald.obj \
+	mprintfd.obj \
-	uploadd.obj \
+	netrcd.obj \
-	urld.obj \
+	progressd.obj \
-	filed.obj \
+	sendfd.obj \
-	versiond.obj
+	speedcheckd.obj \
-
+	sslused.obj \
-RELEASE_SSL_OBJS= \
+	timevald.obj \
-	base64rs.obj \
+	urld.obj \
-	cookiers.obj \
+	filed.obj \
-	downloadrs.obj \
+	getinfod.obj \
-	escapers.obj \
+	versiond.obj  \
-	formdatars.obj \
+	easyd.obj \
-	ftprs.obj \
+	strequald.obj
-	httprs.obj \
+
-	dictrs.obj \
+RELEASE_SSL_OBJS= \
-	telnetrs.obj \
+	base64rs.obj \
-	getdaters.obj \
+	cookiers.obj \
-	getenvrs.obj \
+	transferrs.obj \
-	getpassrs.obj \
+	escapers.obj \
-	hostiprs.obj \
+	formdatars.obj \
-	if2iprs.obj \
+	ftprs.obj \
-	mprintfrs.obj \
+	httprs.obj \
-	netrcrs.obj \
+	ldaprs.obj \
-	progressrs.obj \
+	dictrs.obj \
-	sendfrs.obj \
+	telnetrs.obj \
-	speedcheckrs.obj \
+	getdaters.obj \
-	sslusers.obj \
+	getenvrs.obj \
-	timevalrs.obj \
+	getpassrs.obj \
-	uploadrs.obj \
+	hostiprs.obj \
-	urlrs.obj \
+	if2iprs.obj \
-	filers.obj \
+	mprintfrs.obj \
-	versionrs.obj
+	netrcrs.obj \
-
+	progressrs.obj \
-LINK_OBJS= \
+	sendfrs.obj \
-	base64.obj \
+	speedcheckrs.obj \
-	cookie.obj \
+	sslusers.obj \
-	download.obj \
+	timevalrs.obj \
-	escape.obj \
+	urlrs.obj \
-	formdata.obj \
+	filers.obj \
-	ftp.obj \
+	getinfors.obj \
-	http.obj \
+	versionrs.obj \
-	dict.obj \
+	easyrs.obj \
-	telnet.obj \
+	strequalrs.obj
-	getdate.obj \
+
-	getenv.obj \
+LINK_OBJS= \
-	getpass.obj \
+	base64.obj \
-	hostip.obj \
+	cookie.obj \
-	if2ip.obj \
+	transfer.obj \
-	mprintf.obj \
+	escape.obj \
-	netrc.obj \
+	formdata.obj \
-	progress.obj \
+	ftp.obj \
-	sendf.obj \
+	http.obj \
-	speedcheck.obj \
+	ldap.obj \
-	ssluse.obj \
+	dict.obj \
-	timeval.obj \
+	telnet.obj \
-	upload.obj \
+	getdate.obj \
-	url.obj \
+	getenv.obj \
-	file.obj \
+	getpass.obj \
-	version.obj
+	hostip.obj \
-
+	if2ip.obj \
-all : release
+	mprintf.obj \
-
+	netrc.obj \
-release: $(RELEASE_OBJS)
+	progress.obj \
-	$(LINKR) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
+	sendf.obj \
-
+	speedcheck.obj \
-debug: $(DEBUG_OBJS)
+	ssluse.obj \
-	$(LINKD) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
+	timeval.obj \
-
+	url.obj \
-release-ssl: $(RELEASE_SSL_OBJS)
+	file.obj \
-	$(LINKRS) $(LFLAGS) $(LINKLIBS) $(LINKSLIBS) $(LINK_OBJS)
+	getinfo.obj \
-
+	version.obj \
-
+	easy.obj \
-## Release
+	strequal.obj
-base64r.obj: base64.c
+
-	$(CCR) $(CFLAGS) base64.c
+all : release
-cookier.obj: cookie.c
+
-	$(CCR) $(CFLAGS) cookie.c
+release: $(RELEASE_OBJS)
-downloadr.obj: download.c
+	$(LINKR) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
-	$(CCR) $(CFLAGS) download.c
+
-escaper.obj: escape.c
+debug: $(DEBUG_OBJS)
-	$(CCR) $(CFLAGS) escape.c
+	$(LINKD) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
-formdatar.obj: formdata.c
+
-	$(CCR) $(CFLAGS) formdata.c
+release-ssl: $(RELEASE_SSL_OBJS)
-ftpr.obj: ftp.c
+	$(LINKRS) $(LFLAGS) $(LINKLIBS) $(LINKSLIBS) $(LINK_OBJS)
-	$(CCR) $(CFLAGS) ftp.c
+
-httpr.obj: http.c
+## Release
-	$(CCR) $(CFLAGS) http.c
+base64r.obj: base64.c
-dictr.obj: dict.c
+	$(CCR) $(CFLAGS) base64.c
-	$(CCR) $(CFLAGS) dict.c
+cookier.obj: cookie.c
-telnetr.obj: telnet.c
+	$(CCR) $(CFLAGS) cookie.c
-	$(CCR) $(CFLAGS) telnet.c
+transferr.obj: transfer.c
-getdater.obj: getdate.c
+	$(CCR) $(CFLAGS) transfer.c
-	$(CCR) $(CFLAGS) getdate.c
+escaper.obj: escape.c
-getenvr.obj: getenv.c
+	$(CCR) $(CFLAGS) escape.c
-	$(CCR) $(CFLAGS) getenv.c
+formdatar.obj: formdata.c
-getpassr.obj: getpass.c
+	$(CCR) $(CFLAGS) formdata.c
-	$(CCR) $(CFLAGS) getpass.c
+ftpr.obj: ftp.c
-hostipr.obj: hostip.c
+	$(CCR) $(CFLAGS) ftp.c
-	$(CCR) $(CFLAGS) hostip.c
+httpr.obj: http.c
-if2ipr.obj: if2ip.c
+	$(CCR) $(CFLAGS) http.c
-	$(CCR) $(CFLAGS) if2ip.c
+ldapr.obj: ldap.c
-mprintfr.obj: mprintf.c
+	$(CCR) $(CFLAGS) ldap.c
-	$(CCR) $(CFLAGS) mprintf.c
+dictr.obj: dict.c
-netrcr.obj: netrc.c
+	$(CCR) $(CFLAGS) dict.c
-	$(CCR) $(CFLAGS) netrc.c
+telnetr.obj: telnet.c
-progressr.obj: progress.c
+	$(CCR) $(CFLAGS) telnet.c
-	$(CCR) $(CFLAGS) progress.c
+getdater.obj: getdate.c
-sendfr.obj: sendf.c
+	$(CCR) $(CFLAGS) getdate.c
-	$(CCR) $(CFLAGS) sendf.c
+getenvr.obj: getenv.c
-speedcheckr.obj: speedcheck.c
+	$(CCR) $(CFLAGS) getenv.c
-	$(CCR) $(CFLAGS) speedcheck.c
+getpassr.obj: getpass.c
-ssluser.obj: ssluse.c
+	$(CCR) $(CFLAGS) getpass.c
-	$(CCR) $(CFLAGS) ssluse.c
+hostipr.obj: hostip.c
-timevalr.obj: timeval.c
+	$(CCR) $(CFLAGS) hostip.c
-	$(CCR) $(CFLAGS) timeval.c
+if2ipr.obj: if2ip.c
-uploadr.obj: upload.c
+	$(CCR) $(CFLAGS) if2ip.c
-	$(CCR) $(CFLAGS) upload.c
+mprintfr.obj: mprintf.c
-urlr.obj: url.c
+	$(CCR) $(CFLAGS) mprintf.c
-	$(CCR) $(CFLAGS) url.c
+netrcr.obj: netrc.c
-filer.obj: file.c
+	$(CCR) $(CFLAGS) netrc.c
-	$(CCR) $(CFLAGS) file.c
+progressr.obj: progress.c
-versionr.obj: version.c
+	$(CCR) $(CFLAGS) progress.c
-	$(CCR) $(CFLAGS) version.c
+sendfr.obj: sendf.c
-
+	$(CCR) $(CFLAGS) sendf.c
-## Debug
+speedcheckr.obj: speedcheck.c
-base64d.obj: base64.c
+	$(CCR) $(CFLAGS) speedcheck.c
-	$(CCD) $(CFLAGS) base64.c
+ssluser.obj: ssluse.c
-cookied.obj: cookie.c
+	$(CCR) $(CFLAGS) ssluse.c
-	$(CCD) $(CFLAGS) cookie.c
+timevalr.obj: timeval.c
-downloadd.obj: download.c
+	$(CCR) $(CFLAGS) timeval.c
-	$(CCD) $(CFLAGS) download.c
+urlr.obj: url.c
-escaped.obj: escape.c
+	$(CCR) $(CFLAGS) url.c
-	$(CCD) $(CFLAGS) escape.c
+filer.obj: file.c
-formdatad.obj: formdata.c
+	$(CCR) $(CFLAGS) file.c
-	$(CCD) $(CFLAGS) formdata.c
+getinfor.obj: getinfo.c
-ftpd.obj: ftp.c
+	$(CCR) $(CFLAGS) getinfo.c
-	$(CCD) $(CFLAGS) ftp.c
+versionr.obj: version.c
-httpd.obj: http.c
+	$(CCR) $(CFLAGS) version.c
-	$(CCD) $(CFLAGS) http.c
+easyr.obj: easy.c
-dictd.obj: dict.c
+	$(CCR) $(CFLAGS) easy.c
-	$(CCD) $(CFLAGS) dict.c
+strequalr.obj: strequal.c
-telnetd.obj: telnet.c
+	$(CCR) $(CFLAGS) strequal.c
-	$(CCD) $(CFLAGS) telnet.c
+
-getdated.obj: getdate.c
+## Debug
-	$(CCD) $(CFLAGS) getdate.c
+base64d.obj: base64.c
-getenvd.obj: getenv.c
+	$(CCD) $(CFLAGS) base64.c
-	$(CCD) $(CFLAGS) getenv.c
+cookied.obj: cookie.c
-getpassd.obj: getpass.c
+	$(CCD) $(CFLAGS) cookie.c
-	$(CCD) $(CFLAGS) getpass.c
+transferd.obj: transfer.c
-hostipd.obj: hostip.c
+	$(CCD) $(CFLAGS) transfer.c
-	$(CCD) $(CFLAGS) hostip.c
+escaped.obj: escape.c
-if2ipd.obj: if2ip.c
+	$(CCD) $(CFLAGS) escape.c
-	$(CCD) $(CFLAGS) if2ip.c
+formdatad.obj: formdata.c
-mprintfd.obj: mprintf.c
+	$(CCD) $(CFLAGS) formdata.c
-	$(CCD) $(CFLAGS) mprintf.c
+ftpd.obj: ftp.c
-netrcd.obj: netrc.c
+	$(CCD) $(CFLAGS) ftp.c
-	$(CCD) $(CFLAGS) netrc.c
+httpd.obj: http.c
-progressd.obj: progress.c
+	$(CCD) $(CFLAGS) http.c
-	$(CCD) $(CFLAGS) progress.c
+ldapd.obj: ldap.c
-sendfd.obj: sendf.c
+	$(CCD) $(CFLAGS) ldap.c
-	$(CCD) $(CFLAGS) sendf.c
+dictd.obj: dict.c
-speedcheckd.obj: speedcheck.c
+	$(CCD) $(CFLAGS) dict.c
-	$(CCD) $(CFLAGS) speedcheck.c
+telnetd.obj: telnet.c
-sslused.obj: ssluse.c
+	$(CCD) $(CFLAGS) telnet.c
-	$(CCD) $(CFLAGS) ssluse.c
+getdated.obj: getdate.c
-timevald.obj: timeval.c
+	$(CCD) $(CFLAGS) getdate.c
-	$(CCD) $(CFLAGS) timeval.c
+getenvd.obj: getenv.c
-uploadd.obj: upload.c
+	$(CCD) $(CFLAGS) getenv.c
-	$(CCD) $(CFLAGS) upload.c
+getpassd.obj: getpass.c
-urld.obj: url.c
+	$(CCD) $(CFLAGS) getpass.c
-	$(CCD) $(CFLAGS) url.c
+hostipd.obj: hostip.c
-filed.obj: file.c
+	$(CCD) $(CFLAGS) hostip.c
-	$(CCD) $(CFLAGS) file.c
+if2ipd.obj: if2ip.c
-versiond.obj: version.c
+	$(CCD) $(CFLAGS) if2ip.c
-	$(CCD) $(CFLAGS) version.c
+mprintfd.obj: mprintf.c
-
+	$(CCD) $(CFLAGS) mprintf.c
-
+netrcd.obj: netrc.c
-## Release SSL
+	$(CCD) $(CFLAGS) netrc.c
-base64rs.obj: base64.c
+progressd.obj: progress.c
-	$(CCRS) $(CFLAGS) base64.c
+	$(CCD) $(CFLAGS) progress.c
-cookiers.obj: cookie.c
+sendfd.obj: sendf.c
-	$(CCRS) $(CFLAGS) cookie.c
+	$(CCD) $(CFLAGS) sendf.c
-downloadrs.obj: download.c
+speedcheckd.obj: speedcheck.c
-	$(CCRS) $(CFLAGS) download.c
+	$(CCD) $(CFLAGS) speedcheck.c
-escapers.obj: escape.c
+sslused.obj: ssluse.c
-	$(CCRS) $(CFLAGS) escape.c
+	$(CCD) $(CFLAGS) ssluse.c
-formdatars.obj: formdata.c
+timevald.obj: timeval.c
-	$(CCRS) $(CFLAGS) formdata.c
+	$(CCD) $(CFLAGS) timeval.c
-ftprs.obj: ftp.c
+urld.obj: url.c
-	$(CCRS) $(CFLAGS) ftp.c
+	$(CCD) $(CFLAGS) url.c
-httprs.obj: http.c
+filed.obj: file.c
-	$(CCRS) $(CFLAGS) http.c
+	$(CCD) $(CFLAGS) file.c
-dictrs.obj: dict.c
+getinfod.obj: getinfo.c
-	$(CCRS) $(CFLAGS) dict.c
+	$(CCD) $(CFLAGS) getinfo.c
-telnetrs.obj: telnet.c
+versiond.obj: version.c
-	$(CCRS) $(CFLAGS) telnet.c
+	$(CCD) $(CFLAGS) version.c
-getdaters.obj: getdate.c
+easyd.obj: easy.c
-	$(CCRS) $(CFLAGS) getdate.c
+	$(CCD) $(CFLAGS) easy.c
-getenvrs.obj: getenv.c
+strequald.obj: strequal.c
-	$(CCRS) $(CFLAGS) getenv.c
+	$(CCD) $(CFLAGS) strequal.c
-getpassrs.obj: getpass.c
+
-	$(CCRS) $(CFLAGS) getpass.c
+
-hostiprs.obj: hostip.c
+## Release SSL
-	$(CCRS) $(CFLAGS) hostip.c
+base64rs.obj: base64.c
-if2iprs.obj: if2ip.c
+	$(CCRS) $(CFLAGS) base64.c
-	$(CCRS) $(CFLAGS) if2ip.c
+cookiers.obj: cookie.c
-mprintfrs.obj: mprintf.c
+	$(CCRS) $(CFLAGS) cookie.c
-	$(CCRS) $(CFLAGS) mprintf.c
+transferrs.obj: transfer.c
-netrcrs.obj: netrc.c
+	$(CCRS) $(CFLAGS) transfer.c
-	$(CCRS) $(CFLAGS) netrc.c
+escapers.obj: escape.c
-progressrs.obj: progress.c
+	$(CCRS) $(CFLAGS) escape.c
-	$(CCRS) $(CFLAGS) progress.c
+formdatars.obj: formdata.c
-sendfrs.obj: sendf.c
+	$(CCRS) $(CFLAGS) formdata.c
-	$(CCRS) $(CFLAGS) sendf.c
+ftprs.obj: ftp.c
-speedcheckrs.obj: speedcheck.c
+	$(CCRS) $(CFLAGS) ftp.c
-	$(CCRS) $(CFLAGS) speedcheck.c
+httprs.obj: http.c
-sslusers.obj: ssluse.c
+	$(CCRS) $(CFLAGS) http.c
-	$(CCRS) $(CFLAGS) ssluse.c
+ldaprs.obj: ldap.c
-timevalrs.obj: timeval.c
+	$(CCRS) $(CFLAGS) ldap.c
-	$(CCRS) $(CFLAGS) timeval.c
+dictrs.obj: dict.c
-uploadrs.obj: upload.c
+	$(CCRS) $(CFLAGS) dict.c
-	$(CCRS) $(CFLAGS) upload.c
+telnetrs.obj: telnet.c
-urlrs.obj: url.c
+	$(CCRS) $(CFLAGS) telnet.c
-	$(CCRS) $(CFLAGS) url.c
+getdaters.obj: getdate.c
-filers.obj: file.c
+	$(CCRS) $(CFLAGS) getdate.c
-	$(CCRS) $(CFLAGS) file.c
+getenvrs.obj: getenv.c
-versionrs.obj: version.c
+	$(CCRS) $(CFLAGS) getenv.c
-	$(CCRS) $(CFLAGS) version.c
+getpassrs.obj: getpass.c
-
+	$(CCRS) $(CFLAGS) getpass.c
-clean:
+hostiprs.obj: hostip.c
-	-@erase *.obj
+	$(CCRS) $(CFLAGS) hostip.c
-	-@erase vc60.idb
+if2iprs.obj: if2ip.c
-	-@erase vc60.pch
+	$(CCRS) $(CFLAGS) if2ip.c
-
+mprintfrs.obj: mprintf.c
-distrib: clean
+	$(CCRS) $(CFLAGS) mprintf.c
-	-@erase $(PROGRAM_NAME)
+netrcrs.obj: netrc.c
-
+	$(CCRS) $(CFLAGS) netrc.c
 progressrs.obj: progress.c
 	$(CCRS) $(CFLAGS) progress.c
 sendfrs.obj: sendf.c
 	$(CCRS) $(CFLAGS) sendf.c
 speedcheckrs.obj: speedcheck.c
 	$(CCRS) $(CFLAGS) speedcheck.c
 sslusers.obj: ssluse.c
 	$(CCRS) $(CFLAGS) ssluse.c
 timevalrs.obj: timeval.c
 	$(CCRS) $(CFLAGS) timeval.c
 urlrs.obj: url.c
 	$(CCRS) $(CFLAGS) url.c
 filers.obj: file.c
 	$(CCRS) $(CFLAGS) file.c
 getinfors.obj: getinfo.c
 	$(CCRS) $(CFLAGS) getinfo.c
 versionrs.obj: version.c
 	$(CCRS) $(CFLAGS) version.c
 easyrs.obj: easy.c
 	$(CCRS) $(CFLAGS) easy.c
 strequalrs.obj: strequal.c
 	$(CCRS) $(CFLAGS) strequal.c
 clean:
 	-@erase *.obj
 	-@erase vc60.idb
 	-@erase vc60.pch
 distrib: clean
 	-@erase $(PROGRAM_NAME)
--- a/lib/arpa_telnet.h
+++ b/lib/arpa_telnet.h
@@ -63,6 +63,7 @@
 #define SYNCH	242		/* for telfunc calls */
 #ifdef TELCMDS
 static
 char *telcmds[] = {
 	"EOF", "SUSP", "ABORT", "EOR",
 	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
@@ -124,6 +125,7 @@ extern char *telcmds[];
 #define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
 #ifdef TELOPTS
 static
 char *telopts[NTELOPTS+1] = {
 	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
 	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -1,94 +1,152 @@
-/*****************************************************************************
+/*
- *                                  _   _ ____  _     
+ * Copyright (c) 1995 - 1999 Kungliga Tekniska H<>gskolan
- *  Project                     ___| | | |  _ \| |    
+ * (Royal Institute of Technology, Stockholm, Sweden).
- *                             / __| | | | |_) | |    
+ * All rights reserved.
- *                            | (__| |_| |  _ <| |___ 
+ * 
- *                             \___|\___/|_| \_\_____|
+ * Redistribution and use in source and binary forms, with or without
- *
+ * modification, are permitted provided that the following conditions
- *  The contents of this file are subject to the Mozilla Public License
+ * are met:
- *  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
+ * 1. Redistributions of source code must retain the above copyright
- *  http://www.mozilla.org/MPL/
+ *    notice, this list of conditions and the following disclaimer.
- *
+ * 
- *  Software distributed under the License is distributed on an "AS IS"
+ * 2. Redistributions in binary form must reproduce the above copyright
- *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *    notice, this list of conditions and the following disclaimer in the
- *  License for the specific language governing rights and limitations
+ *    documentation and/or other materials provided with the distribution.
- *  under the License.
+ * 
- *
+ * 3. Neither the name of the Institute nor the names of its contributors
- *  The Original Code is Curl.
+ *    may be used to endorse or promote products derived from this software
- *
+ *    without specific prior written permission.
- *  The Initial Developer of the Original Code is Daniel Stenberg.
+ * 
- *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- *  Portions created by the Initial Developer are Copyright (C) 1998.
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  All Rights Reserved.
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * ------------------------------------------------------------
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * Main author:
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 	http://curl.haxx.nu
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- *
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * $Source$
+ * SUCH DAMAGE.
- * $Revision$
+ */
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
-#include <stdio.h>
+#ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "base64.h"
-/* ---- Base64 Encoding --- */
+/* The last #include file should be: */
-static char table64[]=
+#ifdef MALLOCDEBUG
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+#include "memdebug.h"
-  
+#endif
-void base64Encode(char *intext, char *output)
+
 static char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static int pos(char c)
 {
-  unsigned char ibuf[3];
+  char *p;
-  unsigned char obuf[4];
+  for(p = base64; *p; p++)
-  int i;
+    if(*p == c)
-  int inputparts;
+      return p - base64;
-
+  return -1;
-  while(*intext) {
+}
-    for (i = inputparts = 0; i < 3; i++) { 
+
-      if(*intext) {
+#if 1
-        inputparts++;
+int Curl_base64_encode(const void *data, int size, char **str)
-        ibuf[i] = *intext;
+{
-        intext++;
+  char *s, *p;
-      }
+  int i;
-      else
+  int c;
-        ibuf[i] = 0;
+  const unsigned char *q;
-    }
+
-                       
+  p = s = (char*)malloc(size*4/3+4);
-    obuf [0] = (ibuf [0] & 0xFC) >> 2;
+  if (p == NULL)
-    obuf [1] = ((ibuf [0] & 0x03) << 4) | ((ibuf [1] & 0xF0) >> 4);
+      return -1;
-    obuf [2] = ((ibuf [1] & 0x0F) << 2) | ((ibuf [2] & 0xC0) >> 6);
+  q = (const unsigned char*)data;
-    obuf [3] = ibuf [2] & 0x3F;
+  i=0;
-
+  for(i = 0; i < size;){
-    switch(inputparts) {
+    c=q[i++];
-    case 1: /* only one byte read */
+    c*=256;
-      sprintf(output, "%c%c==", 
+    if(i < size)
-              table64[obuf[0]],
+      c+=q[i];
-              table64[obuf[1]]);
+    i++;
-      break;
+    c*=256;
-    case 2: /* two bytes read */
+    if(i < size)
-      sprintf(output, "%c%c%c=", 
+      c+=q[i];
-              table64[obuf[0]],
+    i++;
-              table64[obuf[1]],
+    p[0]=base64[(c&0x00fc0000) >> 18];
-              table64[obuf[2]]);
+    p[1]=base64[(c&0x0003f000) >> 12];
-      break;
+    p[2]=base64[(c&0x00000fc0) >> 6];
-    default:
+    p[3]=base64[(c&0x0000003f) >> 0];
-      sprintf(output, "%c%c%c%c", 
+    if(i > size)
-              table64[obuf[0]],
+      p[3]='=';
-              table64[obuf[1]],
+    if(i > size+1)
-              table64[obuf[2]],
+      p[2]='=';
-              table64[obuf[3]] );
+    p+=4;
-      break;
+  }
-    }
+  *p=0;
-    output += 4;
+  *str = s;
-  }
+  return strlen(s);
-  *output=0;
+}
 #endif
 int Curl_base64_decode(const char *str, void *data)
 {
  const char *p;
  unsigned char *q;
  int c;
  int x;
  int done = 0;
  q=(unsigned char*)data;
  for(p=str; *p && !done; p+=4){
    x = pos(p[0]);
    if(x >= 0)
      c = x;
    else{
      done = 3;
      break;
    }
    c*=64;
    x = pos(p[1]);
    if(x >= 0)
      c += x;
    else
      return -1;
    c*=64;
    if(p[2] == '=')
      done++;
    else{
      x = pos(p[2]);
      if(x >= 0)
 	c += x;
      else
 	return -1;
    }
    c*=64;
    if(p[3] == '=')
      done++;
    else{
      if(done)
 	return -1;
      x = pos(p[3]);
      if(x >= 0)
 	c += x;
      else
 	return -1;
    }
    if(done < 3)
      *q++=(c&0x00ff0000)>>16;
    if(done < 2)
      *q++=(c&0x0000ff00)>>8;
    if(done < 1)
      *q++=(c&0x000000ff)>>0;
  }
  return q - (unsigned char*)data;
 }
 /* ---- End of Base64 Encoding ---- */
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -1,44 +1,40 @@
 /*
 * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan
 * (Royal Institute of Technology, Stockholm, Sweden).
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
 * 3. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 */
 #ifndef __BASE64_H
 #define __BASE64_H
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 *  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 Curl.
 *
 *  The Initial Developer of the Original Code is Daniel Stenberg.
 *
 *  Portions created by the Initial Developer are Copyright (C) 1998.
 *  All Rights Reserved.
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
-void base64Encode(char *intext, char *output);
+int Curl_base64_encode(const void *data, int size, char **str);
 int Curl_base64_decode(const char *str, void *data);
 #endif
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -1,3 +1,25 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  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$
 *****************************************************************************/
 /***
@@ -55,13 +77,20 @@ Example set of cookies:
    13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/; secure
 ****/
 #include "setup.h"
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include "cookie.h"
 #include "setup.h"
 #include "getdate.h"
 #include "strequal.h"
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
 /****************************************************************************
 *
@@ -71,9 +100,10 @@ Example set of cookies:
 *
 ***************************************************************************/
-struct Cookie *cookie_add(struct CookieInfo *c,
+struct Cookie *
-                          bool httpheader, /* TRUE if HTTP header-style line */
+Curl_cookie_add(struct CookieInfo *c,
-                          char *lineptr) /* first non-space of the line */
+                bool httpheader, /* TRUE if HTTP header-style line */
                char *lineptr) /* first non-space of the line */
 {
  struct Cookie *clist;
  char what[MAX_COOKIE_LINE];
@@ -97,8 +127,9 @@ struct Cookie *cookie_add(struct CookieInfo *c,
    semiptr=strchr(lineptr, ';'); /* first, find a semicolon */
    ptr = lineptr;
-    while(semiptr) {
+    do {
-      *semiptr='\0'; /* zero terminate for a while */
+      if(semiptr)
        *semiptr='\0'; /* zero terminate for a while */
      /* we have a <what>=<this> pair or a 'secure' word here */
      if(strchr(ptr, '=')) {
        name[0]=what[0]=0; /* init the buffers */
@@ -131,7 +162,7 @@ struct Cookie *cookie_add(struct CookieInfo *c,
          }
          else if(strequal("expires", name)) {
            co->expirestr=strdup(what);
-            co->expires = get_date(what, &now);
+            co->expires = curl_getdate(what, &now);
          }
          else if(!co->name) {
            co->name = strdup(name);
@@ -154,12 +185,15 @@ struct Cookie *cookie_add(struct CookieInfo *c,
            ; /* unsupported keyword without assign! */
        }
      }
      if(!semiptr)
        continue; /* we already know there are no more cookies */
      *semiptr=';'; /* put the semicolon back */
      ptr=semiptr+1;
      while(ptr && *ptr && isspace((int)*ptr))
        ptr++;
      semiptr=strchr(ptr, ';'); /* now, find the next semicolon */
-    }
+    } while(semiptr);
  }
  else {
    /* This line is NOT a HTTP header style line, we do offer support for
@@ -173,9 +207,11 @@ struct Cookie *cookie_add(struct CookieInfo *c,
      return NULL;
    }
    /* strip off the possible end-of-line characters */
-    if(ptr=strchr(lineptr, '\r'))
+    ptr=strchr(lineptr, '\r');
    if(ptr)
      *ptr=0; /* clear it */
-    if(ptr=strchr(lineptr, '\n'))
+    ptr=strchr(lineptr, '\n');
    if(ptr)
      *ptr=0; /* clear it */
    firstptr=strtok(lineptr, "\t"); /* first tokenize it on the TAB */
@@ -312,7 +348,7 @@ struct Cookie *cookie_add(struct CookieInfo *c,
 * called before any cookies are set. File may be NULL.
 *
 ****************************************************************************/
-struct CookieInfo *cookie_init(char *file)
+struct CookieInfo *Curl_cookie_init(char *file)
 {
  char line[MAX_COOKIE_LINE];
  struct CookieInfo *c;
@@ -340,7 +376,7 @@ struct CookieInfo *cookie_init(char *file)
        while(*lineptr && isspace((int)*lineptr))
          lineptr++;
-        cookie_add(c, TRUE, lineptr);
+        Curl_cookie_add(c, TRUE, lineptr);
      }
      else {
        /* This might be a netscape cookie-file line, get it! */
@@ -348,7 +384,7 @@ struct CookieInfo *cookie_init(char *file)
        while(*lineptr && isspace((int)*lineptr))
          lineptr++;
-        cookie_add(c, FALSE, lineptr);
+        Curl_cookie_add(c, FALSE, lineptr);
      }
    }
    if(fromfile)
@@ -370,8 +406,8 @@ struct CookieInfo *cookie_init(char *file)
 *
 ****************************************************************************/
-struct Cookie *cookie_getlist(struct CookieInfo *c,
+struct Cookie *Curl_cookie_getlist(struct CookieInfo *c,
-			      char *host, char *path, bool secure)
+                                   char *host, char *path, bool secure)
 {
   struct Cookie *newco;
   struct Cookie *co;
@@ -396,7 +432,7 @@ struct Cookie *cookie_getlist(struct CookieInfo *c,
 	 /* now check if the domain is correct */
 	 domlen=co->domain?strlen(co->domain):0;
 	 if(!co->domain ||
-	    ((domlen<hostlen) &&
+	    ((domlen<=hostlen) &&
 	     strequal(host+(hostlen-domlen), co->domain)) ) {
 	    /* the right part of the host matches the domain stuff in the
 	       cookie data */
@@ -438,7 +474,7 @@ struct Cookie *cookie_getlist(struct CookieInfo *c,
 *
 ****************************************************************************/
-void cookie_freelist(struct Cookie *co)
+void Curl_cookie_freelist(struct Cookie *co)
 {
   struct Cookie *next;
   if(co) {
@@ -458,7 +494,7 @@ void cookie_freelist(struct Cookie *co)
 * Free a "cookie object" previous created with cookie_init().
 *
 ****************************************************************************/
-void cookie_cleanup(struct CookieInfo *c)
+void Curl_cookie_cleanup(struct CookieInfo *c)
 {
   struct Cookie *co;
   struct Cookie *next;
@@ -488,6 +524,7 @@ void cookie_cleanup(struct CookieInfo *c)
 	 free(co);
 	 co = next;
      }
      free(c); /* free the base struct as well */
   }
 }
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -1,5 +1,27 @@
 #ifndef __COOKIE_H
 #define __COOKIE_H
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
 *
 * In order to be useful for every potential user, curl and libcurl are
 * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include <stdio.h>
 #ifdef WIN32
@@ -41,10 +63,10 @@ struct CookieInfo {
 #define MAX_NAME 256
 #define MAX_NAME_TXT "255"
-struct Cookie *cookie_add(struct CookieInfo *, bool, char *);
+struct Cookie *Curl_cookie_add(struct CookieInfo *, bool, char *);
-struct CookieInfo *cookie_init(char *);
+struct CookieInfo *Curl_cookie_init(char *);
-struct Cookie *cookie_getlist(struct CookieInfo *, char *, char *, bool);
+struct Cookie *Curl_cookie_getlist(struct CookieInfo *, char *, char *, bool);
-void cookie_freelist(struct Cookie *);
+void Curl_cookie_freelist(struct Cookie *);
-void cookie_cleanup(struct CookieInfo *);
+void Curl_cookie_cleanup(struct CookieInfo *);
 #endif
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -5,38 +5,23 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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.
+ *****************************************************************************/
- *
+
- * ------------------------------------------------------------
+#include "setup.h"
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 /* -- WIN32 approved -- */
 #include <stdio.h>
@@ -49,8 +34,6 @@
 #include <errno.h>
 #include "setup.h"
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
@@ -88,16 +71,21 @@
 #include "urldata.h"
 #include <curl/curl.h>
-#include "download.h"
+#include "transfer.h"
 #include "sendf.h"
 #include "progress.h"
 #include "strequal.h"
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 CURLcode Curl_dict_done(struct connectdata *conn)
 {
  return CURLE_OK;
 }
-UrgError dict(struct UrlData *data, char *path, long *bytecount)
+CURLcode Curl_dict(struct connectdata *conn)
 {
  int nth;
  char *word;
@@ -106,9 +94,13 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
  char *strategy = NULL;
  char *nthdef = NULL; /* This is not part of the protocol, but required
                          by RFC 2229 */
-  UrgError result=URG_OK;
+  CURLcode result=CURLE_OK;
-    
+  struct UrlData *data=conn->data;
-  if(data->conf & CONF_USERPWD) {
+
  char *path = conn->path;
  long *bytecount = &conn->bytecount;
  if(data->bits.user_passwd) {
    /* AUTH is missing */
  }
@@ -149,21 +141,21 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
      nth = atoi(nthdef);
    }
-    sendf(data->firstsocket, data,
+    Curl_sendf(data->firstsocket, conn,
-          "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
+               "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
-          "MATCH "
+               "MATCH "
-          "%s "    /* database */
+               "%s "    /* database */
-          "%s "    /* strategy */
+               "%s "    /* strategy */
-          "%s\n"   /* word */
+               "%s\n"   /* word */
-          "QUIT\n",
+               "QUIT\n",
-          database,
+               database,
-          strategy,
+               strategy,
-          word
+               word
-          );
+               );
-    result = Transfer(data, data->firstsocket, -1, FALSE, bytecount,
+    result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
-                      -1, NULL); /* no upload */
+                           -1, NULL); /* no upload */
    if(result)
      return result;
@@ -199,20 +191,20 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
      nth = atoi(nthdef);
    }
-    sendf(data->firstsocket, data,
+    Curl_sendf(data->firstsocket, conn,
-          "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
+               "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
-          "DEFINE "
+               "DEFINE "
-          "%s "     /* database */
+               "%s "     /* database */
-          "%s\n"    /* word */
+               "%s\n"    /* word */
-          "QUIT\n",
+               "QUIT\n",
-          
+               
-          database,
+               database,
-          word
+               word
-          );
+               );
    result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                           -1, NULL); /* no upload */
    result = Transfer(data, data->firstsocket, -1, FALSE, bytecount,
                      -1, NULL); /* no upload */
    if(result)
      return result;
@@ -224,18 +216,18 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
      int i;
      ppath++;
-      for (i = 0; (i < URL_MAX_LENGTH) && (ppath[i]); i++) {
+      for (i = 0; ppath[i]; i++) {
        if (ppath[i] == ':')
          ppath[i] = ' ';
      }
-      sendf(data->firstsocket, data,
+      Curl_sendf(data->firstsocket, conn,
-            "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
+                 "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\n"
-            "%s\n"
+                 "%s\n"
-            "QUIT\n",
+                 "QUIT\n",
-            ppath);
+                 ppath);
-      result = Transfer(data, data->firstsocket, -1, FALSE, bytecount,
+      result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
-                        -1, NULL);
+                             -1, NULL);
      if(result)
        return result;
@@ -243,10 +235,5 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
    }
  }
-#if 0
+  return CURLE_OK;
  ProgressEnd(data);
 #endif
  pgrsDone(data);
  return URG_OK;
 }
--- a/lib/dict.h
+++ b/lib/dict.h
@@ -8,38 +8,22 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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.
+ *****************************************************************************/
- *
+CURLcode Curl_dict(struct connectdata *conn);
- * ------------------------------------------------------------
+CURLcode Curl_dict_done(struct connectdata *conn);
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 UrgError dict(struct UrlData *data, char *path, long *bytecountp);
 #endif
--- a/lib/dllinit.c
+++ b/lib/dllinit.c
@@ -0,0 +1,82 @@
 /* dllinit.c -- Portable DLL initialization. 
   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
   Contributed by Mumit Khan (khan@xraylith.wisc.edu).
   I've used DllMain as the DLL "main" since that's the most common 
   usage. MSVC and Mingw32 both default to DllMain as the standard
   callback from the linker entry point. Cygwin, as of b20.1, also
   uses DllMain as the default callback from the entry point.
   The real entry point is typically always defined by the runtime 
   library, and usually never overridden by (casual) user. What you can 
   override however is the callback routine that the entry point calls, 
   and this file provides such a callback function, DllMain.
   Mingw32: The default entry point for mingw32 is DllMainCRTStartup
   which is defined in libmingw32.a This in turn calls DllMain which is
   defined here. If not defined, there is a stub in libmingw32.a which
   does nothing.
   Cygwin: The default entry point for Cygwin b20.1 or newer is
   __cygwin_dll_entry which is defined in libcygwin.a. This in turn
   calls the routine DllMain. If not defined, there is a stub in
   libcygwin.a which does nothing. 
   MSVC: MSVC runtime calls DllMain, just like Mingw32.
   Summary: If you need to do anything special in DllMain, just add it
   here. Otherwise, the default setup should be just fine for 99%+ of
   the time. I strongly suggest that you *not* change the entry point,
   but rather change DllMain as appropriate.
 */
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 #include <stdio.h>
 BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, 
                       LPVOID reserved /* Not used. */ );
 /*
 *----------------------------------------------------------------------
 *
 * DllMain --
 *
 *	This routine is called by the Mingw32, Cygwin32 or VC++ C run 
 *	time library init code, or the Borland DllEntryPoint routine. It 
 *	is responsible for initializing various dynamically loaded 
 *	libraries.
 *
 * Results:
 *      TRUE on sucess, FALSE on failure.
 *
 * Side effects:
 *
 *----------------------------------------------------------------------
 */
 BOOL APIENTRY
 DllMain (
 	 HINSTANCE hInst /* Library instance handle. */ ,
 	 DWORD reason /* Reason this function is being called. */ ,
 	 LPVOID reserved /* Not used. */ )
 {
  switch (reason)
    {
    case DLL_PROCESS_ATTACH:
      break;
    case DLL_PROCESS_DETACH:
      break;
    case DLL_THREAD_ATTACH:
      break;
    case DLL_THREAD_DETACH:
      break;
    }
  return TRUE;
 }
--- a/lib/download.c
+++ b/lib/download.c
@@ -1,584 +0,0 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 *  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 Curl.
 *
 *  The Initial Developer of the Original Code is Daniel Stenberg.
 *
 *  Portions created by the Initial Developer are Copyright (C) 1998.
 *  All Rights Reserved.
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "setup.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #include "urldata.h"
 #include <curl/curl.h>
 #ifdef __BEOS__
 #include <net/socket.h>
 #endif
 #ifdef WIN32
 #if !defined( __GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #endif
 #include <time.h> /* for the time_t typedef! */
 #if defined(__GNUC__) && defined(TIME_WITH_SYS_TIME)
 #include <sys/time.h>
 #endif
 #endif
 #include "progress.h"
 #include "speedcheck.h"
 #include "sendf.h"
 #ifdef USE_ZLIB
 #include <zlib.h>
 #endif
 #define MAX(x,y) ((x)>(y)?(x):(y))
 /* --- download and upload a stream from/to a socket --- */
 /* Parts of this function was brought to us by the friendly Mark Butler
   <butlerm@xmission.com>. */
 UrgError 
 Transfer (struct UrlData *data,
          /* READ stuff */
 	  int sockfd,		/* socket to read from or -1 */
 	  int size,		/* -1 if unknown at this point */
 	  bool getheader,	/* TRUE if header parsing is wanted */
 	  long *bytecountp,	/* return number of bytes read or NULL */
          /* WRITE stuff */
          int writesockfd,      /* socket to write to, it may very well be
                                   the same we read from. -1 disables */
          long *writebytecountp /* return number of bytes written or NULL */
 )
 {
  char *buf = data->buffer;
  size_t nread;
  int bytecount = 0; /* number of bytes read */
  int writebytecount = 0; /* number of bytes written */
  long contentlength=0; /* size of incoming data */
  struct timeval start = tvnow();
  struct timeval now = start;
  bool header = TRUE;		/* incoming data has HTTP header */
  int headerline = 0;		/* counts header lines to better track the
                                   first one */
  char *hbufp;			/* points at *end* of header line */
  int hbuflen = 0;
  char *str;			/* within buf */
  char *str_start;		/* within buf */
  char *end_ptr;		/* within buf */
  char *p;			/* within headerbuff */
  bool content_range = FALSE;	/* set TRUE if Content-Range: was found */
  int offset = 0;		/* possible resume offset read from the
                                   Content-Range: header */
  int code = 0;			/* error code from the 'HTTP/1.? XXX' line */
  /* for the low speed checks: */
  UrgError urg;
  time_t timeofdoc=0;
  long bodywrites=0;
  char newurl[URL_MAX_LENGTH];		/* buffer for Location: URL */
  /* the highest fd we use + 1 */
  int maxfd = (sockfd>writesockfd?sockfd:writesockfd)+1;
  hbufp = data->headerbuff;
  myalarm (0);			/* switch off the alarm-style timeout */
  now = tvnow();
  start = now;
 #define KEEP_READ  1
 #define KEEP_WRITE 2
  pgrsTime(data, TIMER_PRETRANSFER);
  if (!getheader) {
    header = FALSE;
    if(size > 0)
      pgrsSetDownloadSize(data, size);
  }
  {
    fd_set readfd;
    fd_set writefd;
    fd_set rkeepfd;
    fd_set wkeepfd;
    struct timeval interval;
    int keepon=0;
    /* timeout every X second
       - makes a better progressmeter (i.e even when no data is read, the
       meter can be updated and reflect reality)
       - allows removal of the alarm() crap
       - variable timeout is easier
     */
    FD_ZERO (&readfd);		/* clear it */
    if(sockfd != -1) {
      FD_SET (sockfd, &readfd); /* read socket */
      keepon |= KEEP_READ;
    }
    FD_ZERO (&writefd);		/* clear it */
    if(writesockfd != -1) {
      FD_SET (writesockfd, &writefd); /* write socket */
      keepon |= KEEP_WRITE;
    }
    /* get these in backup variables to be able to restore them on each lap in
       the select() loop */
    rkeepfd = readfd;
    wkeepfd = writefd;
    while (keepon) {
      readfd = rkeepfd;		/* set those every lap in the loop */
      writefd = wkeepfd;
      interval.tv_sec = 1;
      interval.tv_usec = 0;
      switch (select (maxfd, &readfd, &writefd, NULL, &interval)) {
      case -1:			/* select() error, stop reading */
 	keepon = 0; /* no more read or write */
 	continue;
      case 0:			/* timeout */
 	break;
      default:
        if((keepon & KEEP_READ) && FD_ISSET(sockfd, &readfd)) {
          /* read! */
 #ifdef USE_SSLEAY
          if (data->use_ssl) {
            nread = SSL_read (data->ssl, buf, BUFSIZE - 1);
          }
          else {
 #endif
            nread = sread (sockfd, buf, BUFSIZE - 1);
 #ifdef USE_SSLEAY
          }
 #endif /* USE_SSLEAY */
          /* NULL terminate, allowing string ops to be used */
          if (0 < (signed int) nread)
            buf[nread] = 0;
          /* if we receive 0 or less here, the server closed the connection and
             we bail out from this! */
          else if (0 >= (signed int) nread) {
            keepon &= ~KEEP_READ;
            break;
          }
          str = buf;		/* Default buffer to use when we write the
                                   buffer, it may be changed in the flow below
                                   before the actual storing is done. */
          /* Since this is a two-state thing, we check if we are parsing
             headers at the moment or not. */
          if (header) {
            /* we are in parse-the-header-mode */
            /* header line within buffer loop */
            do {
              int hbufp_index;
              str_start = str;	/* str_start is start of line within buf */
              end_ptr = strchr (str_start, '\n');
              if (!end_ptr) {
                /* no more complete header lines within buffer */
                /* copy what is remaining into headerbuff */
                int str_length = (int)strlen(str);
                if (hbuflen + (int)str_length >= data->headersize) {
                  char *newbuff;
                  long newsize=MAX((hbuflen+str_length)*3/2,
                                   data->headersize*2);
                  hbufp_index = hbufp - data->headerbuff;
                  newbuff = (char *)realloc(data->headerbuff, newsize);
                  if(!newbuff) {
                    failf (data, "Failed to alloc memory for big header!");
                    return URG_READ_ERROR;
                  }
                  data->headersize=newsize;
                  data->headerbuff = newbuff;
                  hbufp = data->headerbuff + hbufp_index;
                }
                strcpy (hbufp, str);
                hbufp += strlen (str);
                hbuflen += strlen (str);
                break;		/* read more and try again */
              }
              str = end_ptr + 1;	/* move just past new line */
              if (hbuflen + (str - str_start) >= data->headersize) {
                char *newbuff;
                long newsize=MAX((hbuflen+(str-str_start))*3/2,
                                 data->headersize*2);
                hbufp_index = hbufp - data->headerbuff;
                newbuff = (char *)realloc(data->headerbuff, newsize);
                if(!newbuff) {
                  failf (data, "Failed to alloc memory for big header!");
                  return URG_READ_ERROR;
                }
                data->headersize= newsize;
                data->headerbuff = newbuff;
                hbufp = data->headerbuff + hbufp_index;
              }
              /* copy to end of line */
              strncpy (hbufp, str_start, str - str_start);
              hbufp += str - str_start;
              hbuflen += str - str_start;
              *hbufp = 0;
              p = data->headerbuff;
              /* we now have a full line that p points to */
              if (('\n' == *p) || ('\r' == *p)) {
                /* Zero-length line means end of header! */
                if (-1 != size)	/* if known */
                  size += bytecount;	/* we append the already read size */
                if ('\r' == *p)
                  p++;		/* pass the \r byte */
                if ('\n' == *p)
                  p++;		/* pass the \n byte */
                pgrsSetDownloadSize(data, size);
                header = FALSE;	/* no more header to parse! */
                /* now, only output this if the header AND body are requested:
                 */
                if ((data->conf & (CONF_HEADER | CONF_NOBODY)) ==
                    CONF_HEADER) {
                  if((p - data->headerbuff) !=
                     data->fwrite (data->headerbuff, 1,
                                   p - data->headerbuff, data->out)) {
                    failf (data, "Failed writing output");
                    return URG_WRITE_ERROR;
                  }
                }
                if(data->writeheader) {
                  /* obviously, the header is requested to be written to
                     this file: */
                  if((p - data->headerbuff) !=
                     fwrite (data->headerbuff, 1, p - data->headerbuff,
                             data->writeheader)) {
                    failf (data, "Failed writing output");
                    return URG_WRITE_ERROR;
                  }
                }
                break;		/* exit header line loop */
              }
              if (!headerline++) {
                /* This is the first header, it MUST be the error code line
                   or else we consiser this to be the body right away! */
                if (sscanf (p, " HTTP/1.%*c %3d", &code)) {
                  /* 404 -> URL not found! */
                  if (
                      ( ((data->conf & CONF_FOLLOWLOCATION) && (code >= 400))
                        ||
                        !(data->conf & CONF_FOLLOWLOCATION) && (code >= 300))
                      && (data->conf & CONF_FAILONERROR)) {
                    /* If we have been told to fail hard on HTTP-errors,
                       here is the check for that: */
                    /* serious error, go home! */
                    failf (data, "The requested file was not found");
                    return URG_HTTP_NOT_FOUND;
                  }
                  data->progress.httpcode = code;
                }
                else {
                  header = FALSE;	/* this is not a header line */
                  break;
                }
              }
              /* check for Content-Length: header lines to get size */
              if (strnequal("Content-Length", p, 14) &&
                  sscanf (p+14, ": %ld", &contentlength))
                size = contentlength;
              else if (strnequal("Content-Range", p, 13) &&
                       sscanf (p+13, ": bytes %d-", &offset)) {
                if (data->resume_from == offset) {
                  /* we asked for a resume and we got it */
                  content_range = TRUE;
                }
              }
              else if(data->cookies &&
                      strnequal("Set-Cookie: ", p, 11)) {
                cookie_add(data->cookies, TRUE, &p[12]);
              }
              else if(strnequal("Last-Modified:", p,
                                strlen("Last-Modified:")) &&
                      data->timecondition) {
                time_t secs=time(NULL);
                timeofdoc = get_date(p+strlen("Last-Modified:"), &secs);
              }
              else if ((code >= 300 && code < 400) &&
                       (data->conf & CONF_FOLLOWLOCATION) &&
                       strnequal("Location", p, 8) &&
                       sscanf (p+8, ": %" URL_MAX_LENGTH_TXT "s", newurl)) {
                /* this is the URL that the server advices us to get
                   instead */
                data->newurl = strdup (newurl);
              }
              if (data->conf & CONF_HEADER) {
                if(hbuflen != data->fwrite (p, 1, hbuflen, data->out)) {
                  failf (data, "Failed writing output");
                  return URG_WRITE_ERROR;
                }
              }
              if(data->writeheader) {
                /* the header is requested to be written to this file */
                if(hbuflen != fwrite (p, 1, hbuflen, data->writeheader)) {
                  failf (data, "Failed writing output");
                  return URG_WRITE_ERROR;
                }
              }
              /* reset hbufp pointer && hbuflen */
              hbufp = data->headerbuff;
              hbuflen = 0;
            }
            while (*str);		/* header line within buffer */
            /* We might have reached the end of the header part here, but
               there might be a non-header part left in the end of the read
               buffer. */
            if (!header) {
              /* the next token and forward is not part of
                 the header! */
              /* we subtract the remaining header size from the buffer */
              nread -= (str - buf);
            }
          }			/* end if header mode */
          /* This is not an 'else if' since it may be a rest from the header
             parsing, where the beginning of the buffer is headers and the end
             is non-headers. */
          if (str && !header && (nread > 0)) {
            if(0 == bodywrites) {
              /* These checks are only made the first time we are about to
                 write a chunk of the body */
              if(data->conf&CONF_HTTP) {
                /* HTTP-only checks */
                if (data->resume_from && !content_range ) {
                  /* we wanted to resume a download, although the server
                     doesn't seem to support this */
                  failf (data, "HTTP server doesn't seem to support byte ranges. Cannot resume.");
                  return URG_HTTP_RANGE_ERROR;
                }
                else if (data->newurl) {
                  /* abort after the headers if "follow Location" is set */
                  infof (data, "Follow to new URL: %s\n", data->newurl);
                  return URG_OK;
                }
                else if(data->timecondition && !data->range) {
                  /* A time condition has been set AND no ranges have been
                     requested. This seems to be what chapter 13.3.4 of
                     RFC 2616 defines to be the correct action for a
                     HTTP/1.1 client */
                  if((timeofdoc > 0) && (data->timevalue > 0)) {
                    switch(data->timecondition) {
                    case TIMECOND_IFMODSINCE:
                    default:
                      if(timeofdoc < data->timevalue) {
                        infof(data,
                              "The requested document is not new enough");
                        return URG_OK;
                      }
                      break;
                    case TIMECOND_IFUNMODSINCE:
                      if(timeofdoc > data->timevalue) {
                        infof(data,
                              "The requested document is not old enough");
                        return URG_OK;
                      }
                      break;
                    } /* switch */
                  } /* two valid time strings */
                } /* we have a time condition */
              } /* this is HTTP */
            } /* this is the first time we write a body part */
            bodywrites++;
            if(data->maxdownload &&
               (bytecount + nread > data->maxdownload)) {
              nread = data->maxdownload - bytecount;
              if(nread < 0 ) /* this should be unusual */
                nread = 0;
              keepon &= ~KEEP_READ; /* we're done reading */
            }
            bytecount += nread;
            pgrsSetDownloadCounter(data, (double)bytecount);
            if (nread != data->fwrite (str, 1, nread, data->out)) {
              failf (data, "Failed writing output");
              return URG_WRITE_ERROR;
            }
          } /* if (! header and data to read ) */
        } /* if( read from socket ) */
        if((keepon & KEEP_WRITE) && FD_ISSET(writesockfd, &writefd)) {
          /* write */
          char scratch[BUFSIZE * 2];
          int i, si;
          int bytes_written;
          if(data->crlf)
            buf = data->buffer; /* put it back on the buffer */
          nread = data->fread(buf, 1, BUFSIZE, data->in);
          writebytecount += nread;
          pgrsSetUploadCounter(data, (double)writebytecount);
          if (nread<=0) {
            /* done */
            keepon &= ~KEEP_WRITE; /* we're done writing */
            break;
          }
          /* convert LF to CRLF if so asked */
          if (data->crlf) {
            for(i = 0, si = 0; i < (int)nread; i++, si++) {
              if (buf[i] == 0x0a) {
                scratch[si++] = 0x0d;
                scratch[si] = 0x0a;
              }
              else {
                scratch[si] = buf[i];
              }
            }
            nread = si;
            buf = scratch; /* point to the new buffer */
          }
          /* write to socket */
 #ifdef USE_SSLEAY
          if (data->use_ssl) {
            bytes_written = SSL_write(data->ssl, buf, nread);
          }
          else {
 #endif
            bytes_written = swrite(writesockfd, buf, nread);
 #ifdef USE_SSLEAY
          }
 #endif /* USE_SSLEAY */
          if(nread != bytes_written) {
            failf(data, "Failed uploading data");
            return URG_WRITE_ERROR;
          }
        }
        break;
      }
      now = tvnow();
      pgrsUpdate(data);
      urg = speedcheck (data, now);
      if (urg)
 	return urg;
      if (data->timeout && (tvdiff (now, start) > data->timeout)) {
 	failf (data, "Operation timed out with %d out of %d bytes received",
 	       bytecount, size);
 	return URG_OPERATION_TIMEOUTED;
      }
 #ifdef MULTIDOC
      if(contentlength && bytecount >= contentlength) {
        /* we're done with this download, now stop it */
        break;
      }
 #endif
    }
  }
  if(!(data->conf&CONF_NOBODY) && contentlength &&
     (bytecount != contentlength)) {
    failf(data, "transfer closed with %d bytes remaining to read",
          contentlength-bytecount);
    return URG_PARTIAL_FILE;
  }
  pgrsUpdate(data);
  if(bytecountp)
    *bytecountp = bytecount; /* read count */
  if(writebytecountp)
    *writebytecountp = writebytecount; /* write count */
  return URG_OK;
 }
--- a/lib/download.h
+++ b/lib/download.h
@@ -1,53 +0,0 @@
 #ifndef __DOWNLOAD_H
 #define __DOWNLOAD_H
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 *  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 Curl.
 *
 *  The Initial Developer of the Original Code is Daniel Stenberg.
 *
 *  Portions created by the Initial Developer are Copyright (C) 1998.
 *  All Rights Reserved.
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 UrgError 
 Transfer (struct UrlData *data,
 	  int sockfd,		/* socket to read from or -1 */
 	  int size,		/* -1 if unknown at this point */
 	  bool getheader,	/* TRUE if header parsing is wanted */
 	  long *bytecountp,	/* return number of bytes read */
          int writesockfd,      /* socket to write to, it may very well be
                                   the same we read from. -1 disables */
          long *writebytecountp /* return number of bytes written */
 );
 #endif
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -0,0 +1,157 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
 *
 * In order to be useful for every potential user, curl and libcurl are
 * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include "setup.h"
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include "strequal.h"
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <netdb.h>
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
 #include <sys/ioctl.h>
 #include <signal.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #endif
 #include "urldata.h"
 #include <curl/curl.h>
 #include "transfer.h"
 #include <curl/types.h>
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 CURL *curl_easy_init(void)
 {
  CURLcode res;
  struct UrlData *data;
  if(curl_init())
    return NULL;
  /* We use curl_open() with undefined URL so far */
  res = curl_open((CURL **)&data, NULL);
  if(res != CURLE_OK)
    return NULL;
  data->interf = CURLI_EASY; /* mark it as an easy one */
  /* SAC */
  data->device = NULL;
  return data;
 }
 typedef int (*func_T)(void);
 CURLcode curl_easy_setopt(CURL *curl, CURLoption tag, ...)
 {
  va_list arg;
  func_T param_func = (func_T)0;
  long param_long = 0;
  void *param_obj = NULL;
  struct UrlData *data = curl;
  va_start(arg, tag);
  /* PORTING NOTE:
     Object pointers can't necessarily be casted to function pointers and
     therefore we need to know what type it is and read the correct type
     at once. This should also correct problems with different sizes of
     the types.
  */
  if(tag < CURLOPTTYPE_OBJECTPOINT) {
    /* This is a LONG type */
    param_long = va_arg(arg, long);
    curl_setopt(data, tag, param_long);
  }
  else if(tag < CURLOPTTYPE_FUNCTIONPOINT) {
    /* This is a object pointer type */
    param_obj = va_arg(arg, void *);
    curl_setopt(data, tag, param_obj);
  }
  else {
    param_func = va_arg(arg, func_T );
    curl_setopt(data, tag, param_func);
  }
  va_end(arg);
  return CURLE_OK;
 }
 CURLcode curl_easy_perform(CURL *curl)
 {
  return curl_transfer(curl);
 }
 void curl_easy_cleanup(CURL *curl)
 {
  curl_close(curl);
  curl_free();
 }
 CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...)
 {
  va_list arg;
  void *paramp;
  va_start(arg, info);
  paramp = va_arg(arg, void *);
  return curl_getinfo(curl, info, paramp);
 }
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -5,49 +5,40 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 /* Escape and unescape URL encoding in strings. The functions return a new
 * allocated string or NULL if an error occurred.  */
 #include "setup.h"
 #include <curl/curl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
 char *curl_escape(char *string)
 {
-   int alloc=strlen(string);
+   int alloc=strlen(string)+1;
   char *ns = malloc(alloc);
   unsigned char in;
   int newlen = alloc;
@@ -81,25 +72,32 @@ char *curl_escape(char *string)
   return ns;
 }
-char *curl_unescape(char *string)
+char *curl_unescape(char *string, int length)
 {
-   int alloc = strlen(string);
+   int alloc = (length?length:strlen(string))+1;
   char *ns = malloc(alloc);
   unsigned char in;
   int index=0;
   int hex;
-   
+   char querypart=FALSE; /* everything to the right of a '?' letter is
-
+                            the "query part" where '+' should become ' '.
-   while(*string) {
+                            RFC 2316, section 3.10 */
   while(--alloc > 0) {
      in = *string;
-      if('+' == in)
+      if(querypart && ('+' == in))
-	 in = ' ';
+         in = ' ';
      else if(!querypart && ('?' == in)) {
        /* we have "walked in" to the query part */
        querypart=TRUE;
      }
      else if('%' == in) {
-	 /* encoded part */
+        /* encoded part */
-	 if(sscanf(string+1, "%02X", &hex)) {
+        if(sscanf(string+1, "%02X", &hex)) {
-	    in = hex;
+          in = hex;
-	    string+=2;
+          string+=2;
-	 }
+          alloc-=2;
        }
      }
      ns[index++] = in;
--- a/lib/escape.h
+++ b/lib/escape.h
@@ -8,42 +8,25 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 /* Escape and unescape URL encoding in strings. The functions return a new
 * allocated string or NULL if an error occurred.  */
 char *curl_escape(char *string);
-char *curl_unescape(char *string);
+char *curl_unescape(char *string, int length);
 #endif
--- a/lib/file.c
+++ b/lib/file.c
@@ -5,38 +5,23 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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) 1999.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
+
- * ------------------------------------------------------------
+#include "setup.h"
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 /* -- WIN32 approved -- */
 #include <stdio.h>
@@ -49,8 +34,6 @@
 #include <errno.h>
 #include "setup.h"
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
@@ -60,13 +43,17 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #include <sys/time.h>
 #include <sys/resource.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -99,29 +86,35 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
-UrgError file(struct UrlData *data, char *path, long *bytecountp)
+CURLcode file(struct connectdata *conn)
 {
  /* This implementation ignores the host name in conformance with 
     RFC 1738. Only local files (reachable via the standard file system)
     are supported. This means that files on remotely mounted directories
     (via NFS, Samba, NT sharing) can be accessed through a file:// URL
  */
-
+  CURLcode res = CURLE_OK;
  char *path = conn->path;
  struct stat statbuf;
  size_t expected_size=-1;
  size_t nread;
  struct UrlData *data = conn->data;
  char *buf = data->buffer;
  int bytecount = 0;
-  struct timeval start = tvnow();
+  struct timeval start = Curl_tvnow();
  struct timeval now = start;
  int fd;
-  char *actual_path = curl_unescape(path);
+  char *actual_path = curl_unescape(path, 0);
-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
  int i;
-  /* change path separators from '/' to '\\' for Windows */
+  /* change path separators from '/' to '\\' for Windows and OS/2 */
  for (i=0; actual_path[i] != '\0'; ++i)
    if (actual_path[i] == '/')
      actual_path[i] = '\\';
@@ -134,7 +127,7 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
  if(fd == -1) {
    failf(data, "Couldn't open file %s", path);
-    return URG_FILE_COULDNT_READ_FILE;
+    return CURLE_FILE_COULDNT_READ_FILE;
  }
  if( -1 != fstat(fd, &statbuf)) {
    /* we could stat it, then read out the size */
@@ -145,13 +138,10 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
     this is both more efficient than the former call to download() and
     it avoids problems with select() and recv() on file descriptors
     in Winsock */
 #if 0
  ProgressInit (data, expected_size);
 #endif
  if(expected_size != -1)
-    pgrsSetDownloadSize(data, expected_size);
+    Curl_pgrsSetDownloadSize(data, expected_size);
-  while (1) {
+  while (res == CURLE_OK) {
    nread = read(fd, buf, BUFSIZE-1);
    if (0 <= nread)
@@ -164,23 +154,20 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
       Windows systems if the target is stdout. Use -O or -o parameters
       to prevent CR/LF translation (this then goes to a binary mode
       file descriptor). */
-    if(nread != data->fwrite (buf, 1, nread, data->out)) {
+
-      failf (data, "Failed writing output");
+    res = Curl_client_write(data, CLIENTWRITE_BODY, buf, nread);
-      return URG_WRITE_ERROR;
+    if(res)
-    }
+      return res;
-    now = tvnow();
+
-    pgrsUpdate(data);
+    now = Curl_tvnow();
-#if 0
+    if(Curl_pgrsUpdate(data))
-    ProgressShow (data, bytecount, start, now, FALSE);
+      res = CURLE_ABORTED_BY_CALLBACK;
 #endif
  }
-  now = tvnow();
+  now = Curl_tvnow();
-#if 0
+  if(Curl_pgrsUpdate(data))
-  ProgressShow (data, bytecount, start, now, TRUE);
+    res = CURLE_ABORTED_BY_CALLBACK;
 #endif
  pgrsUpdate(data);
  close(fd);
-  return URG_OK;
+  return res;
 }
--- a/lib/file.h
+++ b/lib/file.h
@@ -8,38 +8,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.
+ *****************************************************************************/
- *
+CURLcode file(struct connectdata *conn);
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 UrgError file(struct UrlData *data, char *path, long *bytecountp);
 #endif
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -5,38 +5,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$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 /*
  Debug the form generator stand-alone by compiling this source file with:
@@ -49,6 +32,8 @@
 */
 #include "setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -56,10 +41,16 @@
 #include <time.h>
 #include "setup.h"
 #include <curl/curl.h>
 #include "formdata.h"
 #include "strequal.h"
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
 /* Length of the random boundary string. The risk of this being used
   in binary data is very close to zero, 64^32 makes
   6277101735386680763835789423207666416102355444464034512896
@@ -100,16 +91,10 @@ static void GetStr(char **string,
 *
 ***************************************************************************/
 int curl_FormParse(char *input,
                   struct HttpPost **httppost,
                   struct HttpPost **last_post)
 {
  return FormParse(input, httppost, last_post);
 }
 #define FORM_FILE_SEPARATOR ','
 #define FORM_TYPE_SEPARATOR ';'
 static
 int FormParse(char *input,
 	      struct HttpPost **httppost,
 	      struct HttpPost **last_post)
@@ -117,7 +102,7 @@ int FormParse(char *input,
  /* nextarg MUST be a string in the format 'name=contents' and we'll
     build a linked list with the info */
  char name[256];
-  char contents[1024]="";
+  char contents[4096]="";
  char major[128];
  char minor[128];
  long flags = 0;
@@ -130,7 +115,7 @@ int FormParse(char *input,
  struct HttpPost *subpost; /* a sub-node */
  unsigned int i;
-  if(1 <= sscanf(input, "%255[^ =] = %1023[^\n]", name, contents)) {
+  if(1 <= sscanf(input, "%255[^ =] = %4095[^\n]", name, contents)) {
    /* the input was using the correct format */
    contp = contents;
@@ -279,8 +264,14 @@ int FormParse(char *input,
      if(post) {
 	memset(post, 0, sizeof(struct HttpPost));
 	GetStr(&post->name, name);      /* get the name */
-	GetStr(&post->contents, contp); /* get the contents */
+	if( contp[0]=='<' ) {
-	post->flags = 0;
+	  GetStr(&post->contents, contp+1); /* get the contents */
 	  post->flags = HTTPPOST_READFILE;
 	}
 	else {
 	  GetStr(&post->contents, contp); /* get the contents */
 	  post->flags = 0;
 	}
 	/* make the previous point to this */
 	if(*last_post)
@@ -301,6 +292,13 @@ int FormParse(char *input,
  return 0;
 }
 int curl_formparse(char *input,
                   struct HttpPost **httppost,
                   struct HttpPost **last_post)
 {
  return FormParse(input, httppost, last_post);
 }
 static int AddFormData(struct FormData **formp,
 			void *line,
 			long length)
@@ -316,6 +314,7 @@ static int AddFormData(struct FormData **formp,
  newform->line = (char *)malloc(length+1);
  memcpy(newform->line, line, length+1);
  newform->length = length;
  newform->line[length]=0; /* zero terminate for easier debugging */
  if(*formp) {
    (*formp)->next = newform;
@@ -331,7 +330,7 @@ static int AddFormData(struct FormData **formp,
 static int AddFormDataf(struct FormData **formp,
 			 char *fmt, ...)
 {
-  char s[1024];
+  char s[4096];
  va_list ap;
  va_start(ap, fmt);
  vsprintf(s, fmt, ap);
@@ -341,7 +340,7 @@ static int AddFormDataf(struct FormData **formp,
 }
-char *MakeFormBoundary(void)
+char *Curl_FormBoundary(void)
 {
  char *retstring;
  static int randomizer=0; /* this is just so that two boundaries within
@@ -367,21 +366,43 @@ char *MakeFormBoundary(void)
  return retstring;
 }
-void FormFree(struct FormData *form)
+/* Used from http.c */ 
 void Curl_FormFree(struct FormData *form)
 {
  struct FormData *next;
  do {
    next=form->next;  /* the following form line */
    free(form->line); /* free the line */
    free(form);       /* free the struct */
-
+  
-  } while(form=next); /* continue */
+  } while((form=next)); /* continue */
 }
-struct FormData *getFormData(struct HttpPost *post,
+/* external function to free up a whole form post chain */
-			     int *sizep)
+void curl_formfree(struct HttpPost *form)
 {
  struct HttpPost *next;
  do {
    next=form->next;  /* the following form line */
    /* recurse to sub-contents */
    if(form->more)
      curl_formfree(form->more);
    if(form->name)
      free(form->name); /* free the name */
    if(form->contents)
      free(form->contents); /* free the contents */
    if(form->contenttype)
      free(form->contenttype); /* free the content type */
    free(form);       /* free the struct */
  } while((form=next)); /* continue */
 }
 struct FormData *Curl_getFormData(struct HttpPost *post,
                                  int *sizep)
 {
  struct FormData *form = NULL;
  struct FormData *firstform;
@@ -395,7 +416,7 @@ struct FormData *getFormData(struct HttpPost *post,
  if(!post)
    return NULL; /* no input => no output! */
-  boundary = MakeFormBoundary();
+  boundary = Curl_FormBoundary();
  /* Make the first line of the output */
  AddFormDataf(&form,
@@ -419,7 +440,7 @@ struct FormData *getFormData(struct HttpPost *post,
      /* If used, this is a link to more file names, we must then do
         the magic to include several files with the same field name */
-      fileboundary = MakeFormBoundary();
+      fileboundary = Curl_FormBoundary();
      size += AddFormDataf(&form,
 			   "\r\nContent-Type: multipart/mixed,"
@@ -448,18 +469,25 @@ struct FormData *getFormData(struct HttpPost *post,
 			     "\r\nContent-Type: %s",
 			     file->contenttype);
      }
 #if 0
      /* The header Content-Transfer-Encoding: seems to confuse some receivers
       * (like the built-in PHP engine). While I can't see any reason why it
       * should, I can just as well skip this to the benefit of the users who
       * are using such confused receivers.
       */
      if(file->contenttype &&
 	 !strnequal("text/", file->contenttype, 5)) {
 	/* this is not a text content, mention our binary encoding */
-	size += AddFormDataf(&form,
+	size += AddFormData(&form, "\r\nContent-Transfer-Encoding: binary", 0);
 			     "\r\nContent-Transfer-Encoding: binary");
      }
 #endif
      size += AddFormData(&form, "\r\n\r\n", 0);
-      size += AddFormDataf(&form,
+      if((post->flags & HTTPPOST_FILENAME) ||
-			   "\r\n\r\n");
+	 (post->flags & HTTPPOST_READFILE)) {
      if(post->flags & HTTPPOST_FILENAME) {
 	/* we should include the contents from the specified file */
 	FILE *fileread;
 	char buffer[1024];
@@ -476,15 +504,12 @@ struct FormData *getFormData(struct HttpPost *post,
 	  }
          if(fileread != stdin)
            fclose(fileread);
 	} else {
 	  size += AddFormData(&form, "[File wasn't found by client]", 0);
 	}
-	else {
+      } else {
 	  size += AddFormDataf(&form, "[File wasn't found by client]");
 	}
      }
      else {
 	/* include the contents we got */
-	size += AddFormDataf(&form,
+	size += AddFormData(&form, post->contents, 0);
 			     post->contents);
      }
    } while((file = file->more)); /* for each specified file for this field */
@@ -511,22 +536,22 @@ struct FormData *getFormData(struct HttpPost *post,
  return firstform;
 }
-int FormInit(struct Form *form, struct FormData *formdata )
+int Curl_FormInit(struct Form *form, struct FormData *formdata )
 {
  form->data = formdata;
  form->sent = 0;
  if(!formdata)
    return 1; /* error */
  form->data = formdata;
  form->sent = 0;
  return 0;
 }
 /* fread() emulation */
-int FormReader(char *buffer,
+int Curl_FormReader(char *buffer,
-	       size_t size,
+                    size_t size,
-	       size_t nitems,
+                    size_t nitems,
-	       FILE *mydata)
+                    FILE *mydata)
 {
  struct Form *form;
  int wantedsize;
@@ -537,7 +562,7 @@ int FormReader(char *buffer,
  wantedsize = size * nitems;
  if(!form->data)
-    return 0; /* nothing, error, empty */
+    return -1; /* nothing, error, empty */
  do {
@@ -601,7 +626,7 @@ int main(int argc, char **argv)
    }
  }
-  form=getFormData(httppost, &size);
+  form=Curl_getFormData(httppost, &size);
  FormInit(&formread, form);
--- a/lib/formdata.h
+++ b/lib/formdata.h
@@ -8,66 +8,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.
+ *****************************************************************************/
 *
 *  Contributor(s):
 *   Rafael Sagula <sagula@inf.ufrgs.br>
 *   Sampo Kellomaki <sampo@iki.fi>
 *   Linas Vepstas <linas@linas.org>
 *   Bjorn Reese <breese@imada.ou.dk>
 *   Johan Anderson <johan@homemail.com>
 *   Kjell Ericson <Kjell.Ericson@haxx.nu>
 *   Troy Engel <tengel@palladium.net>
 *   Ryan Nelson <ryan@inch.com>
 *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
 *   Angus Mackay <amackay@gus.ml.org>
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 * $Log$
 * Revision 1.2  2000-01-10 23:36:14  bagder
 * syncing with local edit
 *
 * Revision 1.4  1999/09/06 06:59:40  dast
 * Changed email info
 *
 * Revision 1.3  1999/08/13 07:34:47  dast
 * Changed the URL in the header
 *
 * Revision 1.2  1999/07/30 12:59:47  dast
 * FormFree() was added to properly cleanup after a form was posted.
 *
 * Revision 1.1.1.1  1999/03/11 22:23:34  dast
 * Imported sources
 *
 ****************************************************************************/
 /* plain and simple linked list with lines to send */
 struct FormData {
  struct FormData *next;
@@ -81,23 +36,19 @@ struct Form {
 	       been sent in a previous invoke */
 };
-int FormParse(char *string,
+int Curl_FormInit(struct Form *form, struct FormData *formdata );
 	      struct HttpPost **httppost,
 	      struct HttpPost **last_post);
-int FormInit(struct Form *form, struct FormData *formdata );
+struct FormData *Curl_getFormData(struct HttpPost *post,
-
+                                  int *size);
 struct FormData *getFormData(struct HttpPost *post,
 			     int *size);
 /* fread() emulation */
-int FormReader(char *buffer,
+int Curl_FormReader(char *buffer,
-	       size_t size,
+                    size_t size,
-	       size_t nitems,
+                    size_t nitems,
-	       FILE *mydata);
+                    FILE *mydata);
-char *MakeFormBoundary(void);
+char *Curl_FormBoundary(void);
-void FormFree(struct FormData *);
+void Curl_FormFree(struct FormData *);
 #endif
--- a/lib/ftp.c
+++ b/lib/ftp.c
--- a/lib/ftp.h
+++ b/lib/ftp.h
@@ -8,45 +8,33 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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.
+ *****************************************************************************/
- *
+CURLcode Curl_ftp(struct connectdata *conn);
- * ------------------------------------------------------------
+CURLcode Curl_ftp_done(struct connectdata *conn);
- * Main author:
+CURLcode Curl_ftp_connect(struct connectdata *conn);
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+
- *
+size_t Curl_ftpsendf(int fd, struct connectdata *, char *fmt, ...);
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 UrgError ftp(struct UrlData *data,
             long *bytecountp,
             char *ftpuser,
             char *ftppasswd,
             char *ppath);
 struct curl_slist *curl_slist_append(struct curl_slist *list, char *data);
 void curl_slist_free_all(struct curl_slist *list);
 /* The kerberos stuff needs this: */
 int Curl_GetFTPResponse(int sockfd, char *buf,
                        struct connectdata *conn,
                        int *ftpcode);
 #endif
--- a/lib/getdate.c
+++ b/lib/getdate.c
@@ -33,10 +33,20 @@
 */
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
 # ifdef NEED_REENTRANT
 # define _REENTRANT /* Necessary to use in Solaris, since the silly guys at
                       Sun made the localtime_r() prototype dependent on it
                       (or _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS) */
 # endif
 # ifdef HAVE_TIME_H
 #  include <time.h>
 # endif
 #endif
 /* Since the code of getdate.y is not included in the Emacs executable
@@ -53,7 +63,7 @@
 #include <sys/types.h>
 #include <sys/malloc.h>
 #else
-#include <malloc.h>
+
 #endif
 #include <string.h>
 #include <stdio.h>
@@ -61,6 +71,12 @@
 #if HAVE_STDLIB_H
 # include <stdlib.h> /* for `free'; used by Bison 1.27 */
 #else
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #endif
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
@@ -206,7 +222,7 @@ static int	yyRelSeconds;
 static int	yyRelYear;
-#line 189 "getdate.y"
+#line 205 "getdate.y"
 typedef union {
    int			Number;
    enum _MERIDIAN	Meridian;
@@ -289,11 +305,11 @@ static const short yyrhs[] = {    -1,
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   205,   206,   209,   212,   215,   218,   221,   224,   227,   233,
+   221,   222,   225,   228,   231,   234,   237,   240,   243,   249,
-   239,   248,   254,   266,   269,   272,   278,   282,   286,   292,
+   255,   264,   270,   282,   285,   288,   294,   298,   302,   308,
-   296,   314,   320,   326,   330,   335,   339,   346,   354,   357,
+   312,   330,   336,   342,   346,   351,   355,   362,   370,   373,
-   360,   363,   366,   369,   372,   375,   378,   381,   384,   387,
+   376,   379,   382,   385,   388,   391,   394,   397,   400,   403,
-   390,   393,   396,   399,   402,   405,   408,   413,   446,   450
+   406,   409,   412,   415,   418,   421,   424,   429,   462,   466
 };
 #endif
@@ -374,7 +390,7 @@ static const short yycheck[] = {     0,
    56
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
+#line 3 "/usr/local/share/bison.simple"
 /* This file comes from bison-1.28.  */
 /* Skeleton output parser for bison,
@@ -588,7 +604,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 #endif
-#line 217 "/usr/lib/bison.simple"
+#line 217 "/usr/local/share/bison.simple"
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
   into yyparse.  The argument should have type void *.
@@ -917,37 +933,37 @@ yyreduce:
  switch (yyn) {
 case 3:
-#line 209 "getdate.y"
+#line 225 "getdate.y"
 {
 	    yyHaveTime++;
 	;
    break;}
 case 4:
-#line 212 "getdate.y"
+#line 228 "getdate.y"
 {
 	    yyHaveZone++;
 	;
    break;}
 case 5:
-#line 215 "getdate.y"
+#line 231 "getdate.y"
 {
 	    yyHaveDate++;
 	;
    break;}
 case 6:
-#line 218 "getdate.y"
+#line 234 "getdate.y"
 {
 	    yyHaveDay++;
 	;
    break;}
 case 7:
-#line 221 "getdate.y"
+#line 237 "getdate.y"
 {
 	    yyHaveRel++;
 	;
    break;}
 case 9:
-#line 227 "getdate.y"
+#line 243 "getdate.y"
 {
 	    yyHour = yyvsp[-1].Number;
 	    yyMinutes = 0;
@@ -956,7 +972,7 @@ case 9:
 	;
    break;}
 case 10:
-#line 233 "getdate.y"
+#line 249 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -965,7 +981,7 @@ case 10:
 	;
    break;}
 case 11:
-#line 239 "getdate.y"
+#line 255 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -977,7 +993,7 @@ case 11:
 	;
    break;}
 case 12:
-#line 248 "getdate.y"
+#line 264 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -986,7 +1002,7 @@ case 12:
 	;
    break;}
 case 13:
-#line 254 "getdate.y"
+#line 270 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -999,53 +1015,53 @@ case 13:
 	;
    break;}
 case 14:
-#line 266 "getdate.y"
+#line 282 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number;
 	;
    break;}
 case 15:
-#line 269 "getdate.y"
+#line 285 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number - 60;
 	;
    break;}
 case 16:
-#line 273 "getdate.y"
+#line 289 "getdate.y"
 {
 	    yyTimezone = yyvsp[-1].Number - 60;
 	;
    break;}
 case 17:
-#line 278 "getdate.y"
+#line 294 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[0].Number;
 	;
    break;}
 case 18:
-#line 282 "getdate.y"
+#line 298 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[-1].Number;
 	;
    break;}
 case 19:
-#line 286 "getdate.y"
+#line 302 "getdate.y"
 {
 	    yyDayOrdinal = yyvsp[-1].Number;
 	    yyDayNumber = yyvsp[0].Number;
 	;
    break;}
 case 20:
-#line 292 "getdate.y"
+#line 308 "getdate.y"
 {
 	    yyMonth = yyvsp[-2].Number;
 	    yyDay = yyvsp[0].Number;
 	;
    break;}
 case 21:
-#line 296 "getdate.y"
+#line 312 "getdate.y"
 {
 	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
 	     The goal in recognizing YYYY/MM/DD is solely to support legacy
@@ -1066,7 +1082,7 @@ case 21:
 	;
    break;}
 case 22:
-#line 314 "getdate.y"
+#line 330 "getdate.y"
 {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
 	    yyYear = yyvsp[-2].Number;
@@ -1075,7 +1091,7 @@ case 22:
 	;
    break;}
 case 23:
-#line 320 "getdate.y"
+#line 336 "getdate.y"
 {
 	    /* e.g. 17-JUN-1992.  */
 	    yyDay = yyvsp[-2].Number;
@@ -1084,14 +1100,14 @@ case 23:
 	;
    break;}
 case 24:
-#line 326 "getdate.y"
+#line 342 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[0].Number;
 	;
    break;}
 case 25:
-#line 330 "getdate.y"
+#line 346 "getdate.y"
 {
 	    yyMonth = yyvsp[-3].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1099,14 +1115,14 @@ case 25:
 	;
    break;}
 case 26:
-#line 335 "getdate.y"
+#line 351 "getdate.y"
 {
 	    yyMonth = yyvsp[0].Number;
 	    yyDay = yyvsp[-1].Number;
 	;
    break;}
 case 27:
-#line 339 "getdate.y"
+#line 355 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1114,7 +1130,7 @@ case 27:
 	;
    break;}
 case 28:
-#line 346 "getdate.y"
+#line 362 "getdate.y"
 {
 	    yyRelSeconds = -yyRelSeconds;
 	    yyRelMinutes = -yyRelMinutes;
@@ -1125,115 +1141,115 @@ case 28:
 	;
    break;}
 case 30:
-#line 357 "getdate.y"
+#line 373 "getdate.y"
 {
 	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 31:
-#line 360 "getdate.y"
+#line 376 "getdate.y"
 {
 	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 32:
-#line 363 "getdate.y"
+#line 379 "getdate.y"
 {
 	    yyRelYear += yyvsp[0].Number;
 	;
    break;}
 case 33:
-#line 366 "getdate.y"
+#line 382 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 34:
-#line 369 "getdate.y"
+#line 385 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 35:
-#line 372 "getdate.y"
+#line 388 "getdate.y"
 {
 	    yyRelMonth += yyvsp[0].Number;
 	;
    break;}
 case 36:
-#line 375 "getdate.y"
+#line 391 "getdate.y"
 {
 	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 37:
-#line 378 "getdate.y"
+#line 394 "getdate.y"
 {
 	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 38:
-#line 381 "getdate.y"
+#line 397 "getdate.y"
 {
 	    yyRelDay += yyvsp[0].Number;
 	;
    break;}
 case 39:
-#line 384 "getdate.y"
+#line 400 "getdate.y"
 {
 	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 40:
-#line 387 "getdate.y"
+#line 403 "getdate.y"
 {
 	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 41:
-#line 390 "getdate.y"
+#line 406 "getdate.y"
 {
 	    yyRelHour += yyvsp[0].Number;
 	;
    break;}
 case 42:
-#line 393 "getdate.y"
+#line 409 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 43:
-#line 396 "getdate.y"
+#line 412 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 44:
-#line 399 "getdate.y"
+#line 415 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[0].Number;
 	;
    break;}
 case 45:
-#line 402 "getdate.y"
+#line 418 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 46:
-#line 405 "getdate.y"
+#line 421 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
    break;}
 case 47:
-#line 408 "getdate.y"
+#line 424 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[0].Number;
 	;
    break;}
 case 48:
-#line 414 "getdate.y"
+#line 430 "getdate.y"
 {
 	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
 	      yyYear = yyvsp[0].Number;
@@ -1266,20 +1282,20 @@ case 48:
 	  ;
    break;}
 case 49:
-#line 447 "getdate.y"
+#line 463 "getdate.y"
 {
 	    yyval.Meridian = MER24;
 	  ;
    break;}
 case 50:
-#line 451 "getdate.y"
+#line 467 "getdate.y"
 {
 	    yyval.Meridian = yyvsp[0].Meridian;
 	  ;
    break;}
 }
   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
+#line 543 "/usr/local/share/bison.simple"
  yyvsp -= yylen;
  yyssp -= yylen;
@@ -1499,7 +1515,7 @@ yyerrhandle:
    }
  return 1;
 }
-#line 456 "getdate.y"
+#line 472 "getdate.y"
 /* Include this file down here because bison inserts code above which
@@ -1955,14 +1971,20 @@ difftm (struct tm *a, struct tm *b)
 }
 time_t
-get_date (const char *p, const time_t *now)
+curl_getdate (const char *p, const time_t *now)
 {
  struct tm tm, tm0, *tmp;
  time_t Start;
-
+#ifdef HAVE_LOCALTIME_R
  struct tm keeptime;
 #endif
  yyInput = p;
  Start = now ? *now : time ((time_t *) NULL);
 #ifdef HAVE_LOCALTIME_R
  tmp = (struct tm *)localtime_r(&Start, &keeptime);
 #else
  tmp = localtime (&Start);
 #endif
  if (!tmp)
    return -1;
  yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
@@ -2089,7 +2111,7 @@ main (ac, av)
  buff[MAX_BUFF_LEN] = 0;
  while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
    {
-      d = get_date (buff, (time_t *) NULL);
+      d = curl_getdate (buff, (time_t *) NULL);
      if (d == -1)
 	(void) printf ("Bad format - couldn't convert.\n");
      else
--- a/lib/getdate.h
+++ b/lib/getdate.h
@@ -1,18 +1,11 @@
-/*  Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+/*
-
+**  Originally written by Steven M. Bellovin <smb@research.att.com> while
-   This program is free software; you can redistribute it and/or modify
+**  at the University of North Carolina at Chapel Hill.  Later tweaked by
-   it under the terms of the GNU General Public License as published by
+**  a couple of people on Usenet.  Completely overhauled by Rich $alz
-   the Free Software Foundation; either version 2, or (at your option)
+**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
-   any later version.
+**
-
+**  This code is in the public domain and has no copyright.
-   This program is distributed in the hope that it will be useful,
+*/
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -43,4 +36,4 @@
 # endif
 #endif /* defined (vms) */
-time_t get_date PARAMS ((const char *p, const time_t *now));
+time_t curl_getdate PARAMS ((const char *p, const time_t *now));
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -9,10 +9,20 @@
 */
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
 # ifdef NEED_REENTRANT
 # define _REENTRANT /* Necessary to use in Solaris, since the silly guys at
                       Sun made the localtime_r() prototype dependent on it
                       (or _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS) */
 # endif
 # ifdef HAVE_TIME_H
 #  include <time.h>
 # endif
 #endif
 /* Since the code of getdate.y is not included in the Emacs executable
@@ -29,7 +39,7 @@
 #include <sys/types.h>
 #include <sys/malloc.h>
 #else
-#include <malloc.h>
+
 #endif
 #include <string.h>
 #include <stdio.h>
@@ -37,6 +47,12 @@
 #if HAVE_STDLIB_H
 # include <stdlib.h> /* for `free'; used by Bison 1.27 */
 #else
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #endif
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
@@ -908,14 +924,20 @@ difftm (struct tm *a, struct tm *b)
 }
 time_t
-get_date (const char *p, const time_t *now)
+curl_getdate (const char *p, const time_t *now)
 {
  struct tm tm, tm0, *tmp;
  time_t Start;
-
+#ifdef HAVE_LOCALTIME_R
  struct tm keeptime;
 #endif
  yyInput = p;
  Start = now ? *now : time ((time_t *) NULL);
 #ifdef HAVE_LOCALTIME_R
  tmp = (struct tm *)localtime_r(&Start, &keeptime);
 #else
  tmp = localtime (&Start);
 #endif
  if (!tmp)
    return -1;
  yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
@@ -1042,7 +1064,7 @@ main (ac, av)
  buff[MAX_BUFF_LEN] = 0;
  while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
    {
-      d = get_date (buff, (time_t *) NULL);
+      d = curl_getdate (buff, (time_t *) NULL);
      if (d == -1)
 	(void) printf ("Bad format - couldn't convert.\n");
      else
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -5,91 +5,52 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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.
+ *****************************************************************************/
 *
 *  Contributor(s):
 *   Rafael Sagula <sagula@inf.ufrgs.br>
 *   Sampo Kellomaki <sampo@iki.fi>
 *   Linas Vepstas <linas@linas.org>
 *   Bjorn Reese <breese@imada.ou.dk>
 *   Johan Anderson <johan@homemail.com>
 *   Kjell Ericson <Kjell.Ericson@haxx.nu>
 *   Troy Engel <tengel@palladium.net>
 *   Ryan Nelson <ryan@inch.com>
 *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
 *   Angus Mackay <amackay@gus.ml.org>
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 * $Log$
 * Revision 1.2  2000-01-10 23:36:14  bagder
 * syncing with local edit
 *
 * Revision 1.4  1999/09/06 06:59:40  dast
 * Changed email info
 *
 * Revision 1.3  1999/08/13 07:34:48  dast
 * Changed the URL in the header
 *
 * Revision 1.2  1999/03/13 00:56:09  dast
 * Big changes done due to url.c being split up in X smaller files and that
 * the lib is now more stand-alone.
 *
 * Revision 1.1.1.1  1999/03/11 22:23:34  dast
 * Imported sources
 *
 ****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef WIN32
 #include <windows.h>
 #endif
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
 static
 char *GetEnv(char *variable)
 {
 #ifdef WIN32
  /* This shit requires windows.h (HUGE) to be included */
-  static char env[MAX_PATH]; /* MAX_PATH is from windef.h */
+  char env[MAX_PATH]; /* MAX_PATH is from windef.h */
  char *temp = getenv(variable);
  env[0] = '\0';
-  ExpandEnvironmentStrings(temp, env, sizeof(env));
+  if (temp != NULL)
    ExpandEnvironmentStrings(temp, env, sizeof(env));
 #else
  /* no length control */
  char *env = getenv(variable);
 #endif
-  return env;
+  return (env && env[0])?strdup(env):NULL;
 }
-char *curl_GetEnv(char *v)
+char *curl_getenv(char *v)
 {
  return GetEnv(v);
 }
--- a/lib/getenv.h
+++ b/lib/getenv.h
@@ -7,65 +7,22 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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.
+ *****************************************************************************/
 *
 *  Contributor(s):
 *   Rafael Sagula <sagula@inf.ufrgs.br>
 *   Sampo Kellomaki <sampo@iki.fi>
 *   Linas Vepstas <linas@linas.org>
 *   Bjorn Reese <breese@imada.ou.dk>
 *   Johan Anderson <johan@homemail.com>
 *   Kjell Ericson <Kjell.Ericson@haxx.nu>
 *   Troy Engel <tengel@palladium.net>
 *   Ryan Nelson <ryan@inch.com>
 *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
 *   Angus Mackay <amackay@gus.ml.org>
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 * $Log$
 * Revision 1.2  2000-01-10 23:36:14  bagder
 * syncing with local edit
 *
 * Revision 1.3  1999/09/06 06:59:40  dast
 * Changed email info
 *
 * Revision 1.2  1999/08/13 07:34:48  dast
 * Changed the URL in the header
 *
 * Revision 1.1.1.1  1999/03/11 22:23:34  dast
 * Imported sources
 *
 ****************************************************************************/
-/* Unix and Win32 getenv function call */
+#include <curl/curl.h>
 char *GetEnv(char *variable);
 #endif
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -0,0 +1,116 @@
 /*****************************************************************************
 *                                  _   _ ____  _     
 *  Project                     ___| | | |  _ \| |    
 *                             / __| | | | |_) | |    
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
 *
 * In order to be useful for every potential user, curl and libcurl are
 * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *
 * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 * copies of the Software, and permit persons to whom the Software is
 * furnished to do so, under the terms of the MPL or the MIT/X-derivate
 * licenses. You may pick one of these licenses.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 * $Id$
 *****************************************************************************/
 #include "setup.h"
 #include <curl/curl.h>
 #include "urldata.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 CURLcode curl_getinfo(CURL *curl, CURLINFO info, ...)
 {
  va_list arg;
  long *param_longp;
  double *param_doublep;
  char **param_charp;
  struct UrlData *data = (struct UrlData *)curl;
  va_start(arg, info);
  switch(info&CURLINFO_TYPEMASK) {
  default:
    return CURLE_BAD_FUNCTION_ARGUMENT;
  case CURLINFO_STRING:
    param_charp = va_arg(arg, char **);  
    if(NULL == param_charp)
      return CURLE_BAD_FUNCTION_ARGUMENT;
    break;
  case CURLINFO_LONG:
    param_longp = va_arg(arg, long *);
    if(NULL == param_longp)
      return CURLE_BAD_FUNCTION_ARGUMENT;
    break;
  case CURLINFO_DOUBLE:
    param_doublep = va_arg(arg, double *);
    if(NULL == param_doublep)
      return CURLE_BAD_FUNCTION_ARGUMENT;
    break;
  }
  switch(info) {
  case CURLINFO_EFFECTIVE_URL:
    *param_charp = data->url?data->url:"";
    break;
  case CURLINFO_HTTP_CODE:
    *param_longp = data->progress.httpcode;
    break;
  case CURLINFO_FILETIME:
    *param_longp = data->progress.filetime;
    break;
  case CURLINFO_HEADER_SIZE:
    *param_longp = data->header_size;
    break;
  case CURLINFO_REQUEST_SIZE:
    *param_longp = data->request_size;
    break;
  case CURLINFO_TOTAL_TIME:
    *param_doublep = data->progress.timespent;
    break;
  case CURLINFO_NAMELOOKUP_TIME:
    *param_doublep = data->progress.t_nslookup;
    break;
  case CURLINFO_CONNECT_TIME:
    *param_doublep = data->progress.t_connect;
    break;
  case CURLINFO_PRETRANSFER_TIME:
    *param_doublep =  data->progress.t_pretransfer;
    break;
  case CURLINFO_SIZE_UPLOAD:
    *param_doublep =  data->progress.uploaded;
    break;
  case CURLINFO_SIZE_DOWNLOAD:
    *param_doublep = data->progress.downloaded;
    break;
  case CURLINFO_SPEED_DOWNLOAD:
    *param_doublep =  data->progress.dlspeed;
    break;
  case CURLINFO_SPEED_UPLOAD:
    *param_doublep = data->progress.ulspeed;
    break;
  case CURLINFO_SSL_VERIFYRESULT:
    *param_longp = data->ssl.certverifyresult;
    break;
  case CURLINFO_CONTENT_LENGTH_DOWNLOAD:
    *param_doublep = data->progress.size_dl;
    break;
  case CURLINFO_CONTENT_LENGTH_UPLOAD:
    *param_doublep = data->progress.size_ul;
    break;
  default:
    return CURLE_BAD_FUNCTION_ARGUMENT;
  }
  return CURLE_OK;
 }
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -4,10 +4,11 @@
 * Redistribution and use are freely permitted provided that:
 *
 *   1) This header remain in tact.
- *   2) The prototype for getpass is not changed from:
+ *   2) The prototypes for getpass and getpass_r are not changed from:
 *         char *getpass(const char *prompt)
 *         char *getpass_r(const char *prompt, char* buffer, int buflen)
 *   3) This source code is not used outside of this(getpass.c) file.
- *   3) Any changes to this(getpass.c) source code are made publicly available.
+ *   4) Any changes to this(getpass.c) source code are made publicly available.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -31,22 +32,22 @@
 *   Angus Mackay <amackay@gus.ml.org>
 *
 * Contributor(s):
- *   Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ *   Daniel Stenberg <daniel@haxx.se>
 */
 #ifndef WIN32
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 #ifndef HAVE_GETPASS_R
 #ifndef WIN32
 #ifdef HAVE_TERMIOS_H
 #  if !defined(HAVE_TCGETATTR) && !defined(HAVE_TCSETATTR) 
 #    undef HAVE_TERMIOS_H
 #  endif
 #endif
 #define INPUT_BUFFER 128
 #ifndef RETSIGTYPE
 #  define RETSIGTYPE void
 #endif
@@ -70,13 +71,14 @@
 #  define perror(x) fprintf(stderr, "Error in: %s\n", x)
 #endif
-char *getpass(const char *prompt)
+char *getpass_r(const char *prompt, char *buffer, size_t buflen)
 {
  FILE *infp;
  FILE *outfp;
  static char buf[INPUT_BUFFER];
  RETSIGTYPE (*sigint)();
 #ifndef __EMX__
  RETSIGTYPE (*sigtstp)();
 #endif
  size_t bytes_read;
  int infd;
  int outfd;
@@ -92,7 +94,11 @@ char *getpass(const char *prompt)
 #endif
  sigint = signal(SIGINT, SIG_IGN);
  /* 20000318 mgs
   * this is needed by the emx system, SIGTSTP is not a supported signal */
 #ifndef __EMX__
  sigtstp = signal(SIGTSTP, SIG_IGN);
 #endif
  if( (infp=fopen("/dev/tty", "r")) == NULL )
  {
@@ -109,25 +115,25 @@ char *getpass(const char *prompt)
 #ifdef HAVE_TERMIOS_H
  if(tcgetattr(outfd, &orig) != 0)
  {
-    perror("tcgetattr");
+    ; /*perror("tcgetattr");*/
  }
  noecho = orig;
  noecho.c_lflag &= ~ECHO;
  if(tcsetattr(outfd, TCSANOW, &noecho) != 0)
  {
-    perror("tcgetattr");
+    ; /*perror("tcgetattr");*/
  }
 #else
 #  ifdef HAVE_TERMIO_H
  if(ioctl(outfd, TCGETA, &orig) != 0)
  {
-    perror("ioctl");
+    ; /*perror("ioctl");*/
  }
  noecho = orig;
  noecho.c_lflag &= ~ECHO;
  if(ioctl(outfd, TCSETA, &noecho) != 0)
  {
-    perror("ioctl");
+    ; /*perror("ioctl");*/
  }
 #  else
 #  endif
@@ -136,8 +142,8 @@ char *getpass(const char *prompt)
  fputs(prompt, outfp);
  fflush(outfp);
-  bytes_read=read(infd, buf, INPUT_BUFFER);
+  bytes_read=read(infd, buffer, buflen);
-  buf[bytes_read > 0 ? (bytes_read -1) : 0] = '\0';
+  buffer[bytes_read > 0 ? (bytes_read -1) : 0] = '\0';
  /* print a new line if needed */
 #ifdef HAVE_TERMIOS_H
@@ -151,35 +157,60 @@ char *getpass(const char *prompt)
  /*
   * reset term charectaristics, use TCSAFLUSH incase the
-   * user types more than INPUT_BUFFER
+   * user types more than buflen
   */
 #ifdef HAVE_TERMIOS_H
  if(tcsetattr(outfd, TCSAFLUSH, &orig) != 0)
  {
-    perror("tcgetattr");
+    ; /*perror("tcgetattr");*/
  }
 #else
 #  ifdef HAVE_TERMIO_H
  if(ioctl(outfd, TCSETA, &orig) != 0)
  {
-    perror("ioctl");
+    ; /*perror("ioctl");*/
  }
 #  else
 #  endif
 #endif
  signal(SIGINT, sigint);
 #ifndef __EMX__
  signal(SIGTSTP, sigtstp);
 #endif
-  return(buf);
+  return buffer; /* we always return success */
 }
-#else
+#else /* WIN32 */
 #include <stdio.h>
 #include <conio.h>
 char *getpass_r(const char *prompt, char *buffer, int buflen)
 {
  int i;
  printf("%s", prompt);
  for(i=0; i<buflen; i++) {
    buffer[i] = getch();
    if ( buffer[i] == '\r' ) {
      buffer[i] = 0;
      break;
    }
  }
  /* if user didn't hit ENTER, terminate buffer */
  if (i==buflen)
    buffer[buflen-1]=0;
  return buffer; /* we always return success */
 }
 #endif
 #endif /* ifndef HAVE_GETPASS_R */
 #if 0
 /* for consistensy, here's the old-style function: */
 char *getpass(const char *prompt)
 {
-	static char password[80];
+  static char buf[256];
-	printf(prompt);
+  return getpass_r(prompt, buf, sizeof(buf));
 	gets(password);
 	return password;
 }
-#endif /* don't do anything if WIN32 */
+#endif
--- a/lib/getpass.h
+++ b/lib/getpass.h
@@ -1 +1,35 @@
-char *getpass(const char *prompt);
+#ifndef __GETPASS_H
 #define __GETPASS_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$
 *****************************************************************************/
 #ifndef HAVE_GETPASS_R
 /* If there's a system-provided function named like this, we trust it is
   also found in one of the standard headers. */
 /*
 * Returning NULL will abort the continued operation!
 */
 char* getpass_r(char *prompt, char* buffer, size_t buflen );
 #endif
 #endif
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -5,43 +5,29 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 #include <string.h>
 #include "setup.h"
 #include <string.h>
 #include <errno.h>
 #define _REENTRANT
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #else
@@ -51,8 +37,12 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -61,51 +51,161 @@
 #include "urldata.h"
 #include "sendf.h"
 #if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
 #include "inet_ntoa_r.h"
 #endif
 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
 #include "memdebug.h"
 #endif
 /* --- resolve name or IP-number --- */
-char *MakeIP(unsigned long num)
+static char *MakeIP(unsigned long num,char *addr, int addr_len)
 {
-#ifdef HAVE_INET_NTOA
+#if defined(HAVE_INET_NTOA) || defined(HAVE_INET_NTOA_R)
  struct in_addr in;
  in.s_addr = htonl(num);
-  return (inet_ntoa(in));
+
 #if defined(HAVE_INET_NTOA_R)
  inet_ntoa_r(in,addr,addr_len);
 #else
  strncpy(addr,inet_ntoa(in),addr_len);
 #endif
 #else
  static char addr[128];
  unsigned char *paddr;
  num = htonl(num);  /* htonl() added to avoid endian probs */
  paddr = (unsigned char *)&num;
  sprintf(addr, "%u.%u.%u.%u", paddr[0], paddr[1], paddr[2], paddr[3]);
  return (addr);
 #endif
  return (addr);
 }
-/* Stolen from Dancer source code, written by
+#ifdef ENABLE_IPV6
-   Bjorn Reese <breese@imada.ou.dk> */
+struct addrinfo *Curl_getaddrinfo(struct UrlData *data,
 			       char *hostname,
 			       int port)
 {
  struct addrinfo hints, *res;
  int error;
  char sbuf[NI_MAXSERV];
  memset(&hints, 0, sizeof(hints));
  hints.ai_family = PF_UNSPEC;
  hints.ai_socktype = SOCK_STREAM;
  hints.ai_flags = AI_CANONNAME;
  snprintf(sbuf, sizeof(sbuf), "%d", port);
  error = getaddrinfo(hostname, sbuf, &hints, &res);
  if (error) {
    infof(data, "getaddrinfo(3) failed for %s\n", hostname);
    return NULL;
  }
  return res;
 }
 #endif
 /* The original code to this function was once stolen from the Dancer source
   code, written by Bjorn Reese, it has since been patched and modified
   considerably. */
 #ifndef INADDR_NONE
 #define INADDR_NONE (unsigned long) ~0
 #endif
-struct hostent *GetHost(struct UrlData *data, char *hostname)
+
 struct hostent *Curl_gethost(struct UrlData *data,
                             char *hostname,
                             char **bufp)
 {
  struct hostent *h = NULL;
  unsigned long in;
-  static struct hostent he;
+  int ret; /* this variable is unused on several platforms but used on some */
-  static char name[MAXHOSTNAMELEN];
+
-  static char *addrlist[2];
+#define CURL_NAMELOOKUP_SIZE 9000
-  static struct in_addr addrentry;
+
  /* Allocate enough memory to hold the full name information structs and
   * everything. OSF1 is known to require at least 8872 bytes. The buffer
   * required for storing all possible aliases and IP numbers is according to
   * Stevens' Unix Network Programming 2nd editor, p. 304: 8192 bytes! */
  char *buf = (char *)malloc(CURL_NAMELOOKUP_SIZE);
  if(!buf)
    return NULL; /* major failure */
  *bufp = buf;
  if ( (in=inet_addr(hostname)) != INADDR_NONE ) {
-    addrentry.s_addr = in;
+    struct in_addr *addrentry;
-    addrlist[0] = (char *)&addrentry;
+
-    addrlist[1] = NULL;
+    h = (struct hostent*)buf;
-    he.h_name = strncpy(name, MakeIP(ntohl(in)), MAXHOSTNAMELEN);
+    h->h_addr_list = (char**)(buf + sizeof(*h));
-    he.h_addrtype = AF_INET;
+    addrentry = (struct in_addr*)(h->h_addr_list + 2);
-    he.h_length = sizeof(struct in_addr);
+    addrentry->s_addr = in;
-    he.h_addr_list = addrlist;
+    h->h_addr_list[0] = (char*)addrentry;
-    h = &he;
+    h->h_addr_list[1] = NULL;
-  } else if ( (h=gethostbyname(hostname)) == NULL ) {
+    h->h_addrtype = AF_INET;
-    infof(data, "gethostbyname(2) failed for %s\n", hostname);
+    h->h_length = sizeof(*addrentry);
    h->h_name = *(h->h_addr_list) + h->h_length;
    /* bad one h->h_name = (char*)(h->h_addr_list + h->h_length); */
    MakeIP(ntohl(in),h->h_name, CURL_NAMELOOKUP_SIZE - (long)(h->h_name) + (long)buf);
  }
 #if defined(HAVE_GETHOSTBYNAME_R)
  else {
    int h_errnop;
     /* Workaround for gethostbyname_r bug in qnx nto. It is also _required_
        for some of these functions. */
    memset(buf, 0, CURL_NAMELOOKUP_SIZE);
 #ifdef HAVE_GETHOSTBYNAME_R_5
    /* Solaris, IRIX and more */
    if ((h = gethostbyname_r(hostname,
                             (struct hostent *)buf,
                             buf + sizeof(struct hostent),
                             CURL_NAMELOOKUP_SIZE - sizeof(struct hostent),
                             &h_errnop)) == NULL )
 #endif
 #ifdef HAVE_GETHOSTBYNAME_R_6
    /* Linux */
    if( gethostbyname_r(hostname,
                        (struct hostent *)buf,
                        buf + sizeof(struct hostent),
                        CURL_NAMELOOKUP_SIZE - sizeof(struct hostent),
                        &h, /* DIFFERENCE */
                        &h_errnop))
 #endif
 #ifdef HAVE_GETHOSTBYNAME_R_3
    /* AIX, Digital Unix, HPUX 10, more? */
    if(CURL_NAMELOOKUP_SIZE >=
       (sizeof(struct hostent)+sizeof(struct hostent_data)))
      /* August 22nd, 2000: Albert Chin-A-Young brought an updated version
       * that should work! September 20: Richard Prescott worked on the buffer
       * size dilemma. */
      ret = gethostbyname_r(hostname,
                          (struct hostent *)buf,
                          (struct hostent_data *)(buf + sizeof(struct hostent)));
    else
      ret = -1; /* failure, too smallish buffer size */
    /* result expected in h */
    h = (struct hostent*)buf;
    h_errnop= errno; /* we don't deal with this, but set it anyway */
    if(ret)
 #endif
      {
      infof(data, "gethostbyname_r(2) failed for %s\n", hostname);
      h = NULL; /* set return code to NULL */
      free(buf);
      *bufp=NULL;
    }
 #else
  else {
    if ((h = gethostbyname(hostname)) == NULL ) {
      infof(data, "gethostbyname(2) failed for %s\n", hostname);
      free(buf);
      *bufp=NULL;
    }
 #endif
  }
  return (h);
 }
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -7,40 +7,29 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
- *  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$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
-struct hostent *GetHost(struct UrlData *data, char *hostname);
+struct addrinfo;
-char *MakeIP(unsigned long num);
+struct addrinfo *Curl_getaddrinfo(struct UrlData *data,
                             char *hostname,
                             int port);
 struct hostent *Curl_gethost(struct UrlData *data,
                             char *hostname,
                             char **bufp);
 #endif
--- a/Show More
+++ b/Show More