Commit 24dee483 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

dual-license fix

parent 887e728b
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
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
+19 −15
Original line number Diff line number Diff line
Part of this software is distributed under the Mozilla Public License
version 1.0, which is part of this distribution (MPL-1.0.txt) and
available on-line at http://www.mozilla.org/MPL/
 Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.

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
Regulation" the following exemptions apply to this software:
 In order to be useful for every potential user, the curl and libcurl are
 dual-licensed under the MPL and the MIT/X-derivate licenses.

 * The Initial Developer has the right, regardless of the citizenship
   of any involved party, to choose the location for settling disputes
   as refered to under section "11. Miscellaneous" of the Mozilla Public
   License.
 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 files MITX.txt and MPL-1.1.txt contain the
 license texts.

Initial Developers of this software are:

  Daniel Stenberg <daniel@haxx.se>

Curl is Copyright (C) 1996-2000 Daniel Stenberg
 As a courtesy to the open-source and free software community, we ask you to
 dual-license any modifications that you make as well, under the terms of this
 document.

 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.
+3 −1
Original line number Diff line number Diff line
@@ -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
+11 −28
Original line number Diff line number Diff line
@@ -7,38 +7,21 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 *  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/
 * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
 *
 *  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.
 * In order to be useful for every potential user, curl and libcurl are
 * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *
 *  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.
 *  All Rights Reserved.
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <daniel@haxx.se>
 *
 * 	http://curl.haxx.se
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 * $Id$
 *****************************************************************************/

#include <stdio.h>
/* The include stuff here is mainly for time_t! */
+11 −28
Original line number Diff line number Diff line
@@ -7,38 +7,21 @@
 *                            | (__| |_| |  _ <| |___ 
 *                             \___|\___/|_| \_\_____|
 *
 *  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/
 * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
 *
 *  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.
 * In order to be useful for every potential user, curl and libcurl are
 * dual-licensed under the MPL and the MIT/X-derivate licenses.
 *
 *  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.
 *  All Rights Reserved.
 *
 * ------------------------------------------------------------
 * Main author:
 * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
 *
 * 	http://curl.haxx.nu
 *
 * $Source$
 * $Revision$
 * $Date$
 * $Author$
 * $State$
 * $Locker$
 *
 * ------------------------------------------------------------
 ****************************************************************************/
 * $Id$
 *****************************************************************************/
#ifdef  __cplusplus
extern "C" {
#endif
Loading