release commit

recent versions of the source

CVS-INFO

@@ -0,0 +1,20 @@
+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
+% autoconf
+% ./configure
+% make

FILES

@@ -1,7 +1,8 @@
 CHANGES
 FILES
 LEGAL
-MPL-1.0.txt
+MPL-1.1.txt
+MITX.txt
 README
 docs/BUGS
 docs/CONTRIBUTE
@@ -11,7 +12,7 @@ docs/INSTALL
 docs/INTERNALS
 docs/MANUAL
 docs/README.win32
-docs/README.libcurl
+docs/LIBCURL
 docs/RESOURCES
 docs/TODO
 docs/curl.1

LEGAL

@@ -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
-  Daniel Stenberg <daniel@haxx.se>
+ document.
-
-Curl is Copyright (C) 1996-2000 Daniel Stenberg
 
+ Please remember to always keep the licensing information included in
+ individual source files up-to-date, so as to avoid misleading anyone as to
+ the status of these files.
 
+ 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.

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.
+

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): ______________________________________.''

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.]
+

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@haxx.se>
-#
-# 	http://curl.haxx.se
-#
-# $Source$
-# $Revision$
-# $Date$
-# $Author$
-# $State$
-# $Locker$
-#
-# ------------------------------------------------------------
-#
-# In a normal unix-setup, this file will become overwritten.
-#
-############################################################################
 
 all:
 	./configure

README

@@ -12,11 +12,13 @@ README
   document.
 
   libcurl is a library that Curl is using to do its job. It is readily
-  available to be used by your software. Read the 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.se

configure.in

@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(lib/urldata.h)
 AM_CONFIG_HEADER(config.h src/config.h)
 
-VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/curl/curl.h`
+VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
 AM_INIT_AUTOMAKE(curl,$VERSION)
 AM_PROG_LIBTOOL
 

docs/CONTRIBUTE

@@ -4,8 +4,6 @@
                             | (__| |_| |  _ <| |___ 
                              \___|\___/|_| \_\_____|
 
-CONTRIBUTE
-
 To Think About When Contributing Source Code
 
  This document is intended to offer some guidelines that can be useful to keep
@@ -15,15 +13,13 @@ To Think About When Contributing Source Code
 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. Curl uses the MozPL, the
+ the same license curl and libcurl is already using.
- Mozilla Public License, which is *NOT* compatible with the well known GPL,
+
- GNU Public License. We can never re-use sources from a GPL program in curl.
  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 either (although they should use "GPL compatible" licenses).
+ GPL (as we don't want the FPL virus to attack users of libcurl) but they must
-
+ use "GPL compatible" licenses.
- Curl and libcurl will soon become dual licensed, MozPL/MITX!
 
 Naming
 
@@ -72,6 +68,13 @@ Separate Patches Doing Different Things
  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

docs/FAQ

@@ -1,4 +1,4 @@
-Updated: January 2, 2001 (http://curl.haxx.se/docs/faq.shtml)
+Updated: January 4, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                   _   _ ____  _     
                               ___| | | |  _ \| |    
                              / __| | | | |_) | |    
@@ -467,74 +467,55 @@ FAQ
 
 6. License Issues
 
-  Curl and libcurl are released under the MPL, the Mozilla Public License. To
+  NOTE: This section is now updated to concern curl 7.5.2 or later!
-  get a really good answer to your license conflict questions, you should
+
-  study the MPL license and the license you are about to use and check for
+  Curl and libcurl are released under a MIT/X derivate license *or* the MPL,
-  clashes yourself. This section is just a brief summary for the cases we get
+  the Mozilla Public License. To get a really good answer to your license
-  the most questions. (Parts of this section was much enhanced by Bjorn
+  conflict questions, you should study the MPL and MIT/X licenses and the
-  Reese.)
+  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?
 
-  No, unfortunately you cannot distribute the (lib)curl code with your code.
+  Yes!
-  According to both the Free Software Foundation and the Mozilla
-  Organization, MPL and GPL are not compatible, because GPL requires of
-  other licenses that they do "not impose any further restrictions on the
-  recipients' exercise of the rights granted herein" [GPL paragraph 6] (One
-  could argue about which license that actually imposes restrictions, but
-  that'll be left for you to ponder about.)
 
-  However, you have two alternative options:
+  Since libcurl may be distributed under the MIT/X derivate license, it can be
-
+  used together with GPL in any software.
-    1) Nothing prevents you from distributing your program separately from
-       curl and libcurl, and request that the user receives it separately.
-       The incompability issues between MPL and GPL only applies to the
-       distribution.
-
-    2) Add the following exception to your distribution (you must have the
-       consent of all the copyright holders of the source code in your
-       project in order to do this) 
-
-         As a special exception, you have permission to link this program
-         with the curl library and distribute executables, as long as you
-         follow the requirements of the GNU GPL in regard to all of the
-         software in the executable aside from curl.
-
-       This exception must be added to your GPL covered source code files
-       immediately after the notification mentioned in the appendix of GPL.
-       The wording was originally suggested by the Free Software Foundation
-       in relationship with the Qt library. We have changed the wording to
-       apply to curl.
 
   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
+  Yes.
-  library. If you end up doing changes to the library, only those changes must
+
-  be made available, not the ones to your program.
+  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
+  Yes.
-  library. If you end up doing changes to the library, only those changes must
+
-  be made available, not the ones to your program.
+  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 you can. LGPL libraries don't spread to other libraries the same way GPL
+  Yes.
-  ones do.
 
-  However, when you read paragraph (3) of the LGPL license, you'll see that
+  The LGPL license don't clash with other licenses.
-  anyone - at will - may at any time convert that LGPL program into GPL. And
-  GPL programs can't be distributed together with MPL programs, neither with
-  (lib)curl source code and not as a binary.
 
   6.5. Can I modify curl/libcurl for my program and keep the changes secret?
 
-  No, you're not allowed to do that.
+  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.
+  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.

docs/RESOURCES

@@ -100,7 +100,7 @@ Similar Tools
 
   swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
 
-  Kermit  - http://www.columbia.edu/kermit/ftpclient/
+  Kermit  - http://www.columbia.edu/kermit/ftpclient
 
 Related Software
 ----------------

docs/curl.1

@@ -2,7 +2,7 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "22 November 2000" "Curl 7.5" "Curl Manual"
+.TH curl 1 "4 January 2001" "Curl 7.5.2" "Curl Manual"
 .SH NAME
 curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
 HTTPS syntax.
@@ -43,12 +43,17 @@ supported at the moment:
 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,10 +72,15 @@ 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!
+
+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". 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
@@ -88,6 +98,8 @@ 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) 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
@@ -107,13 +119,19 @@ 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 last one will be used.
 .IP "--data-ascii <data>"
 (HTTP) This is an alias for the -d/--data option.
+
+If this option is used serveral times, the last one will be used.
 .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.
 .IP "-D/--dump-header <file>"
 (HTTP/FTP)
 Write the HTTP headers to this file. Write the FTP file info to this
@@ -122,6 +140,8 @@ 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) Sends the "Referer Page" information to the HTTP server. This can also
 be set with the -H/--header flag of course.  When used with
@@ -129,6 +149,8 @@ be set with the -H/--header flag of course.  When used with
 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
@@ -136,9 +158,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
@@ -147,6 +173,8 @@ 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) This lets curl emulate a filled in form in which a user has pressed the
 submit button. This causes curl to POST data using the content-type
@@ -166,6 +194,8 @@ input:
 
 To read the file's content from stdin insted of a file, use - where the file
 name should've been. This goes for both @ and < constructs.
+
+This option can be used multiple times.
 .IP "-h/--help"
 Usage help.
 .IP "-H/--header <header>"
@@ -177,38 +207,54 @@ trickier stuff than curl would normally do. You should not replace internally
 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) If the server reports that the requested page has a different
 location (indicated with the header line Location:) this flag will let curl
@@ -216,10 +262,14 @@ attempt to reattempt the get on the new place. If used together with -i or -I,
 headers from all requested pages will be shown. If this flag is used when
 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.  This is
 useful for preventing your batch jobs from hanging for hours due to slow
 networks or links going down.  This doesn't work fully in win32 systems.
+
+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"
@@ -240,11 +290,15 @@ 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 login myself password secret"
+
+If this option is used twice, the second will again disable netrc usage.
 .IP "-N/--no-buffer"
 Disables the buffering of the output stream. In normal work situations, curl
 will use a standard buffered output stream that will have the effect that it
 will output the data in chunks, not necessarily exactly when the data arrives.
 Using this option will disable that buffering.
+
+If this option is used twice, the second will again switch on buffering.
 .IP "-o/--output <file>"
 Write output to <file> instead of stdout. If you are using {} or [] to fetch
 multiple documents, you can use '#' followed by a number in the <file>
@@ -256,15 +310,20 @@ being fetched. Like in:
 or use several variables like:
 
   curl http://{site,host}.host[1-5].com -o "#1_#2"
+
+If this option is used serveral times, the last one will be used.
 .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.)
+
 .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
@@ -286,6 +345,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
@@ -298,6 +359,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
@@ -335,11 +398,17 @@ 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
@@ -353,21 +422,31 @@ 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>"
 Set the URL to fetch. This option is mostly handy when you wanna specify URL
 in a config file.
+
+If this option is used serveral times, the last one will be used.
 .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.
@@ -433,9 +512,13 @@ The average download speed that curl measured for the complete download.
 .B speed_upload
 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.
@@ -445,14 +528,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
@@ -467,6 +556,8 @@ 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.
@@ -476,12 +567,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

include/curl/curl.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include <stdio.h>
 /* The include stuff here is mainly for time_t! */
@@ -471,7 +454,7 @@ char *curl_getenv(char *variable);
 char *curl_version(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.5.2-pre1"
+#define LIBCURL_VERSION "7.5.2"
 #define LIBCURL_VERSION_NUM 0x070502
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */

include/curl/easy.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  __cplusplus
 extern "C" {
 #endif

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):
  *
  *************************************************************************
  *

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>

include/curl/types.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 typedef void CURL;
 typedef void CURLconnect;
 

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$
+ *****************************************************************************/
 
 /***
 

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

lib/dict.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/dict.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode dict(struct connectdata *conn);
 CURLcode dict_done(struct connectdata *conn);
 

lib/download.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/download.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode 
 Transfer (struct connectdata *data,
 	  int sockfd,		/* socket to read from or -1 */

lib/easy.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/escape.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $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.  */

lib/escape.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $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.  */
 

lib/file.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) 1999.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode file(struct connectdata *conn);
 
 #endif

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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 /*
   Debug the form generator stand-alone by compiling this source file with:

lib/formdata.h

@@ -8,69 +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.se>
- *   Troy Engel <tengel@palladium.net>
- *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
- *   Angus Mackay <amackay@gus.ml.org>
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- * $Log$
- * Revision 1.3  2000-06-20 15:31:26  bagder
- * haxx.nu => haxx.se
- *
- * 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;

lib/ftp.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/ftp.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode ftp(struct connectdata *conn);
 CURLcode ftp_done(struct connectdata *conn);
 CURLcode ftp_connect(struct connectdata *conn);

lib/getenv.c

@@ -5,37 +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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>

lib/getenv.h

@@ -7,66 +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.
+ *****************************************************************************/
- *
- *  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.se>
- *   Troy Engel <tengel@palladium.net>
- *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
- *   Angus Mackay <amackay@gus.ml.org>
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- * $Log$
- * Revision 1.3  2000-06-20 15:31:26  bagder
- * haxx.nu => haxx.se
- *
- * 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 */
 char *GetEnv(char *variable);

lib/getinfo.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) 1999.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/highlevel.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/highlevel.h

@@ -7,37 +7,20 @@
  *                            | (__| |_| |  _ <| |___ 
  *                             \___|\___/|_| \_\_____|
  *
- *  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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode curl_transfer(CURL *curl);
 #endif

lib/hostip.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/hostip.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 struct hostent *GetHost(struct UrlData *data, char *hostname, char **bufp );
 

lib/http.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/http.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 /* ftp can use this as well */
 CURLcode GetHTTPProxyTunnel(struct UrlData *data, int tunnelsocket,

lib/if2ip.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/if2ip.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 #include "setup.h"
 
 #if ! defined(WIN32) && ! defined(__BEOS__)

lib/ldap.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Contributor(s):
- *  Bj<42>rn Reese <breese@mail1.stofanet.dk>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/ldap.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://www.fts.frontec.se/~dast/curl/
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode ldap(struct connectdata *conn);
 CURLcode ldap_done(struct connectdata *conn);
 

lib/memdebug.c

@@ -6,38 +6,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) 1999.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/mprintf.c

@@ -4,6 +4,15 @@
  *
  *************************************************************************
  *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
+ * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
+ *
  * Purpose:
  *  A merge of Bjorn Reese's format() function and Daniel's dsprintf()
  *  1.0. A full blooded printf() clone with full support for <num>$

lib/netrc.c

@@ -5,50 +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.
+ *****************************************************************************/
- *
- *  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.se>
- *   Troy Engel <tengel@palladium.net>
- *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
- *   Angus Mackay <amackay@gus.ml.org>
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/netrc.h

@@ -7,66 +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.
+ *****************************************************************************/
- *
- *  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.se>
- *   Troy Engel <tengel@palladium.net>
- *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
- *   Angus Mackay <amackay@gus.ml.org>
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- * $Log$
- * Revision 1.3  2000-06-20 15:31:26  bagder
- * haxx.nu => haxx.se
- *
- * Revision 1.2  2000/01/10 23:36:15  bagder
- * syncing with local edit
- *
- * Revision 1.3  1999/09/06 06:59:41  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
- *
- ****************************************************************************/
 int ParseNetrc(char *host,
 	       char *login,
 	       char *password);

lib/progress.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/progress.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "timeval.h"
 

lib/sendf.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/sendf.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 size_t ftpsendf(int fd, struct connectdata *, char *fmt, ...);
 size_t sendf(int fd, struct UrlData *, char *fmt, ...);

lib/setup.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 
 

lib/speedcheck.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/speedcheck.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/ssluse.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 /*
  * The original SSL code was written by

lib/ssluse.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 int SSL_cert_stuff(struct UrlData *data, 
 		   char *cert_file,
 		   char *key_file);

lib/strequal.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) 2000.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/strequal.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) 2000.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 int strequal(const char *first, const char *second);
 int strnequal(const char *first, const char *second, size_t max);
 

lib/telnet.c

@@ -5,46 +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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- *
- * This implementation of the TELNET protocol is written by
- * Linus Nielsen <Linus.Nielsen@haxx.se>,
- * with some code snippets stolen from the BSD Telnet client.
- *
- * The negotiation is performed according to RFC 1143 (D. Bernstein,
- * "The Q Method of Implementing TELNET Option Negotiation")
- *
- ****************************************************************************/
 
 #include "setup.h"
 

lib/telnet.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.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 CURLcode telnet(struct connectdata *conn);
 CURLcode telnet_done(struct connectdata *conn);
 

lib/timeval.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #ifdef WIN32
 #include <windows.h>

lib/timeval.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

lib/url.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 /* -- WIN32 approved -- */
 

lib/url.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 int GetLine(int sockfd, char *buf, struct UrlData *data);
 
 #endif

lib/urldata.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 /* This file is for lib internal stuff */
 

lib/version.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include "setup.h"
 

src/hugehelp.c

@@ -53,12 +53,19 @@ puts (
 "          append to the target file instead of overwriting it. If\n"
 "          the file doesn't exist, it will be created.\n"
 "\n"
+"          If  this option is used twice, the second one will dis<69>\n"
+"          able append mode again.\n"
+"\n"
 "     -A/--user-agent <agent string>\n"
 "          (HTTP) Specify the User-Agent string  to  send  to  the\n"
 "          HTTP  server.  Some badly done CGIs fail if its not set\n"
-"          to \"Mozilla/4.0\".  To encode blanks in the string, sur<75>\n"
+"          to \"Mozilla/4.0\".  To  encode  blanks  in  the  string,\n"
-"          round the string with single  quote  marks.   This  can\n"
+"          surround  the string with single quote marks.  This can\n"
 "          also be set with the -H/--header flag of course.\n"
+"\n"
+"          If this option is used more than  once,  the  last  one\n"
+"          will be the one to be used.\n"
+"\n"
 "     -b/--cookie <name=data>\n"
 "          (HTTP) Pass the data to the HTTP server as a cookie. It\n"
 "          is supposedly the data  previously  received  from  the\n"
@@ -80,12 +87,18 @@ puts (
 "          To store cookies, save the HTTP headers to a file using\n"
 "          -D/--dump-header!\n"
 "\n"
+"          If  this  option  is  used more than once, the last one\n"
+"          will be the one to be used.\n"
+"\n"
 "     -B/--use-ascii\n"
 "          Use ASCII transfer when getting an  FTP  file  or  LDAP\n"
 "          info.  For  FTP,  this can also be enforced by using an\n"
 "          URL that ends with \";type=A\". This option  causes  data\n"
 "          sent to stdout to be in text mode for win32 systems.\n"
 "\n"
+"          If  this option is used twice, the second one will dis<69>\n"
+"          able ASCII usage.\n"
+"\n"
 "     -c/--continue\n"
 "          Deprecated. Use '-C -' instead.  Continue/Resume a pre<72>\n"
 "          vious  file  transfer.  This instructs curl to continue\n"
@@ -107,6 +120,9 @@ puts (
 "          HTTP resume is only possible  with  HTTP/1.1  or  later\n"
 "          servers.\n"
 "\n"
+"          If  this  option  is  used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -d/--data <data>\n"
 "          (HTTP) Sends the specified data in a  POST  request  to\n"
 "          the  HTTP server. Note that the data is sent exactly as\n"
@@ -131,9 +147,15 @@ puts (
 "\n"
 "          -d/--data is the same as --data-ascii.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     --data-ascii <data>\n"
 "          (HTTP) This is an alias for the -d/--data option.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     --data-binary <data>\n"
 "          (HTTP) This posts data in a similar manner as --data-\n"
 "          ascii does, although when using this option the entire\n"
@@ -141,6 +163,9 @@ puts (
 "          to post a binary file without the strip-newlines fea<65>\n"
 "          ture of the --data-ascii option, this is for you.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -D/--dump-header <file>\n"
 "          (HTTP/FTP) Write the HTTP headers to this file. Write\n"
 "          the FTP file info to this file if -I/--head is used.\n"
@@ -150,6 +175,9 @@ puts (
 "          could then be read in a second curl invoke by using the\n"
 "          -b/--cookie option!\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -e/--referer <URL>\n"
 "          (HTTP) Sends the \"Referer Page\" information to the HTTP\n"
 "          server. This can also be set with the -H/--header flag\n"
@@ -159,6 +187,9 @@ puts (
 "          header. The \";auto\" string can be used alone, even if\n"
 "          you don't set an initial referer.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -E/--cert <certificate[:password]>\n"
 "          (HTTPS) Tells curl to use the specified certificate\n"
 "          file when getting a file with HTTPS. The certificate\n"
@@ -167,21 +198,30 @@ puts (
 "          that this certificate is the private key and the pri<72>\n"
 "          vate certificate concatenated!\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     --cacert <CA certificate>\n"
 "          (HTTPS) Tells curl to use the specified certificate\n"
 "          file to verify the peer. The certificate must be in PEM\n"
 "          format.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -f/--fail\n"
 "          (HTTP) Fail silently (no output at all) on server\n"
 "          errors. This is mostly done like this to better enable\n"
 "          scripts etc to better deal with failed attempts. In\n"
 "          normal cases when a HTTP server fails to deliver a doc<6F>\n"
 "          ument, it returns a HTML document stating so (which\n"
-"          often also describes why and more). This flag will pre<72>\n"
+"          often also describes why and more). This flag will\n"
-"          vent curl from outputting that and fail silently\n"
+"          prevent curl from outputting that and fail silently\n"
 "          instead.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable silent failure.\n"
+"\n"
 "     -F/--form <name=content>\n"
 "          (HTTP) This lets curl emulate a filled in form in which\n"
 "          a user has pressed the submit button. This causes curl\n"
@@ -202,8 +242,12 @@ puts (
 "\n"
 "          To read the file's content from stdin insted of a file,\n"
 "          use - where the file name should've been. This goes for\n"
+);
+ puts(
 "          both @ and < constructs.\n"
 "\n"
+"          This option can be used multiple times.\n"
+"\n"
 "     -h/--help\n"
 "          Usage help.\n"
 "\n"
@@ -214,16 +258,20 @@ puts (
 "          as one of the internal ones curl would use, your exter<65>\n"
 "          nally set header will be used instead of the internal\n"
 "          one. This allows you to make even trickier stuff than\n"
-"          curl would normally do. You should not replace\n"
+"          curl would normally do. You should not replace inter<65>\n"
-"          internally set headers without knowing perfectly well\n"
+"          nally set headers without knowing perfectly well what\n"
-"          what you're doing. Replacing an internal header with\n"
+"          you're doing. Replacing an internal header with one\n"
-"          one without content on the right side of the colon will\n"
+"          without content on the right side of the colon will\n"
 "          prevent that header from appearing.\n"
 "\n"
+"          This option can be used multiple times.\n"
+"\n"
 "     -i/--include\n"
 "          (HTTP) Include the HTTP-header in the output. The HTTP-\n"
 "          header includes things like server-name, date of the\n"
 "          document, HTTP-version and more...\n"
+"          If this option is used twice, the second will again\n"
+"          disable header include.\n"
 "\n"
 "     --interface <name>\n"
 "          Perform an operation using a specified interface. You\n"
@@ -231,8 +279,9 @@ puts (
 "          example could look like:\n"
 "\n"
 "          curl --interface eth0:1 http://www.netscape.com/\n"
-);
+"\n"
- puts(
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
 "\n"
 "     -I/--head\n"
 "          (HTTP/FTP) Fetch the HTTP-header only! HTTP-servers\n"
@@ -240,6 +289,9 @@ puts (
 "          but the header of a document. When used on a FTP file,\n"
 "          curl displays the file size only.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable header only.\n"
+"\n"
 "     --krb4 <level>\n"
 "          (FTP) Enable kerberos4 authentication and use. The\n"
 "          level must be entered and should be one of 'clear',\n"
@@ -247,17 +299,25 @@ puts (
 "          level that is not one of these, 'private' will instead\n"
 "          be used.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -K/--config <config file>\n"
 "          Specify which config file to read curl arguments from.\n"
 "          The config file is a text file in which command line\n"
 "          arguments can be written which then will be used as if\n"
-"          they were written on the actual command line. If the\n"
+"          they were written on the actual command line. Options\n"
-"          first column of a config line is a '#' character, the\n"
+"          and their parameters must be specified on the same con<6F>\n"
-"          rest of the line will be treated as a comment.\n"
+"          fig file line. If the parameter is to contain white\n"
+"          spaces, the parameter must be inclosed within quotes.\n"
+"          If the first column of a config line is a '#' charac<61>\n"
+"          ter, the rest of the line will be treated as a comment.\n"
 "\n"
 "          Specify the filename as '-' to make curl read the file\n"
 "          from stdin.\n"
 "\n"
+"          This option can be used multiple times.\n"
+"\n"
 "     -l/--list-only\n"
 "          (FTP) When listing an FTP directory, this switch forces\n"
 "          a name-only view.  Especially useful if you want to\n"
@@ -265,6 +325,9 @@ puts (
 "          the normal directory view doesn't use a standard look\n"
 "          or format.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable list only.\n"
+"\n"
 "     -L/--location\n"
 "          (HTTP/HTTPS) If the server reports that the requested\n"
 "          page has a different location (indicated with the\n"
@@ -275,6 +338,9 @@ puts (
 "          curl will automatically switch to GET after the initial\n"
 "          POST has been done.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable location following.\n"
+"\n"
 "     -m/--max-time <seconds>\n"
 "          Maximum time in seconds that you allow the whole opera<72>\n"
 "          tion to take.  This is useful for preventing your batch\n"
@@ -282,6 +348,9 @@ puts (
 "          links going down.  This doesn't work fully in win32\n"
 "          systems.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -M/--manual\n"
 "          Manual. Display the huge help text.\n"
 "\n"
@@ -301,6 +370,9 @@ puts (
 "\n"
 "          machine host.domain.com login myself password secret\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable netrc usage.\n"
+"\n"
 "     -N/--no-buffer\n"
 "          Disables the buffering of the output stream. In normal\n"
 "          work situations, curl will use a standard buffered out<75>\n"
@@ -309,6 +381,9 @@ puts (
 "          the data arrives.  Using this option will disable that\n"
 "          buffering.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          switch on buffering.\n"
+"\n"
 "     -o/--output <file>\n"
 "          Write output to <file> instead of stdout. If you are\n"
 "          using {} or [] to fetch multiple documents, you can use\n"
@@ -321,6 +396,10 @@ puts (
 "          or use several variables like:\n"
 "\n"
 "            curl http://{site,host}.host[1-5].com -o \"#1_#2\"\n"
+"\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -O/--remote-name\n"
 "          Write output to a local file named like the remote file\n"
 "          we get. (Only the file part of the remote file is used,\n"
@@ -335,6 +414,9 @@ puts (
 "          nect to the remote port number curl wants to tunnel\n"
 "          through to.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable proxy tunnel.\n"
+"\n"
 "     -P/--ftpport <address>\n"
 "          (FTP) Reverses the initiator/listener roles when con<6F>\n"
 "          necting with ftp. This switch makes Curl use the PORT\n"
@@ -342,7 +424,6 @@ puts (
 "          server to connect to the client's specified address and\n"
 "          port, while PASV asks the server for an ip address and\n"
 "          port to connect to. <address> should be one of:\n"
-"\n"
 "          interface   i.e \"eth0\" to specify which interface's IP\n"
 "                      address you want to use  (Unix only)\n"
 "\n"
@@ -354,6 +435,9 @@ puts (
 "          -           (any single-letter string) to make it pick\n"
 "                      the machine's default\n"
 "\n"
+"     If this option is used serveral times, the last one will be\n"
+"     used.\n"
+"\n"
 "     -q   If used as the first parameter on the command line, the\n"
 "          $HOME/.curlrc file will not be read and used as a con<6F>\n"
 "          fig file.\n"
@@ -370,6 +454,8 @@ puts (
 "          returns failure for one of the commands, the entire\n"
 "          operation will be aborted.\n"
 "\n"
+"          This option can be used multiple times.\n"
+"\n"
 "     -r/--range <range>\n"
 "          (HTTP/FTP) Retrieve a byte range (i.e a partial docu<63>\n"
 "          ment) from a HTTP/1.1 or FTP server. Ranges can be\n"
@@ -403,14 +489,25 @@ puts (
 "     stop' (optionally with one of the numbers omitted). It\n"
 "     depends on the non-RFC command SIZE.\n"
 "\n"
+"     If this option is used serveral times, the last one will be\n"
+"     used.\n"
+"\n"
 "     -s/--silent\n"
 "          Silent mode. Don't show progress meter or error mes<65>\n"
 "          sages.  Makes Curl mute.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable mute.\n"
+"\n"
 "     -S/--show-error\n"
 "          When used with -s it makes curl show error message if\n"
 "          it fails.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+);
+ puts(
+"          disable show error.\n"
+"\n"
 "     -t/--upload\n"
 "          Deprecated. Use '-T -' instead.  Transfer the stdin\n"
 "          data to the specified file. Curl will read everything\n"
@@ -429,21 +526,33 @@ puts (
 "          to fail. If this is used on a http(s) server, the PUT\n"
 "          command will be used.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -u/--user <user:password>\n"
 "          Specify user and password to use when fetching. See\n"
 "          README.curl for detailed examples of how to use this.\n"
 "          If no password is specified, curl will ask for it\n"
 "          interactively.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -U/--proxy-user <user:password>\n"
 "          Specify user and password to use for Proxy authentica<63>\n"
 "          tion. If no password is specified, curl will ask for it\n"
 "          interactively.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     --url <URL>\n"
 "          Set the URL to fetch. This option is mostly handy when\n"
 "          you wanna specify URL in a config file.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -v/--verbose\n"
 "          Makes the fetching more verbose/talkative. Mostly\n"
 "          usable for debugging. Lines starting with '>' means\n"
@@ -451,6 +560,9 @@ puts (
 "          is hidden in normal cases and lines starting with '*'\n"
 "          means additional info provided by curl.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable verbose.\n"
+"\n"
 "     -V/--version\n"
 "          Displays the full version of curl, libcurl and other\n"
 "          3rd party libraries linked with the executable.\n"
@@ -469,14 +581,11 @@ puts (
 "          %{variable_name} and to output a normal % you just\n"
 "          write them like %%. You can output a newline by using\n"
 "          \\n, a carrige return with \\r and a tab space with \\t.\n"
-"\n"
 "          NOTE: The %-letter is a special letter in the\n"
 "          win32-environment, where all occurrences of % must be\n"
 "          doubled when using this option.\n"
 "\n"
 "          Available variables are at this point:\n"
-);
- puts(
 "\n"
 "          url_effective  The URL that was fetched last. This is\n"
 "                         mostly meaningful if you've told curl to\n"
@@ -523,11 +632,16 @@ puts (
 "\n"
 "          speed_upload   The average upload speed that curl mea<65>\n"
 "                         sured for the complete upload.\n"
+"     If this option is used serveral times, the last one will be\n"
+"     used.\n"
 "\n"
 "     -x/--proxy <proxyhost[:port]>\n"
 "          Use specified proxy. If the port number is not speci<63>\n"
 "          fied, it is assumed at port 1080.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -X/--request <command>\n"
 "          (HTTP) Specifies a custom request to use when communi<6E>\n"
 "          cating with the HTTP server.  The specified request\n"
@@ -537,17 +651,26 @@ puts (
 "          (FTP) Specifies a custom FTP command to use instead of\n"
 "          LIST when doing file lists with ftp.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -y/--speed-time <time>\n"
 "          If a download is slower than speed-limit bytes per sec<65>\n"
 "          ond during a speed-time period, the download gets\n"
 "          aborted. If speed-time is used, the default speed-limit\n"
 "          will be 1 unless set with -y.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -Y/--speed-limit <speed>\n"
 "          If a download is slower than this given speed, in bytes\n"
 "          per second, for speed-time seconds it gets aborted.\n"
 "          speed-time is set with -Y and is 30 if not set.\n"
 "\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "     -z/--time-cond <date expression>\n"
 "          (HTTP) Request to get a file that has been modified\n"
 "          later than the given time and date, or one that has\n"
@@ -561,6 +684,8 @@ puts (
 "          request for a document that is older than the given\n"
 "          date/time, default is a document that is newer than the\n"
 "          specified date/time.\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
 "\n"
 "     -3/--sslv3\n"
 "          (HTTPS) Forces curl to use SSL version 3 when negotiat<61>\n"
@@ -574,15 +699,25 @@ puts (
 "          Make curl display progress information as a progress\n"
 "          bar instead of the default statistics.\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable the progress bar.\n"
+"\n"
 "     --crlf\n"
 "          (FTP) Convert LF to CRLF in upload. Useful for MVS\n"
 "          (OS/390).\n"
 "\n"
+"          If this option is used twice, the second will again\n"
+"          disable crlf converting.\n"
+"\n"
 "     --stderr <file>\n"
 "          Redirect all writes to stderr to the specified file\n"
 "          instead. If the file name is a plain '-', it is instead\n"
 "          written to stdout. This option has no point when you're\n"
 "          using a shell with decent redirecting capabilities.\n"
+"\n"
+"          If this option is used serveral times, the last one\n"
+"          will be used.\n"
+"\n"
 "FILES\n"
 "     ~/.curlrc\n"
 "          Default config file.\n"
@@ -599,7 +734,6 @@ puts (
 "\n"
 "     GOPHER_PROXY [protocol://]<host>[:port]\n"
 "          Sets proxy server to use for GOPHER.\n"
-"\n"
 "     ALL_PROXY [protocol://]<host>[:port]\n"
 "          Sets proxy server to use if no protocol-specific proxy\n"
 "          is set.\n"
@@ -634,12 +768,15 @@ puts (
 "          resolved.\n"
 "\n"
 "     7    Failed to connect to host.\n"
+"\n"
 "     8    FTP weird server reply. The server sent data curl\n"
 "          couldn't parse.\n"
 "\n"
 "     9    FTP access denied. The server denied login.\n"
 "\n"
 "     10   FTP user/password incorrect. Either one or both were\n"
+);
+ puts(
 "          not accepted by the server.\n"
 "\n"
 "     11   FTP weird PASS reply. Curl couldn't parse the reply\n"
@@ -650,7 +787,6 @@ puts (
 "\n"
 "     13   FTP weird PASV reply, Curl couldn't parse the reply\n"
 "          sent to the PASV request.\n"
-"\n"
 "     14   FTP weird 227 format. Curl couldn't parse the 227-line\n"
 "          the server sent.\n"
 "\n"
@@ -685,6 +821,7 @@ puts (
 "          operation.\n"
 "\n"
 "     26   Read error. Various reading problems.\n"
+"\n"
 "     27   Out of memory. A memory allocation request failed.\n"
 "\n"
 "     28   Operation timeout. The specified time-out period was\n"
@@ -702,7 +839,6 @@ puts (
 "          959.\n"
 "\n"
 "     33   HTTP range error. The range \"command\" didn't work.\n"
-"\n"
 "     34   HTTP post error. Internal post-request generation\n"
 "          error.\n"
 "\n"
@@ -736,6 +872,7 @@ puts (
 "\n"
 "     46   Bad password entered. An error was signalled when the\n"
 "          password was entered.\n"
+"\n"
 "     47   Too many redirects. When following redirects, curl hit\n"
 "          the maximum amount.\n"
 "\n"
@@ -766,8 +903,6 @@ puts (
 "      - Douglas E. Wegscheid <wegscd@whirlpool.com>\n"
 "      - Mark Butler <butlerm@xmission.com>\n"
 "      - Eric Thelin <eric@generation-i.com>\n"
-);
- puts(
 "      - Marc Boucher <marc@mbsi.ca>\n"
 "      - Greg Onufer <Greg.Onufer@Eng.Sun.COM>\n"
 "      - Doug Kaufman <dkaufman@rahul.net>\n"
@@ -807,7 +942,6 @@ puts (
 "\n"
 "WWW\n"
 "     http://curl.haxx.se\n"
-"\n"
 "FTP\n"
 "     ftp://ftp.sunet.se/pub/www/utilities/curl/\n"
 "\n"
@@ -980,6 +1114,8 @@ puts (
 "  receives in order to let the user see all client-server interaction.\n"
 "\n"
 "        curl -v ftp://ftp.upload.com/\n"
+);
+ puts(
 "\n"
 "DETAILED INFORMATION\n"
 "\n"
@@ -1076,8 +1212,6 @@ puts (
 "\n"
 "        curl -F \"file=@cooltext.txt\" -F \"yourname=Daniel\" \\\n"
 "             -F \"filedescription=Cool text file with cool text inside\" \\\n"
-);
- puts(
 "             http://www.post.com/postit.cgi\n"
 "\n"
 "  So, to send two files in one post you can do it in two ways:\n"
@@ -1227,6 +1361,8 @@ puts (
 "  readable. You can separate the options and the parameter with spaces, or\n"
 "  with = or :. Comments can be used within the file. If the first letter on a\n"
 "  line is a '#'-letter the rest of the line is treated as a comment.\n"
+);
+ puts(
 "\n"
 "  If you want the parameter to contain spaces, you must inclose the entire\n"
 "  parameter within double quotes (\"). Within those quotes, you specify a\n"
@@ -1347,8 +1483,6 @@ puts (
 "        curl https://www.secure-site.com\n"
 "\n"
 "  Curl is also capable of using your personal certificates to get/post files\n"
-);
- puts(
 "  from sites that require valid certificates. The only drawback is that the\n"
 "  certificate needs to be in PEM-format. PEM is a standard and open format to\n"
 "  store certificates with, but it is not used by the most commonly used\n"
@@ -1519,6 +1653,8 @@ puts (
 "  authentication is used.\n"
 "\n"
 "  A very simple .netrc file could look something like:\n"
+);
+ puts(
 "\n"
 "        machine curl.haxx.se login iamdaniel password mysecret\n"
 "\n"

src/main.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>

src/setup.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include <stdio.h>
 

src/urlglob.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>

src/urlglob.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@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 typedef enum {UPTSet=1,UPTCharRange,UPTNumRange} URLPatternType;
 
 typedef struct {

src/version.h

@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.5.2-pre1"
+#define CURL_VERSION "7.5.2"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "

src/writeout.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) 1999.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 #include <stdio.h>
 #include <string.h>

src/writeout.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) 1999.
+ * $Id$
- *  All Rights Reserved.
+ *****************************************************************************/
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * 	http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
 
 void ourWriteOut(CURL *curl, char *out);