You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/05/02 19:31:15 UTC
svn commit: r652837 - in /httpd/httpd/branches/1.3.x: LICENSE NOTICE
src/ap/ap_snprintf.c
Author: jim
Date: Fri May 2 10:31:15 2008
New Revision: 652837
URL: http://svn.apache.org/viewvc?rev=652837&view=rev
Log:
Merge r652832 from trunk:
Document cvt from V7, not GNU libc, and copyright
Caldera International Inc.
Reviewed by: jim
Modified:
httpd/httpd/branches/1.3.x/LICENSE
httpd/httpd/branches/1.3.x/NOTICE
httpd/httpd/branches/1.3.x/src/ap/ap_snprintf.c
Modified: httpd/httpd/branches/1.3.x/LICENSE
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/LICENSE?rev=652837&r1=652836&r2=652837&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/LICENSE (original)
+++ httpd/httpd/branches/1.3.x/LICENSE Fri May 2 10:31:15 2008
@@ -401,3 +401,46 @@
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.
+
Modified: httpd/httpd/branches/1.3.x/NOTICE
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/NOTICE?rev=652837&r1=652836&r2=652837&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/NOTICE (original)
+++ httpd/httpd/branches/1.3.x/NOTICE Fri May 2 10:31:15 2008
@@ -19,3 +19,6 @@
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.
Modified: httpd/httpd/branches/1.3.x/src/ap/ap_snprintf.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/ap/ap_snprintf.c?rev=652837&r1=652836&r2=652837&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/ap/ap_snprintf.c (original)
+++ httpd/httpd/branches/1.3.x/src/ap/ap_snprintf.c Fri May 2 10:31:15 2008
@@ -77,8 +77,8 @@
#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.
*/
/*