From: Jim Jagielski <jim@apache.org>
Date: Fri, 2 May 2008 17:31:15 +0000 (+0000)
Subject: Merge r652832 from trunk:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f2f29bd131197ea4acb1c6df1246bc9b9eb7383;p=thirdparty%2Fapache%2Fhttpd.git

Merge r652832 from trunk:

Document cvt from V7, not GNU libc, and copyright
Caldera International Inc.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@652837 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/LICENSE b/LICENSE
index db4f2c627b1..1f87e82ccc0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -401,3 +401,46 @@ For the zb test and ab support components:
   arising in any way out of the use of this software, even if advised of the
   possibility of such damage.
 
+From src/ap/ap_snprintf.c:
+
+  *
+  * cvt - IEEE floating point formatting routines.
+  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
+  *
+
+  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  Redistributions of source code and documentation must retain the above
+  copyright notice, this list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+  All advertising materials mentioning features or use of this software
+  must display the following acknowledgement:
+
+     This product includes software developed or owned by  Caldera
+     International, Inc.
+
+  Neither the name of Caldera International, Inc. nor the names of other
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+  INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
+  INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/NOTICE b/NOTICE
index 8eac324a03c..ab78a7aae2d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -19,3 +19,6 @@ Mozilla Public License Version 1.1.
 
 This work includes the regex library Copyright 1992, 1993, 1994 
 Henry Spencer, all rights reserved.
+
+This software contains code derived from UNIX V7, Copyright(C)
+Caldera International Inc.
diff --git a/src/ap/ap_snprintf.c b/src/ap/ap_snprintf.c
index 923be24e892..803039c1f8f 100644
--- a/src/ap/ap_snprintf.c
+++ b/src/ap/ap_snprintf.c
@@ -77,8 +77,8 @@ typedef int bool_int;
 #define NUM_BUF_SIZE		512
 
 /*
- * cvt.c - IEEE floating point formatting routines for FreeBSD
- * from GNU libc-4.6.27.  Modified to be thread safe.
+ * cvt - IEEE floating point formatting routines.
+ *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
  */
 
 /*