httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r110010 - /httpd/httpd/branches/1.3.x/LICENSE /httpd/httpd/branches/1.3.x/NOTICE
Date Mon, 06 Dec 2004 19:46:56 GMT
Author: wrowe
Date: Mon Dec  6 11:46:54 2004
New Revision: 110010

URL: http://svn.apache.org/viewcvs?view=rev&rev=110010
Log:

  Restore the 'copyright' and 'license' terms to LICENSE file,
  as Roy points out, if the terms further modify our LICENSE
  they must remain in that file.

  NOTICE is purely for cases of 'permission is granted provided 
  you identify that your application provides notice that it
  includes software created by Foo Corp., in your distribution 
  and associated documentation'.  So in NOTICE, we are following 
  their LICENSE terms.

Modified:
   httpd/httpd/branches/1.3.x/LICENSE
   httpd/httpd/branches/1.3.x/NOTICE

Modified: httpd/httpd/branches/1.3.x/LICENSE
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/LICENSE?view=diff&rev=110010&p1=httpd/httpd/branches/1.3.x/LICENSE&r1=110009&p2=httpd/httpd/branches/1.3.x/LICENSE&r2=110010
==============================================================================
--- httpd/httpd/branches/1.3.x/LICENSE	(original)
+++ httpd/httpd/branches/1.3.x/LICENSE	Mon Dec  6 11:46:54 2004
@@ -200,3 +200,204 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+APACHE HTTP SERVER SUBCOMPONENTS: 
+
+The Apache HTTP Server includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+
+For the MD5 Message-Digest library component:
+
+  Copyright  (C)  1995, Board of Trustees of the University of Illinois
+
+  *********************************************************************
+
+  (C) Copyright 1993,1994 by Carnegie Mellon University
+  All Rights Reserved.
+
+  Permission to use, copy, modify, distribute, and sell this software
+  and its documentation for any purpose is hereby granted without
+  fee, provided that the above copyright notice appear in all copies
+  and that both that copyright notice and this permission notice
+  appear in supporting documentation, and that the name of Carnegie
+  Mellon University not be used in advertising or publicity
+  pertaining to distribution of the software without specific,
+  written prior permission.  Carnegie Mellon University makes no
+  representations about the suitability of this software for any
+  purpose.  It is provided "as is" without express or implied
+  warranty.
+
+  CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+  THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+  FOR 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.
+
+  *********************************************************************
+
+  Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+
+  Permission to use, copy, modify, and distribute this material
+  for any purpose and without fee is hereby granted, provided
+  that the above copyright notice and this permission notice
+  appear in all copies, and that the name of Bellcore not be
+  used in advertising or publicity pertaining to this
+  material without the specific, prior written permission
+  of an authorized representative of Bellcore.  BELLCORE
+  MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+  OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
+  WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.  
+
+  *********************************************************************
+
+  Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+  rights reserved.
+
+  License to copy and use this software is granted provided that it
+  is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+  Algorithm" in all material mentioning or referencing this software
+  or this function.
+
+  License is also granted to make and use derivative works provided
+  that such works are identified as "derived from the RSA Data
+  Security, Inc. MD5 Message-Digest Algorithm" in all material
+  mentioning or referencing the derived work.
+
+  RSA Data Security, Inc. makes no representations concerning either
+  the merchantability of this software or the suitability of this
+  software for any particular purpose. It is provided "as is"
+  without express or implied warranty of any kind.
+
+  These notices must be retained in any copies of any part of this
+  documentation and/or software.
+
+  ----------------------------------------------------------------------------
+  "THE BEER-WARE LICENSE" (Revision 42):
+  <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+  can do whatever you want with this stuff. If we meet some day, and you think
+  this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
+  ----------------------------------------------------------------------------
+
+
+For the expat-lite library component:
+
+Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public
+License Version 1.1. Alternatively you may use expat under the GNU General
+Public License instead.
+
+
+For the regex library component:
+
+Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
+This software is not subject to any license of the American Telephone
+and Telegraph Company or of the Regents of the University of California.
+
+Permission is granted to anyone to use this software for any purpose on
+any computer system, and to alter it and redistribute it, subject
+to the following restrictions:
+
+1. The author is not responsible for the consequences of use of this
+   software, no matter how awful, even if they arise from flaws in it.
+
+2. The origin of this software must not be misrepresented, either by
+   explicit claim or by omission.  Since few users ever read sources,
+   credits must appear in the documentation.
+
+3. Altered versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.  Since few users
+   ever read sources, credits must appear in the documentation.
+
+4. This notice may not be removed or altered.
+
+
+For the expat xml parser library component:
+
+  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                                 and Clark Cooper
+
+  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, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+	
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+	
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+For the mod_mime_magic component:
+
+  Copyright (c) 1996-1997 Cisco Systems, Inc.
+
+  This software was submitted by Cisco Systems to the Apache Group in July
+  1997.  Future revisions and derivatives of this source code must
+  acknowledge Cisco Systems as the original contributor of this module.
+  All other licensing and usage conditions are those of the Apache Group.
+
+  Some of this code is derived from the free version of the file command
+  originally posted to comp.sources.unix.  Copyright info for that program
+  is included below as required.
+  -------------------------------------------------------------------------
+  Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
+
+  This software is not subject to any license of the American Telephone and
+  Telegraph Company or of the Regents of the University of California.
+
+  Permission is granted to anyone to use this software for any purpose on any
+  computer system, and to alter it and redistribute it freely, subject to
+  the following restrictions:
+
+  1. The author is not responsible for the consequences of use of this
+  software, no matter how awful, even if they arise from flaws in it.
+
+  2. The origin of this software must not be misrepresented, either by
+  explicit claim or by omission.  Since few users ever read sources, credits
+  must appear in the documentation.
+
+  3. Altered versions must be plainly marked as such, and must not be
+  misrepresented as being the original software.  Since few users ever read
+  sources, credits must appear in the documentation.
+
+  4. This notice may not be removed or altered.
+  -------------------------------------------------------------------------
+
+
+For the mod_imap component:
+
+  "macmartinized" polygon code copyright 1992 by Eric Haines, erich@eye.com
+
+
+For the zb test and ab support components:
+
+  This program is Copyright (C) Zeus Technology Limited 1996.
+
+  This program may be used and copied freely providing this copyright notice
+  is not removed.
+
+  This software is provided "as is" and any express or implied waranties, 
+  including but not limited to, the implied warranties of merchantability and
+  fitness for a particular purpose are disclaimed.  In no event shall 
+  Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
+  exemplary, or consequential damaged (including, but not limited to, 
+  procurement of substitute good or services; loss of use, data, or profits;
+  or business interruption) however caused and on theory of liability.  Whether
+  in contract, strict liability or tort (including negligence or otherwise) 
+  arising in any way out of the use of this software, even if advised of the
+  possibility of such damage.
+

Modified: httpd/httpd/branches/1.3.x/NOTICE
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/NOTICE?view=diff&rev=110010&p1=httpd/httpd/branches/1.3.x/NOTICE&r1=110009&p2=httpd/httpd/branches/1.3.x/NOTICE&r2=110010
==============================================================================
--- httpd/httpd/branches/1.3.x/NOTICE	(original)
+++ httpd/httpd/branches/1.3.x/NOTICE	Mon Dec  6 11:46:54 2004
@@ -10,204 +10,3 @@
 modifications by Spyglass Inc., Carnegie Mellon University, and
 Bell Communications Research, Inc (Bellcore).
 
-
-APACHE HTTP SERVER SUBCOMPONENTS: 
-
-The Apache HTTP Server includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
-
-
-For the MD5 Message-Digest library component:
-
- * Copyright  (C)  1995, Board of Trustees of the University of Illinois
- *
- ************************************************************************
- *
- * (C) Copyright 1993,1994 by Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Carnegie
- * Mellon University not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  Carnegie Mellon University makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR 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.
- *
- ************************************************************************
- *
- * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- *
- * Permission to use, copy, modify, and distribute this material
- * for any purpose and without fee is hereby granted, provided
- * that the above copyright notice and this permission notice
- * appear in all copies, and that the name of Bellcore not be
- * used in advertising or publicity pertaining to this
- * material without the specific, prior written permission
- * of an authorized representative of Bellcore.  BELLCORE
- * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
- * OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
- * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.  
- *
- ************************************************************************
-  
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD5 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
- * ----------------------------------------------------------------------------
-
-
-For the expat-lite library component:
-
-Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public
-License Version 1.1. Alternatively you may use expat under the GNU General
-Public License instead.
-
-
-For the regex library component:
-
-Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-
-For the expat xml parser library component:
-
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-                               and Clark Cooper
-
-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, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-	
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-	
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-For the mod_mime_magic component:
-
- * Copyright (c) 1996-1997 Cisco Systems, Inc.
- *
- * This software was submitted by Cisco Systems to the Apache Group in July
- * 1997.  Future revisions and derivatives of this source code must
- * acknowledge Cisco Systems as the original contributor of this module.
- * All other licensing and usage conditions are those of the Apache Group.
- *
- * Some of this code is derived from the free version of the file command
- * originally posted to comp.sources.unix.  Copyright info for that program
- * is included below as required.
- * ---------------------------------------------------------------------------
- * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
- *
- * This software is not subject to any license of the American Telephone and
- * Telegraph Company or of the Regents of the University of California.
- *
- * Permission is granted to anyone to use this software for any purpose on any
- * computer system, and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission.  Since few users ever read sources, credits
- * must appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.  Since few users ever read
- * sources, credits must appear in the documentation.
- *
- * 4. This notice may not be removed or altered.
- * -------------------------------------------------------------------------
-
-
-For the mod_imap component:
-
-  "macmartinized" polygon code copyright 1992 by Eric Haines, erich@eye.com
-
-
-For the zb test and ab support components:
-
-This program is Copyright (C) Zeus Technology Limited 1996.
-
-This program may be used and copied freely providing this copyright notice
-is not removed.
-
-This software is provided "as is" and any express or implied waranties, 
-including but not limited to, the implied warranties of merchantability and
-fitness for a particular purpose are disclaimed.  In no event shall 
-Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
-exemplary, or consequential damaged (including, but not limited to, 
-procurement of substitute good or services; loss of use, data, or profits;
-or business interruption) however caused and on theory of liability.  Whether
-in contract, strict liability or tort (including negligence or otherwise) 
-arising in any way out of the use of this software, even if advised of the
-possibility of such damage.
-

Mime
View raw message