httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r110015 - /httpd/httpd/branches/1.3.x/LICENSE /httpd/httpd/branches/1.3.x/NOTICE
Date Mon, 06 Dec 2004 20:07:32 GMT
Author: wrowe
Date: Mon Dec  6 12:07:31 2004
New Revision: 110015

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

Clean up indention and propogate the required notices for H.S.'s regex
and expat-lite to NOTICE.

Leaves me a question;  this is in httpd-1.3 LICENSE;

  For the expat xml parser library component:

  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                 and Clark Cooper

Grepping the entire tree, I find no reference to Thai OSSC/C. Cooper,
does this even belong here?

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=110015&p1=httpd/httpd/branches/1.3.x/LICENSE&r1=110014&p2=httpd/httpd/branches/1.3.x/LICENSE&r2=110015
==============================================================================
--- httpd/httpd/branches/1.3.x/LICENSE	(original)
+++ httpd/httpd/branches/1.3.x/LICENSE	Mon Dec  6 12:07:31 2004
@@ -287,33 +287,33 @@
 
 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.
+  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.
+  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.
+  4. This notice may not be removed or altered.
 
 
 For the expat xml parser library component:

Modified: httpd/httpd/branches/1.3.x/NOTICE
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/NOTICE?view=diff&rev=110015&p1=httpd/httpd/branches/1.3.x/NOTICE&r1=110014&p2=httpd/httpd/branches/1.3.x/NOTICE&r2=110015
==============================================================================
--- httpd/httpd/branches/1.3.x/NOTICE	(original)
+++ httpd/httpd/branches/1.3.x/NOTICE	Mon Dec  6 12:07:31 2004
@@ -10,3 +10,9 @@
 modifications by Spyglass Inc., Carnegie Mellon University, and
 Bell Communications Research, Inc (Bellcore).
 
+This work includes the Expat xml parsing library Copyright (c) 
+1998, 1999 James Clark, distributed under and subject to the 
+Mozilla Public License Version 1.1.
+
+This work includes the regex library Copyright 1992, 1993, 1994 
+Henry Spencer, all rights reserved.

Mime
View raw message