naviserver-commits — Commit notices

[naviserver-commits] modules/nssavi LICENSE,NONE,1.1 README,1.1.1.1,1.2 nssavi.c,1.1.1.1,1.2 savi.c,1.1.1.1,1.2 savi.h,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nssavi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nssavi

Modified Files:
	README nssavi.c savi.c savi.h 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: savi.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssavi/savi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** savi.c	20 May 2005 20:42:38 -0000	1.1.1.1
--- savi.c	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,5 ****
! /*
!  * Copyright (c) 2003 Vlad Seryakov
!  * All rights reserved.
   * 
   */
--- 1,24 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  * Author Vlad Seryakov vl...@cr...
   * 
   */

Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nssavi/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:42:38 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,7 ****
! Sophos interface Module for AOLserver 3.x/4.0
  Release 1.0
  vl...@cr...
  
! This is AOLserver module that implements interface to Sophos anti-virus.
  
  /*--------------------------------------------------------------------*/
--- 1,7 ----
! Sophos interface Module for NaviServer 4.x
  Release 1.0
  vl...@cr...
  
! This is NaviServer module that implements interface to Sophos anti-virus.
  
  /*--------------------------------------------------------------------*/

Index: savi.h
===================================================================
RCS file: /cvsroot/naviserver/modules/nssavi/savi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** savi.h	20 May 2005 20:42:38 -0000	1.1.1.1
--- savi.h	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,5 ****
! /*
!  * Copyright (c) 2003 Vlad Seryakov
!  * All rights reserved.
   * 
   */
--- 1,24 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  * Author Vlad Seryakov vl...@cr...
   * 
   */

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nssavi/LICENSE,v 1.1 2005/06/08 20:03:49 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.


Index: nssavi.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssavi/nssavi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nssavi.c	20 May 2005 20:42:38 -0000	1.1.1.1
--- nssavi.c	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,5 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov
!  * All rights reserved.
   * 
   */
--- 1,24 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  * Author Vlad Seryakov vl...@cr...
   * 
   */

[naviserver-commits] modules/nsocaml/test ns_conn.ml,1.1.1.1,1.2 ns_info.ml,1.1.1.1,1.2 ns_nsv.ml,1.1.1.1,1.2 ns_server.ml,1.1.1.1,1.2 ns_set.ml,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsocaml/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsocaml/test

Modified Files:
	ns_conn.ml ns_info.ml ns_nsv.ml ns_server.ml ns_set.ml 
Log Message:
Changed license and wording in README files.


Index: ns_server.ml
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/test/ns_server.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_server.ml	20 May 2005 20:42:14 -0000	1.1.1.1
--- ns_server.ml	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,3 ****
! open Aolserver;;
  open List;;
  
--- 1,3 ----
! open Naviserver;;
  open List;;
  

Index: ns_nsv.ml
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/test/ns_nsv.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_nsv.ml	20 May 2005 20:42:14 -0000	1.1.1.1
--- ns_nsv.ml	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,3 ****
! open Aolserver;;
  open List;;
  
--- 1,3 ----
! open Naviserver;;
  open List;;
  

Index: ns_set.ml
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/test/ns_set.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_set.ml	20 May 2005 20:42:14 -0000	1.1.1.1
--- ns_set.ml	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,3 ****
! open Aolserver;;
  open List;;
  
--- 1,3 ----
! open Naviserver;;
  open List;;
  

Index: ns_conn.ml
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/test/ns_conn.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_conn.ml	20 May 2005 20:42:14 -0000	1.1.1.1
--- ns_conn.ml	8 Jun 2005 20:03:48 -0000	1.2
***************
*** 1,3 ****
! open Aolserver;;
  open List;;
  
--- 1,3 ----
! open Naviserver;;
  open List;;
  

Index: ns_info.ml
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/test/ns_info.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_info.ml	20 May 2005 20:42:14 -0000	1.1.1.1
--- ns_info.ml	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,3 ****
! open Aolserver;;
  open List;;
  
--- 1,3 ----
! open Naviserver;;
  open List;;
  

[naviserver-commits] modules/nssnmp LICENSE,NONE,1.1 README,1.1.1.1,1.2 nsmibdump.c,1.1.1.1,1.2 nssnmp.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nssnmp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nssnmp

Modified Files:
	README nsmibdump.c nssnmp.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: nssnmp.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/nssnmp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nssnmp.c	20 May 2005 20:47:23 -0000	1.1.1.1
--- nssnmp.c	8 Jun 2005 20:03:50 -0000	1.2
***************
*** 1,26 ****
! 
! /*
   * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://mozilla/.
   *
   * 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.
   *
!  * Copyright (C) 2001-2003 Vlad Seryakov
!  * All rights reserved.
!  *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,25 ----
! /* 
   * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  *
+  * Author Vlad Seryakov vl...@cr...
+  * 
   */
  
***************
*** 2009,2012 ****
--- 2008,2014 ----
   *
   * $Log$
+  * Revision 1.2  2005/06/08 20:03:50  seryakov
+  * Changed license and wording in README files.
+  *
   * Revision 1.1.1.1  2005/05/20 20:47:23  seryakov
   * initial import

Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:47:20 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 5,9 ****
  This is NaviServer module that implements SNMP v1,v2c and some
  primitive MIB support, ICMP, RADIUS protocols. It is based on SNMP++
! library from http:://www.agentpp.com. It allows to use AOLserver as 
  SNMP trap server and build SNMP monitoring packages.
  
--- 5,9 ----
  This is NaviServer module that implements SNMP v1,v2c and some
  primitive MIB support, ICMP, RADIUS protocols. It is based on SNMP++
! library from http:://www.agentpp.com. It allows to use NaviServer as 
  SNMP trap server and build SNMP monitoring packages.
  

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nssnmp/LICENSE,v 1.1 2005/06/08 20:03:49 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.


Index: nsmibdump.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/nsmibdump.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsmibdump.c	20 May 2005 20:47:22 -0000	1.1.1.1
--- nsmibdump.c	8 Jun 2005 20:03:49 -0000	1.2
***************
*** 1,2 ****
--- 1,27 ----
+ /* 
+  * The contents of this file are subject to the Mozilla Public License
+  * Version 1.1(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/.
+  *
+  * 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.
+  *
+  * Alternatively,the contents of this file may be used under the terms
+  * of the GNU General Public License(the "GPL"),in which case the
+  * provisions of GPL are applicable instead of those above.  If you wish
+  * to allow use of your version of this file only under the terms of the
+  * GPL and not to allow others to use your version of this file under the
+  * License,indicate your decision by deleting the provisions above and
+  * replace them with the notice and other provisions required by the GPL.
+  * If you do not delete the provisions above,a recipient may use your
+  * version of this file under either the License or the GPL.
+  *
+  * Author Vlad Seryakov vl...@cr...
+  * 
+  */
+ 
  /*
   * nsmibdump.c --

[naviserver-commits] modules/nsocaml LICENSE,NONE,1.1 naviserver.c,NONE,1.1 naviserver.ml,NONE,1.1 Makefile,1.1.1.1,1.2 README,1.1.1.1,1.2 nsocaml.c,1.1.1.1,1.2 nsocaml.ml,1.1.1.1,1.2 aolserver.c,1.1.1.1,NONE aolserver.ml,1.1.1.1,NONE

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsocaml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsocaml

Modified Files:
	Makefile README nsocaml.c nsocaml.ml 
Added Files:
	LICENSE naviserver.c naviserver.ml 
Removed Files:
	aolserver.c aolserver.ml 
Log Message:
Changed license and wording in README files.


Index: nsocaml.ml
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/nsocaml.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsocaml.ml	20 May 2005 20:42:14 -0000	1.1.1.1
--- nsocaml.ml	8 Jun 2005 20:03:48 -0000	1.2
***************
*** 1,23 ****
! (* OCaml module for Aolserver.
   *
!  * This library is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU Library General Public
!  * License as published by the Free Software Foundation; either
!  * version 2 of the License, or (at your option) any later version.
   *
!  * This library is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!  * Library General Public License for more details.
   *
!  * You should have received a copy of the GNU Library General Public
!  * License along with this library; if not, write to the Free
!  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   *
   * Author Vlad Seryakov vl...@cr...
   *
   *)
  
! open Aolserver;;
  
  (*----- Define OCaml functions -----*)
--- 1,30 ----
! (* OCaml module for NaviServer
   *
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
!  * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
   *
   * Author Vlad Seryakov vl...@cr...
+  * 
   *
   *)
  
! open Naviserver;;
  
  (*----- Define OCaml functions -----*)
***************
*** 41,45 ****
  ns_log "Notice" ("OCaml " ^
                   Sys.ocaml_version ^
!                  " module for AOLserver " ^
                   (ns_info "version") ^
                   " started");;
--- 48,52 ----
  ns_log "Notice" ("OCaml " ^
                   Sys.ocaml_version ^
!                  " module for NaviServer " ^
                   (ns_info "version") ^
                   " started");;

--- NEW FILE: naviserver.ml ---
(* OCaml module for NaviServer
 *
 * The contents of this file are subject to the Mozilla Public License
 * Version 1.1(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/.
 *
 * 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.
 *
 * Alternatively,the contents of this file may be used under the terms
 * of the GNU General Public License(the "GPL"),in which case the
 * provisions of GPL are applicable instead of those above.  If you wish
 * to allow use of your version of this file only under the terms of the
 * GPL and not to allow others to use your version of this file under the
 * License,indicate your decision by deleting the provisions above and
 * replace them with the notice and other provisions required by the GPL.
 * If you do not delete the provisions above,a recipient may use your
 * version of this file under either the License or the GPL.
 *
 * Author Vlad Seryakov vl...@cr...
 *
 *)

(*----- Declare external functions -----*)

external ns_eval : string -> string = "Ns_Eval_OCaml"

external ns_log : string -> string -> unit = "Ns_Log_OCaml"

external ns_info : string -> string = "Ns_Info_OCaml"

external ns_conn : string -> string = "Ns_Conn_OCaml"

external ns_server : string -> string = "Ns_Server_OCaml"

external ns_write : string -> unit = "Ns_Write_OCaml"

external ns_returnredirect : string -> unit = "Ns_ReturnRedirect_OCaml"

external ns_returnnotfound : unit -> unit = "Ns_ReturnNotFound_OCaml"

external ns_returnforbidden : unit -> unit = "Ns_ReturnForbidden_OCaml"

external ns_returnunauthorized : unit -> unit = "Ns_ReturnUnauthorized_OCaml"

external ns_returninternalerror : unit -> unit = "Ns_ReturnInternalError_OCaml"

external ns_return : int -> string -> string -> unit = "Ns_Return_OCaml"

external ns_returnfile : int -> string -> string -> unit = "Ns_ReturnFile_OCaml"

external ns_queryexists : string -> int = "Ns_QueryExists_OCaml"

external ns_queryget : string -> string = "Ns_QueryGet_OCaml"

external ns_querygetall : string -> string list = "Ns_QueryGetAll_OCaml"

external ns_urlencode : string -> string = "Ns_UrlEncode_OCaml"

external ns_urldecode : string -> string = "Ns_UrlDecode_OCaml"

external ns_config : string -> string -> string = "Ns_Config_OCaml"

external ns_guesstype : string -> string = "Ns_GuessType_OCaml"

external ns_quotehtml : string -> string = "Ns_QuoteHtml_OCaml"

external ns_striphtml : string -> string = "Ns_StripHtml_OCaml"

external ns_set_cleanup : unit -> unit = "Ns_SetCleanup_OCaml"

external ns_set_array : unit -> string list = "Ns_SetArray_OCaml"

external ns_set_list : unit -> string list = "Ns_SetList_OCaml"

external ns_set_split : string -> unit = "Ns_SetSplit_OCaml"

external ns_set_copy : string -> string = "Ns_SetCopy_OCaml"

external ns_set_new : string -> string = "Ns_SetNew_OCaml"

external ns_set_create : string -> string = "Ns_SetNew_OCaml"

external ns_set_size : string -> int = "Ns_SetSize_OCaml"

external ns_set_name : string -> string = "Ns_SetName_OCaml"

external ns_set_print : string -> unit = "Ns_SetPrint_OCaml"

external ns_set_free : string -> unit = "Ns_SetFree_OCaml"

external ns_set_find: string -> string -> int = "Ns_SetFind_OCaml"

external ns_set_ifind: string -> string -> int = "Ns_SetIFind_OCaml"

external ns_set_unique: string -> string -> int = "Ns_SetUnique_OCaml"

external ns_set_iunique: string -> string -> int = "Ns_SetIUnique_OCaml"

external ns_set_delkey: string -> string -> unit = "Ns_SetDelKey_OCaml"

external ns_set_idelkey: string -> string -> unit = "Ns_SetIDelKey_OCaml"

external ns_set_get: string -> string -> string = "Ns_SetGet_OCaml"

external ns_set_iget: string -> string -> string = "Ns_SetIGet_OCaml"

external ns_set_value: string -> int -> string = "Ns_SetValue_OCaml"

external ns_set_isnull: string -> int -> int = "Ns_SetIsNull_OCaml"

external ns_set_key: string -> int -> string = "Ns_SetKey_OCaml"

external ns_set_delete: string -> int -> unit = "Ns_SetDelete_OCaml"

external ns_set_truncate: string -> int -> unit = "Ns_SetTrunc_OCaml"

external ns_set_update: string -> string ->string -> unit = "Ns_SetUpdate_OCaml"

external ns_set_cput: string -> string ->string -> unit = "Ns_SetCPut_OCaml"

external ns_set_icput: string -> string ->string -> unit = "Ns_SetICPut_OCaml"

external ns_set_put: string -> string ->string -> unit = "Ns_SetPut_OCaml"

external ns_set_merge : string -> string -> unit = "Ns_SetMerge_OCaml"

external ns_set_move : string -> string -> unit = "Ns_SetMove_OCaml"

external ns_normalizepath : string -> string = "Ns_NormalizePath_OCaml"

external ns_url2file : string -> string = "Ns_Url2File_OCaml"

external ns_time : unit -> int = "Ns_Time_OCaml"

external ns_fmttime : int -> string -> string = "Ns_FmtTime_OCaml"

external nsv_get : string -> string -> string = "Ns_NsvGet_OCaml"

external nsv_exists : string -> string -> int = "Ns_NsvExists_OCaml"

external nsv_set : string -> string -> string -> unit = "Ns_NsvSet_OCaml"

external nsv_append : string -> string -> string -> unit = "Ns_NsvAppend_OCaml"

external nsv_incr : string -> string -> int -> unit = "Ns_NsvIncr_OCaml"

external nsv_unset : string -> string -> unit = "Ns_NsvUnset_OCaml"

external nsv_names : string -> string list = "Ns_NsvNames_OCaml"

external nsv_array_names : string -> string -> string list = "Ns_NsvArrayNames_OCaml"


--- NEW FILE: naviserver.c ---
/* 
 * The contents of this file are subject to the Mozilla Public License
 * Version 1.1(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/.
 *
 * 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.
 *
 * Alternatively,the contents of this file may be used under the terms
 * of the GNU General Public License(the "GPL"),in which case the
 * provisions of GPL are applicable instead of those above.  If you wish
 * to allow use of your version of this file only under the terms of the
 * GPL and not to allow others to use your version of this file under the
 * License,indicate your decision by deleting the provisions above and
 * replace them with the notice and other provisions required by the GPL.
 * If you do not delete the provisions above,a recipient may use your
[...1519 lines suppressed...]
    result = Val_int(0); /* [] */
    arrayPtr = LockArray(String_val(oarray),0);
    if(arrayPtr != NULL) {
      pattern = String_val(oname);
      hPtr = Tcl_FirstHashEntry(&arrayPtr->vars, &search);
      while(hPtr != NULL) {
        key = Tcl_GetHashKey(&arrayPtr->vars, hPtr);
        if(!*pattern || Tcl_StringMatch(key,pattern)) {
          orec = result;
          result = alloc_small(2,0);
          nrec = copy_string(key);
          Field(result,0) = nrec;
          Field(result,1) = orec;
        }
        hPtr = Tcl_NextHashEntry(&search);
      }
      UnlockArray(arrayPtr);
    }
    CAMLreturn(result);
}

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsocaml/LICENSE,v 1.1 2005/06/08 20:03:47 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:42:14 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:47 -0000	1.2
***************
*** 1,7 ****
! OCaml Module for AOLserver 4.x
  Release 0.2
  vl...@cr...
  
! This is AOLserver module that implements OCaml interpreter inside AOLServer.
  
  /*--------------------------------------------------------------------*/
--- 1,7 ----
! OCaml Module for NaviServer 4.x
  Release 0.2
  vl...@cr...
  
! This is NaviServer module that implements OCaml interpreter inside NaviServer.
  
  /*--------------------------------------------------------------------*/
***************
*** 10,15 ****
  
  To compile this driver, you'll need to have OCaml installed.
! All AOLserver specific API is built as separate OCaml library aolserver.cma,
! to see currently available functions check aolserver.ml source file.
  
  Usage
--- 10,15 ----
  
  To compile this driver, you'll need to have OCaml installed.
! All NaviServer specific API is built as separate OCaml library naviserver.cma,
! to see currently available functions check naviserver.ml source file.
  
  Usage

Index: nsocaml.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/nsocaml.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsocaml.c	20 May 2005 20:42:14 -0000	1.1.1.1
--- nsocaml.c	8 Jun 2005 20:03:48 -0000	1.2
***************
*** 1,5 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov
!  * All rights reserved.
   * 
   */
--- 1,24 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  * Author Vlad Seryakov vl...@cr...
   * 
   */

Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/modules/nsocaml/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	20 May 2005 20:42:14 -0000	1.1.1.1
--- Makefile	8 Jun 2005 20:03:47 -0000	1.2
***************
*** 8,30 ****
  OCAMLHOME       = $(shell $(OCAMLC) -where)
  OCAMLCFLAGS 	= -g -w s -thread
! OCAMLLIBS	= -L$(OCAMLHOME) -lcamlrun -ltermcap -lunix -lstr -laolserver
  OCAMLLDFLAGS	= -cclib "-fPIC -shared $(OCAMLLIBS) $(LDFLAGS) $(LIBS) $(LDRPATH)"
  # Required OCaml modules
! OCAMLMODS	= aolserver.cma dynlink.cma str.cma unix.cma
  OCAMLOBJS 	= nsocaml.cmo
  
! # AOLserver configuration
  MOD		= nsocaml.so
! BUILD		+= aolserver.cma
  CLEAN		+= clean-ocaml
  CFLAGS	 	= -I$(OCAMLHOME)
  OBJS     	= nsocaml.o
! MODLIBS		= -L$(OCAMLHOME) -lcamlrun -ltermcap -lunix -lstr -laolserver
  
! NSLIB		= aolserver
  
  include  $(NAVISERVER)/include/Makefile.module
  
! # Custom compilcation of AOLserver module
  nsocaml.so: $(OCAMLOBJS) $(OBJS) install-ocaml
  	$(OCAMLC) -linkall -custom $(OCAMLCFLAGS) $(OBJS) $(OCAMLMODS) $(OCAMLOBJS) -o $@ $(OCAMLLDFLAGS)
--- 8,30 ----
  OCAMLHOME       = $(shell $(OCAMLC) -where)
  OCAMLCFLAGS 	= -g -w s -thread
! OCAMLLIBS	= -L$(OCAMLHOME) -lcamlrun -ltermcap -lunix -lstr -lnaviserver
  OCAMLLDFLAGS	= -cclib "-fPIC -shared $(OCAMLLIBS) $(LDFLAGS) $(LIBS) $(LDRPATH)"
  # Required OCaml modules
! OCAMLMODS	= naviserver.cma dynlink.cma str.cma unix.cma
  OCAMLOBJS 	= nsocaml.cmo
  
! # NaviServer configuration
  MOD		= nsocaml.so
! BUILD		+= naviserver.cma
  CLEAN		+= clean-ocaml
  CFLAGS	 	= -I$(OCAMLHOME)
  OBJS     	= nsocaml.o
! MODLIBS		= -L$(OCAMLHOME) -lcamlrun -ltermcap -lunix -lstr -lnaviserver
  
! NSLIB		= naviserver
  
  include  $(NAVISERVER)/include/Makefile.module
  
! # Custom compilcation of Naviserver module
  nsocaml.so: $(OCAMLOBJS) $(OBJS) install-ocaml
  	$(OCAMLC) -linkall -custom $(OCAMLCFLAGS) $(OBJS) $(OCAMLMODS) $(OCAMLOBJS) -o $@ $(OCAMLLDFLAGS)

--- aolserver.ml DELETED ---

--- aolserver.c DELETED ---

[naviserver-commits] modules/nsgdchart LICENSE,NONE,1.1 README,1.1.1.1,1.2 gdchart.c,1.1.1.1,1.2 nsgdchart.c,1.1.1.1,1.2 nsgdchart.h,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsgdchart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsgdchart

Modified Files:
	README gdchart.c nsgdchart.c nsgdchart.h 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:40:56 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:46 -0000	1.2
***************
*** 1,7 ****
! GDChart Module for AOLserver 3.x/4.x
  Release 1.1
  vl...@cr...
  
! This is AOLserver module that implements interface to GDChart library
  http://www.fred.net/brv/chart/ by Bruce Verderaime (br...@fr...).
  
--- 1,7 ----
! GDChart Module for NaviServer 4.x
  Release 1.1
  vl...@cr...
  
! This is NaviServer module that implements interface to GDChart library
  http://www.fred.net/brv/chart/ by Bruce Verderaime (br...@fr...).
  
***************
*** 15,21 ****
  
  To compile this driver, you'll need to have GD library version 1.8 or higher
! compiled and installed. AOLServer can be installed or source distribution may be used.
  
! On some RedHat systems AOLserver configure script picks up libieee library.
  This module will fail during link, in order to fix it remove -lieee from
  Makefile.global file.
--- 15,21 ----
  
  To compile this driver, you'll need to have GD library version 1.8 or higher
! compiled and installed. NaviServer can be installed or source distribution may be used.
  
! On some RedHat systems NaviServer configure script picks up libieee library.
  This module will fail during link, in order to fix it remove -lieee from
  Makefile.global file.
***************
*** 141,145 ****
          saves chart in the specified image file
  
! To run examples in test.tcl connect to aolserver via nscp module and
  type source path_to_distrib/test.tcl or put the test.tcl script somewhere
  under pageroot and call it via browser as http://yourhost/path/test.tcl
--- 141,145 ----
          saves chart in the specified image file
  
! To run examples in test.tcl connect to NaviServer via nscp module and
  type source path_to_distrib/test.tcl or put the test.tcl script somewhere
  under pageroot and call it via browser as http://yourhost/path/test.tcl

Index: nsgdchart.h
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/nsgdchart.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsgdchart.h	20 May 2005 20:40:56 -0000	1.1.1.1
--- nsgdchart.h	8 Jun 2005 20:03:46 -0000	1.2
***************
*** 1,7 ****
! /*
!  * The contents of this file are subject to the AOLserver Public License
   * Version 1.1(the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.lcs.mit.edu/.
   *
   * Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
   * Version 1.1(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/.
   *
   * Software distributed under the License is distributed on an "AS IS"
***************
*** 10,20 ****
   * under the License.
   *
-  * The Original Code is AOLserver Code and related documentation
-  * distributed by AOL.
-  *
-  * The Initial Developer of the Original Code is America Online,
-  * Inc. Portions created by AOL are Copyright(C) 1999 America Online,
-  * Inc. All Rights Reserved.
-  *
   * Alternatively,the contents of this file may be used under the terms
   * of the GNU General Public License(the "GPL"),in which case the
--- 10,13 ----
***************
*** 27,30 ****
--- 20,25 ----
   * version of this file under either the License or the GPL.
   *
+  * Author Vlad Seryakov vl...@cr...
+  * 
   *
   * GDCHART 0.11.4dev  GDC.H  2 Nov 2000

Index: nsgdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/nsgdchart.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsgdchart.c	20 May 2005 20:40:56 -0000	1.1.1.1
--- nsgdchart.c	8 Jun 2005 20:03:46 -0000	1.2
***************
*** 1,7 ****
! /*
!  * The contents of this file are subject to the AOLserver Public License
   * Version 1.1(the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.lcs.mit.edu/.
   *
   * Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
   * Version 1.1(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/.
   *
   * Software distributed under the License is distributed on an "AS IS"
***************
*** 10,20 ****
   * under the License.
   *
-  * The Original Code is AOLserver Code and related documentation
-  * distributed by AOL.
-  *
-  * The Initial Developer of the Original Code is America Online,
-  * Inc. Portions created by AOL are Copyright(C) 1999 America Online,
-  * Inc. All Rights Reserved.
-  *
   * Alternatively,the contents of this file may be used under the terms
   * of the GNU General Public License(the "GPL"),in which case the
--- 10,13 ----
***************
*** 27,30 ****
--- 20,26 ----
   * version of this file under either the License or the GPL.
   *
+  * Author Vlad Seryakov vl...@cr...
+  * 
+  *
   *
   * GDCHART 0.11.4dev  GDC.H  2 Nov 2000

Index: gdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/gdchart.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdchart.c	20 May 2005 20:40:56 -0000	1.1.1.1
--- gdchart.c	8 Jun 2005 20:03:46 -0000	1.2
***************
*** 1,7 ****
! /*
!  * The contents of this file are subject to the AOLserver Public License
   * Version 1.1(the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.lcs.mit.edu/.
   *
   * Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
   * Version 1.1(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/.
   *
   * Software distributed under the License is distributed on an "AS IS"
***************
*** 10,20 ****
   * under the License.
   *
-  * The Original Code is AOLserver Code and related documentation
-  * distributed by AOL.
-  *
-  * The Initial Developer of the Original Code is America Online,
-  * Inc. Portions created by AOL are Copyright(C) 1999 America Online,
-  * Inc. All Rights Reserved.
-  *
   * Alternatively,the contents of this file may be used under the terms
   * of the GNU General Public License(the "GPL"),in which case the
--- 10,13 ----
***************
*** 27,30 ****
--- 20,26 ----
   * version of this file under either the License or the GPL.
   *
+  * Author Vlad Seryakov vl...@cr...
+  * 
+  *
   *
   * GDCHART 0.11.4dev  GDC.H  2 Nov 2000

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsgdchart/LICENSE,v 1.1 2005/06/08 20:03:44 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nsimap LICENSE,NONE,1.1 README,1.1.1.1,1.2 nsimap.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsimap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsimap

Modified Files:
	README nsimap.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsimap/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:41:26 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:47 -0000	1.2
***************
*** 1,9 ****
! IMAP Module for AOLserver 3.x/4.x
  Release 3.2.3
  vl...@cr...
  
! This is AOLserver module that implements IMAP4 interface.
  It is based on UW IMAP c-client library from http://www.washington.edu/imap/. 
! It allows to use AOLserver as IMAP client and build Web based IMAP applications.
  
  /*--------------------------------------------------------------------*/
--- 1,9 ----
! IMAP Module for NaviServer 4.x
  Release 3.2.3
  vl...@cr...
  
! This is NaviServer module that implements IMAP4 interface.
  It is based on UW IMAP c-client library from http://www.washington.edu/imap/. 
! It allows to use NaviServer as IMAP client and build Web based IMAP applications.
  
  /*--------------------------------------------------------------------*/
***************
*** 12,16 ****
  
  To compile this driver, you'll need to have c-client library compiled 
! and installed. AOLServer can be installed or source distribution may be used.
  There is variable IMAP in Makefile which points to installation/dustribution
  directory.
--- 12,16 ----
  
  To compile this driver, you'll need to have c-client library compiled 
! and installed. NaviSrver can be installed or source distribution may be used.
  There is variable IMAP in Makefile which points to installation/dustribution
  directory.

Index: nsimap.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsimap/nsimap.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsimap.c	20 May 2005 20:41:26 -0000	1.1.1.1
--- nsimap.c	8 Jun 2005 20:03:47 -0000	1.2
***************
*** 1,25 ****
! /*
!  * The contents of this file are subject to the AOLserver Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.lcs.mit.edu/.
   *
   * 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.
   *
!  * Copyright (C) 2001-2003 Vlad Seryakov
!  * All rights reserved.
!  *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,25 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  *
+  * Author Vlad Seryakov vl...@cr...
+  * 
   */
  

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsimap/LICENSE,v 1.1 2005/06/08 20:03:47 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nsfreetds LICENSE,NONE,1.1 README,NONE,1.1 nsfreetds.c,1.4,1.5

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsfreetds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsfreetds

Modified Files:
	nsfreetds.c 
Added Files:
	LICENSE README 
Log Message:
Changed license and wording in README files.


Index: nsfreetds.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfreetds/nsfreetds.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nsfreetds.c	7 Jun 2005 00:02:28 -0000	1.4
--- nsfreetds.c	8 Jun 2005 20:03:44 -0000	1.5
***************
*** 1,9 ****
! /*
   * FreeTDS internal driver for NaviServer 4.x
   *
   * Requires FreeTDS version 0.64+
   *
-  * Vlad Seryakov vl...@cr...
-  *
   * Derived from FreeTDS driver by Dossy <do...@pa...>
   */
--- 1,29 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  * Author Vlad Seryakov vl...@cr...
!  * 
   * FreeTDS internal driver for NaviServer 4.x
   *
   * Requires FreeTDS version 0.64+
   *
   * Derived from FreeTDS driver by Dossy <do...@pa...>
   */
***************
*** 230,234 ****
      if(rc != TDS_SUCCEED && rc != TDS_NO_MORE_RESULTS) {
         Ns_Log(Error,"Db_GetRow(%s): tds_process_row_tokens: %d",handle->datasource,rc);
-        Db_Cancel(handle);
         return NS_ERROR;
      }
--- 250,253 ----

--- NEW FILE: README ---
FreeTDS database driver for NaviServer 4.x
Release 0.5
vl...@cr...

This is NaviServer module that database driver to access 
Sybase/MS SQL servers via FreeTDS(http://www.freetds.org).

/*--------------------------------------------------------------------*/

Compiling and Installing

To compile this driver, you'll need to have FreeTDS installed.

Configuration

ns_section      "ns/db/drivers"
ns_param        nsfreetds                nsfreetds.so

ns_section      "ns/db/pools"
ns_param        nsfreetds                "FreeTDS"

ns_section      "ns/db/pool/nsfreetds"
ns_param        driver                  freetds
ns_param        connections             10
ns_param        user                    user
ns_param        password                passwd
ns_param        datasource              SQLServer
ns_param        verbose                 Off
ns_param        logsqlerrors            On
ns_param        maxidle                 31536000

To access SQLServer datasource, FreeTDS requires entryu in freetds.conf
which is located in /usr/local/etc or /usr/local/fretds/etc.

[SQLServer]
        host = sqlserver.com
        port = 1433
        tds version = 7.0
        dump file = /tmp/freetds.log
        debug level = 0
  
Authors
     Vlad Seryakov vl...@cr...

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsfreetds/LICENSE,v 1.1 2005/06/08 20:03:44 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nsfortune LICENSE,NONE,1.1 README,1.1.1.1,1.2 nsfortune.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsfortune
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsfortune

Modified Files:
	README nsfortune.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfortune/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:49:06 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:43 -0000	1.2
***************
*** 1,7 ****
! Fortune Module for AOLserver 3.x/4.0
  Release 1.0
  vl...@cr...
  
! This is AOLserver module that implements fortune game.
  
  /*--------------------------------------------------------------------*/
--- 1,7 ----
! Fortune Module for NaviServer 3.x/4.0
  Release 1.0
  vl...@cr...
  
! This is NaviServer module that implements fortune game.
  
  /*--------------------------------------------------------------------*/

Index: nsfortune.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfortune/nsfortune.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsfortune.c	20 May 2005 20:49:06 -0000	1.1.1.1
--- nsfortune.c	8 Jun 2005 20:03:43 -0000	1.2
***************
*** 1,3 ****
! /* Copyright 2003 Vlad Seryakov vl...@cr... */
  
  #include "ns.h"
--- 1,26 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  * Author Vlad Seryakov vl...@cr...
!  * 
!  */
  
  #include "ns.h"

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsfortune/LICENSE,v 1.1 2005/06/08 20:03:43 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nsdns LICENSE,NONE,1.1 README,1.1.1.1,1.2 dns.c,1.1.1.1,1.2 dns.h,1.1.1.1,1.2 nsdns.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsdns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsdns

Modified Files:
	README dns.c dns.h nsdns.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:40:08 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:42 -0000	1.2
***************
*** 15,19 ****
  To compile this driver, just type make
  
! dns.tcl file may go to /usr/local/aolserver/modules/tcl directory
  to be loaded on startup. It loads /etc/hosts records into DNS cache as A 
  records and will act as primary DNS server for these hosts.
--- 15,19 ----
  To compile this driver, just type make
  
! dns.tcl file may go to /usr/local/ns/modules/tcl directory
  to be loaded on startup. It loads /etc/hosts records into DNS cache as A 
  records and will act as primary DNS server for these hosts.

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsdns/LICENSE,v 1.1 2005/06/08 20:03:41 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.


Index: nsdns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/nsdns.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsdns.c	20 May 2005 20:40:08 -0000	1.1.1.1
--- nsdns.c	8 Jun 2005 20:03:42 -0000	1.2
***************
*** 1,25 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov and all the Contributers
!  * All rights reserved.
!  *
   * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://mozilla.org/.
   *
   * 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.
   *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,25 ----
! /* 
   * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  *
+  * Author Vlad Seryakov vl...@cr...
+  * 
   */
  

Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/dns.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dns.c	20 May 2005 20:40:08 -0000	1.1.1.1
--- dns.c	8 Jun 2005 20:03:42 -0000	1.2
***************
*** 1,25 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov and all the Contributers
!  * All rights reserved.
!  *
!  * The contents of this file are subject to the AOLserver Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.lcs.mit.edu/.
   *
   * 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.
!  *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,25 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
!  * 
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and   
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  * 
+  * Author Vlad Seryakov vl...@cr...
+  *
   */
  

Index: dns.h
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/dns.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dns.h	20 May 2005 20:40:08 -0000	1.1.1.1
--- dns.h	8 Jun 2005 20:03:42 -0000	1.2
***************
*** 1,26 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov (vl...@cr...) and
!  * all the Contributers
!  * All rights reserved.
!  *
!  * The contents of this file are subject to the AOLserver Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.lcs.mit.edu/.
   *
   * 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.
   *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,25 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  *
+  * Author Vlad Seryakov vl...@cr...
+  * 
   */
  

[naviserver-commits] modules/nsclamav LICENSE,NONE,1.1 README,1.1.1.1,1.2 nsclamav.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsclamav
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsclamav

Modified Files:
	README nsclamav.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsclamav/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:38:06 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:40 -0000	1.2
***************
*** 1,7 ****
! ClamAV interface Module for AOLserver 3.x/4.0
  Release 1.0
  vl...@cr...
  
! This is AOLserver module that implements interface to ClamAv anti-virus.
  
  /*--------------------------------------------------------------------*/
--- 1,7 ----
! ClamAV interface Module for NaviServer 4.x
  Release 1.0
  vl...@cr...
  
! This is NaviServer module that implements interface to ClamAv anti-virus.
  
  /*--------------------------------------------------------------------*/

Index: nsclamav.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsclamav/nsclamav.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsclamav.c	20 May 2005 20:38:06 -0000	1.1.1.1
--- nsclamav.c	8 Jun 2005 20:03:40 -0000	1.2
***************
*** 1,5 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov
!  * All rights reserved.
   * 
   */
--- 1,22 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  * 
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and   
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
   * 
   */
***************
*** 17,20 ****
--- 34,39 ----
   *      checks string buffer for viruses
   *
+  *  Author Vlad Seryakov vl...@cr...
+  *
   */
  

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsclamav/LICENSE,v 1.1 2005/06/08 20:03:40 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nschartdir LICENSE,NONE,1.1 README,1.1.1.1,1.2 nschartdir.c,1.1.1.1,1.2 COPYING,1.1.1.1,NONE

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nschartdir
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nschartdir

Modified Files:
	README nschartdir.c 
Added Files:
	LICENSE 
Removed Files:
	COPYING 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nschartdir/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:37:39 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:38 -0000	1.2
***************
*** 1,7 ****
! Chart Module for AOLserver 3.x, 4.x
  Release 0.9.6
  vl...@cr...
  
! This is AOLserver module that implements interface to ChartDirector
  from www.advsofteng.com
  
--- 1,7 ----
! Chart Module for NaviServer 3.x, 4.x
  Release 0.9.6
  vl...@cr...
  
! This is NaviServer module that implements interface to ChartDirector
  from www.advsofteng.com
  
***************
*** 12,16 ****
  To compile this driver, you'll need to have ChartDirector library installed,
  current Makefile assumes that it is installed in /usr/local/chartdir.
! AOLServer can be installed or source distribution may be used.
  There is variable CDFLAGS and CDLIBS in the Makefile which points to 
  installation/dustribution directory.
--- 12,16 ----
  To compile this driver, you'll need to have ChartDirector library installed,
  current Makefile assumes that it is installed in /usr/local/chartdir.
! NaviServer can be installed or source distribution may be used.
  There is variable CDFLAGS and CDLIBS in the Makefile which points to 
  installation/dustribution directory.
***************
*** 38,42 ****
  In order to run scripts from test subdirectory, nscp shell can be used,
  there is no path defined in the scripts, so all *.png files from test
! directory should be copied to aolserver home or edited to reflect actual
  location, library assumes current directory for all included files.
  
--- 38,42 ----
  In order to run scripts from test subdirectory, nscp shell can be used,
  there is no path defined in the scripts, so all *.png files from test
! directory should be copied to NaviServer home or edited to reflect actual
  location, library assumes current directory for all included files.
  

Index: nschartdir.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nschartdir/nschartdir.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nschartdir.c	20 May 2005 20:37:39 -0000	1.1.1.1
--- nschartdir.c	8 Jun 2005 20:03:38 -0000	1.2
***************
*** 1,19 ****
! /*
!  * Copyright (c) 2001 Vlad Seryakov and all the Contributers
!  * All rights reserved.
! 
!  * This program is free software; you can redistribute it and/or modify it
!  * under the terms of the GNU General Public License as published by the Free
!  * Software Foundation; either version 2 of the License, or (at your option)
!  * any later version.
! 
!  * This program is distributed in the hope that it will be useful, but WITHOUT
!  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
!  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
!  * more details.
! 
!  * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc., 675
!  * Mass Ave, Cambridge, MA 02139, USA.
   */
  
--- 1,23 ----
! /* 
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  * 
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and   
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  * 
   */
  
***************
*** 40,43 ****
--- 44,48 ----
   *     Vlad Seryakov vl...@cr...
   */
+ 
  #define USE_TCL8X
  extern "C" {

--- COPYING DELETED ---

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nschartdir/LICENSE,v 1.1 2005/06/08 20:03:38 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nsberkeleydb LICENSE,NONE,1.1 README,1.1.1.1,1.2 nsberkeleydb.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsberkeleydb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsberkeleydb

Modified Files:
	README nsberkeleydb.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsberkeleydb/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:37:12 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:38 -0000	1.2
***************
*** 1,7 ****
! BerkeleyDB database driver for AOLserver 3.x, 4.x
  Release 0.1
  vl...@cr...
  
! This is AOLserver module that implements database driver for BerkeleyDB
  from www.sleepycat.com
  
--- 1,7 ----
! BerkeleyDB database driver for NaviServer 4.x
  Release 0.1
  vl...@cr...
  
! This is NaviServer module that implements database driver for BerkeleyDB
  from www.sleepycat.com
  
***************
*** 13,17 ****
  current Makefile assumes that it is installed in /usr/include/ and
  library is /usr/lib/libdb.so.
! AOLServer can be installed or source distribution may be used.
  There is variable CDFLAGS and CDLIBS in the Makefile which points to 
  installation/distribution directory.
--- 13,17 ----
  current Makefile assumes that it is installed in /usr/include/ and
  library is /usr/lib/libdb.so.
! NaviServer can be installed or source distribution may be used.
  There is variable CDFLAGS and CDLIBS in the Makefile which points to 
  installation/distribution directory.

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsberkeleydb/LICENSE,v 1.1 2005/06/08 20:03:38 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.


Index: nsberkeleydb.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsberkeleydb/nsberkeleydb.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsberkeleydb.c	20 May 2005 20:37:12 -0000	1.1.1.1
--- nsberkeleydb.c	8 Jun 2005 20:03:38 -0000	1.2
***************
*** 1,22 ****
  /*
!  * The contents of this file are subject to the AOLserver Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.com/.
   *
   * 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.
   *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,23 ----
  /*
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  *
   */
  

[naviserver-commits] modules/nsaspell LICENSE,NONE,1.1 README,1.1.1.1,1.2 nsaspell.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsaspell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsaspell

Modified Files:
	README nsaspell.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nsaspell/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:36:35 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:37 -0000	1.2
***************
*** 1,7 ****
! Aspell interface Module for AOLserver 3.x/4.0
  Release 1.0.1
  vl...@cr...
  
! This is AOLserver module that implements interface to aspell (http://aspell.net).
  
  /*--------------------------------------------------------------------*/
--- 1,7 ----
! Aspell interface Module for NaviServer 4.x
  Release 1.0.1
  vl...@cr...
  
! This is NaviServer module that implements interface to aspell (http://aspell.net).
  
  /*--------------------------------------------------------------------*/

Index: nsaspell.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsaspell/nsaspell.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsaspell.c	20 May 2005 20:36:35 -0000	1.1.1.1
--- nsaspell.c	8 Jun 2005 20:03:37 -0000	1.2
***************
*** 1,5 ****
  /*
!  * Copyright (c) 2001 Vlad Seryakov
!  * All rights reserved.
   * 
   */
--- 1,25 ----
  /*
!  * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
!  *
!  * 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.
!  *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
!  * provisions of GPL are applicable instead of those above.  If you wish
!  * to allow use of your version of this file only under the terms of the
!  * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
!  * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
!  * version of this file under either the License or the GPL.
!  *
!  *
!  * Author Vlad Seryakov vl...@cr...
   * 
   */

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsaspell/LICENSE,v 1.1 2005/06/08 20:03:37 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nszlib LICENSE,NONE,1.1 README,1.1.1.1,1.2 nszlib.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nszlib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nszlib

Modified Files:
	README nszlib.c 
Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


Index: README
===================================================================
RCS file: /cvsroot/naviserver/modules/nszlib/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	20 May 2005 20:48:23 -0000	1.1.1.1
--- README	8 Jun 2005 20:03:51 -0000	1.2
***************
*** 1,7 ****
! ZLib Module for AOLserver 3.x/4.0
  Release 1.1
  vl...@cr...
  
! This is AOLserver module that implements Zlib interface.
  Allows compressing/uncompressing Tcl strings as well as gzip file support.
  
--- 1,7 ----
! ZLib Module for NaviServer 3.x/4.0
  Release 1.1
  vl...@cr...
  
! This is NaviServer module that implements Zlib interface.
  Allows compressing/uncompressing Tcl strings as well as gzip file support.
  

--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nszlib/LICENSE,v 1.1 2005/06/08 20:03:51 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.


Index: nszlib.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nszlib/nszlib.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nszlib.c	20 May 2005 20:48:23 -0000	1.1.1.1
--- nszlib.c	8 Jun 2005 20:03:51 -0000	1.2
***************
*** 1,25 ****
! /*
   * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://mozilla.org/.
   *
   * 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.
   *
!  * Copyright (C) 2001-2003 Vlad Seryakov
!  * All rights reserved.
!  *
!  * Alternatively, the contents of this file may be used under the terms
!  * of the GNU General Public License (the "GPL"), in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License, indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above, a recipient may use your
   * version of this file under either the License or the GPL.
   */
  
--- 1,25 ----
! /* 
   * The contents of this file are subject to the Mozilla Public License
!  * Version 1.1(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/.
   *
   * 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.
   *
!  * Alternatively,the contents of this file may be used under the terms
!  * of the GNU General Public License(the "GPL"),in which case the
   * provisions of GPL are applicable instead of those above.  If you wish
   * to allow use of your version of this file only under the terms of the
   * GPL and not to allow others to use your version of this file under the
!  * License,indicate your decision by deleting the provisions above and
   * replace them with the notice and other provisions required by the GPL.
!  * If you do not delete the provisions above,a recipient may use your
   * version of this file under either the License or the GPL.
+  *
+  * Author Vlad Seryakov vl...@cr...
+  * 
   */
  

[naviserver-commits] modules/nstk LICENSE,NONE,1.1

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nstk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nstk

Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nstk/LICENSE,v 1.1 2005/06/08 20:03:50 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] modules/nsudp LICENSE,NONE,1.1

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsudp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4062/nsudp

Added Files:
	LICENSE 
Log Message:
Changed license and wording in README files.


--- NEW FILE: LICENSE ---

$Header: /cvsroot/naviserver/modules/nsudp/LICENSE,v 1.1 2005/06/08 20:03:51 seryakov Exp $


MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions. 

1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.

1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.

1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.

1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.

1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.

1.5. "Executable" means Covered Code in any form other than Source Code. 

1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.

1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.

1.8. "License" means this document. 

1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.

1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:

A.  Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.

B.  Any new file that contains any part of the Original Code or
previous Modifications. 
 
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.

1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.

1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.

1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section
6.1. For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.

2. Source Code License. 

2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:

(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and

(b) under Patents Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).

(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.

(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by: i)
the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
 
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world- wide, royalty-free, non-exclusive license
  
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and 

(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).

(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.

(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.

3. Distribution Obligations. 

3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder.  However, You may include
an additional document offering the additional rights described in
Section 3.5.

3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.

3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.

3.4. Intellectual Property Matters 

(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL" which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.

(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the LEGAL file.
 
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.

3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code.  If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice.  If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A.  You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code.  You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor.  You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.

3.6. Distribution of Executable Versions. 
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.

3.7. Larger Works. 
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation. 

If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.

5. Application of this License. 

This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License. 

6.1. New Versions. 
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.

6.2. Effect of New Versions. 
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape.  No
one other than Netscape has the right to modify the terms applicable
to Covered Code created under this License.

6.3. Derivative Works. 
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License.  (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)

7. DISCLAIMER OF WARRANTY. 

COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, 
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS 
FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-
INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE 
COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE 
IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 
CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL 
PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED 
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION. 

8.1.  This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.

8.2.  If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial
Developer or a Contributor (the Initial Developer or Contributor
against whom You file such action is referred to as "Participant")
alleging that:

(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i) agree
in writing to pay Participant a mutually agreeable reasonable royalty
for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant.  If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.

(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.

8.3.  If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.

8.4.  In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.

9. LIMITATION OF LIABILITY. 

UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT 
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE 
INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF 
COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO 
ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES 
FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, 
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF 
SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO 
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S 
NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS. 

The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.

11. MISCELLANEOUS. 

This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law
provisions. With respect to disputes in which at least one party is a
citizen of, or an entity chartered or registered to do business in the
United States of America, any litigation relating to this License
shall be subject to the jurisdiction of the Federal Courts of the
Northern District of California, with venue lying in Santa Clara
County, California, with the losing party responsible for costs,
including without limitation, court costs and reasonable attorneys'
fees and expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly
excluded. Any law or regulation which provides that the language of a
contract shall be construed against the drafter shall not apply to
this License.

12. RESPONSIBILITY FOR CLAIMS. 

As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE. 

Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed".  "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the APL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.



AMENDMENTS

The AOLserver Public License Version 1.1 ("APL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including "Exhibit A - AOLserver Public License".  Files identified
with "Exhibit A - AOLserver Public License" are governed by the
AOLserver Public License Version 1.1.

Additional Terms applicable to the AOLserver Public License. 

I. Effect. 
These additional terms described in this AOLserver Public License --
Amendments shall apply to the AOLserver Code and to all Covered Code
under this License.

II. "AOL's Branded Code" means Covered Code that AOL distributes
and/or permits others to distribute under one or more trademark(s)
which are controlled by AOL but which are not licensed for use under
this License.

III. AOL Trademarks.  This License does not grant any rights to use
the trademarks "AOL", "America Online", "AOLserver" or the "AOL
Triangle" logo even if such marks are included in the Original Code
or Modifications.

IV. Inability to Comply Due to Contractual Obligation.  Prior to
licensing the Original Code under this License, AOL has licensed third
party code for use in AOL's Branded Code. To the extent that AOL is
limited contractually from making such third party code available
under this License, AOL may choose to reintegrate such code into
Covered Code without being required to distribute such code in Source
Code form, even if such code would otherwise be considered
"Modifications" under this License.

V. [Intentionally Omitted]
 
VI. Litigation. 
Notwithstanding the limitations of Section 11 above, the provisions
regarding litigation in Section 11(a), (b) and (c) of the License
shall apply to all disputes relating to this License.


EXHIBIT A - AOLserver Public License.
  
"The contents of this file are subject to the AOLserver Public
License Version 1.1 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License
at http://aolserver.com/.

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.

The Original Code is AOLserver Code and related documentation
distributed by AOL.

The Initial Developer of the Original Code is America Online,
Inc. Portions created by AOL are Copyright (C) 1999 America Online,
Inc. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the GNU General Public License (the "GPL"), in which case the
provisions of GPL are applicable instead of those above.  If you wish
to allow use of your version of this file only under the terms of the
GPL and not to allow others to use your version of this file under the
License, indicate your decision by deleting the provisions above and
replace them with the notice and other provisions required by the GPL.
If you do not delete the provisions above, a recipient may use your
version of this file under either the License or the GPL.

[naviserver-commits] naviserver NEWS,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8033

Modified Files:
	NEWS 
Log Message:
added new modules section into NEWS


Index: NEWS
===================================================================
RCS file: /cvsroot/naviserver/naviserver/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NEWS	8 Jun 2005 16:14:03 -0000	1.2
--- NEWS	8 Jun 2005 16:41:53 -0000	1.3
***************
*** 47,48 ****
--- 47,67 ----
       * Modules nspd and nsext moved from core to external modules
       * Objectified TclX keyed lists
+ 
+ New Modules:
+ 
+     * New nsudp module to support HTTP over UDP
+     * New nstk module that implements templating and Tcl utilities
+     * New nsaspell module implements interface to GNU Aspell
+     * New nsberkeleydb module implements interface to BerkelyDB
+     * New nschartdir module implements charting interface to ChartDirector
+     * New nsclamav module implements interface to ClamAV anti-virus
+     * New nsdns module implements DNS client and server
+     * New nsfortune module implements interface to Unix fortune game
+     * New nsfreetds module implements database driver to FreeTDS
+     * New nsgdchart module implements charting using GD library
+     * New nsimap module implements IMAP client using UW imap client
+     * New nsocaml module implements interface to OCaml langage
+     * New nssavi module implements interface to Sophos anti-virus
+     * New nssnmp module implements SNMP client and SNMP trap server
+     * New nszlib module implements interface to zlib library
+ 

[naviserver-commits] naviserver ChangeLog,1.87,1.88 Makefile,1.10,1.11

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv600

Modified Files:
	ChangeLog Makefile 
Log Message:
Make sure derived files don't end up in the tarball.


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/naviserver/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	8 Jun 2005 16:07:24 -0000	1.10
--- Makefile	8 Jun 2005 16:29:12 -0000	1.11
***************
*** 98,101 ****
--- 98,102 ----
  	$(MKDIR) naviserver-$(NS_PATCH_LEVEL)
  	$(CP) $(distfiles) naviserver-$(NS_PATCH_LEVEL)
+ 	$(RM) naviserver-$(NS_PATCH_LEVEL)/include/{config.h,Makefile.global,Makefile.module}
  	tar czf naviserver-$(NS_PATCH_LEVEL).tar.gz naviserver-$(NS_PATCH_LEVEL)
  	$(RM) naviserver-$(NS_PATCH_LEVEL)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** ChangeLog	8 Jun 2005 16:14:02 -0000	1.87
--- ChangeLog	8 Jun 2005 16:29:12 -0000	1.88
***************
*** 1,4 ****
--- 1,6 ----
  2005-06-08  Stephen Deasey  <sd...@us...>
  
+ 	* Makefile: Make sure derived files don't end up in the tarball.
+ 
  	* Makefile:
  	* NEWS: Add latest news.

[naviserver-commits] naviserver ChangeLog,1.86,1.87 NEWS,1.1,1.2

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24541

Modified Files:
	ChangeLog NEWS 
Log Message:
Add some RFE numbers.


Index: NEWS
===================================================================
RCS file: /cvsroot/naviserver/naviserver/NEWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NEWS	8 Jun 2005 16:07:24 -0000	1.1
--- NEWS	8 Jun 2005 16:14:03 -0000	1.2
***************
*** 8,12 ****
      * Add support for mass virtual hosting #1159471
      * ns_uuencode et all now do full base64 encoding
!     * New introspection commands for procs, filters and traces
      * C and Tcl API for HTTP cookies #1145957
      * Add -bytes option to ns_conncptofp command
--- 8,12 ----
      * Add support for mass virtual hosting #1159471
      * ns_uuencode et all now do full base64 encoding
!     * New introspection commands for procs, filters and traces #1161597
      * C and Tcl API for HTTP cookies #1145957
      * Add -bytes option to ns_conncptofp command

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** ChangeLog	8 Jun 2005 16:07:16 -0000	1.86
--- ChangeLog	8 Jun 2005 16:14:02 -0000	1.87
***************
*** 333,337 ****
  	* nsd/uuencode.c: modified uuencode/decode to support
  	  string buffers any size and be compatible with GNU uuencode,
! 	  i.e. wrapping lines to be 60 chars.
  
  2005-03-28  Vlad Seryakov  <ser...@us...>
--- 333,337 ----
  	* nsd/uuencode.c: modified uuencode/decode to support
  	  string buffers any size and be compatible with GNU uuencode,
! 	  i.e. wrapping lines to be 60 chars. (RFE #1175025)
  
  2005-03-28  Vlad Seryakov  <ser...@us...>
***************
*** 344,347 ****
--- 344,348 ----
   	  Tcl callback interface. New commands show information about
  	  registered filters/procs same way as ns_info scheduled does.
+ 	  (RFE #1161597)
  
  2005-03-27  Vlad Seryakov  <ser...@us...>

[naviserver-commits] naviserver NEWS,NONE,1.1 ChangeLog,1.85,1.86 Makefile,1.9,1.10

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20832

Modified Files:
	ChangeLog Makefile 
Added Files:
	NEWS 
Log Message:
Add latest news.


--- NEW FILE: NEWS ---
=================
NaviServer 4.99.0
=================

New Features:

    * Byte code for Tcl pages are cached if nscache module present
    * Add support for mass virtual hosting #1159471
    * ns_uuencode et all now do full base64 encoding
    * New introspection commands for procs, filters and traces
    * C and Tcl API for HTTP cookies #1145957
    * Add -bytes option to ns_conncptofp command
    * New command ns_conn channel #1156141
    * Add new wtchdog feature to restart the server if it crashes
    * Add ns_sha1 cryptographic hash command
    * C and Tcl API for setting response code of current connection
    * ns_accesslog can change configuration at runtime
    * New C and Tcl API for parsing command options and arguments
    * Server can now run as root if instructed to
    * Add new command ns_atstartup
    * New routines for listening on UDP and UNIX domain sockets
    * Add -localhost -localport options to ns_sockopen

Bug Fixes:

    * Add locking to non multi-thread safe timegm()
    * Fix infinite loop in DNS routines
    * Call comm drivers DriverClose command when socket is released
    * Fix crash bug in nslog on NULL rollfmt
    * Fix URL decoding of '+' characters #1145277
    * Report correct MIME type for xml documents #1145927
    * Fix crash in channel detach code #1143586
    * Make ns_sendmail handle dropped connections
    * Fix crash on startup when resolving localhost
    * Preserve nsdb exception messages generated by driver

Code Changes:

     * Remove GNU implementations of getopt and poll
     * Cleanup up autoconf and use autoheader
     * Clean up test harness and add lots of tests
     * New Tcl callback infrastructure #1162223
     * New convenience functions for handling Tcl object types
     * New function Ns_TclPrintfResult() for formatting Tcl results
     * No more support for defunct AOLpress
     * Remove support for old connid argument in much code #1156107
     * Modules nspd and nsext moved from core to external modules
     * Objectified TclX keyed lists

Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/naviserver/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile	4 Jun 2005 15:24:28 -0000	1.9
--- Makefile	8 Jun 2005 16:07:24 -0000	1.10
***************
*** 37,41 ****
  
  distfiles = $(dirs) doc tcl include tests win32 *.tcl *.m4 \
! 	configure Makefile install-sh README ChangeLog license.terms
  
  all: 
--- 37,41 ----
  
  distfiles = $(dirs) doc tcl include tests win32 *.tcl *.m4 \
! 	configure Makefile install-sh README ChangeLog NEWS license.terms
  
  all: 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** ChangeLog	4 Jun 2005 15:24:28 -0000	1.85
--- ChangeLog	8 Jun 2005 16:07:16 -0000	1.86
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-06-08  Stephen Deasey  <sd...@us...>
+ 
+ 	* Makefile:
+ 	* NEWS: Add latest news.
+ 
  2005-06-04  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] modules/nsfreetds nsfreetds.c,1.3,1.4

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsfreetds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14382

Modified Files:
	nsfreetds.c 
Log Message:
dead connection detecting by Ian Harding, support FreeTDS 0.64


Index: nsfreetds.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfreetds/nsfreetds.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsfreetds.c	26 May 2005 04:09:35 -0000	1.3
--- nsfreetds.c	7 Jun 2005 00:02:28 -0000	1.4
***************
*** 118,123 ****
      tds = tds_alloc_socket(context,512);
  
!     if(context->locale && !context->locale->date_fmt)
        context->locale->date_fmt = strdup("%Y-%m-%d %T");
  
      context->msg_handler = Db_Msg_Handler;
--- 118,124 ----
      tds = tds_alloc_socket(context,512);
  
!     if(context->locale && !context->locale->date_fmt) {
        context->locale->date_fmt = strdup("%Y-%m-%d %T");
+     }
  
      context->msg_handler = Db_Msg_Handler;
***************
*** 176,184 ****
      TDS_INT resulttype;
  
!     Db_Cancel(handle);
  
      if(tds_submit_query(GET_TDS(handle),sql) != TDS_SUCCEED) {
!       Ns_Log(Error, "Db_Exec(%s): tds_submit_query failed.", handle->datasource);
!       return NS_ERROR;
      }
      while(status == TDS_SUCCEED) {
--- 177,187 ----
      TDS_INT resulttype;
  
!     if(Db_Cancel(handle) == NS_ERROR) {
!        return NS_ERROR;
!     }
  
      if(tds_submit_query(GET_TDS(handle),sql) != TDS_SUCCEED) {
!        Ns_Log(Error, "Db_Exec(%s): tds_submit_query failed.", handle->datasource);
!        return NS_ERROR;
      }
      while(status == TDS_SUCCEED) {
***************
*** 188,194 ****
         case TDS_DONEPROC_RESULT:
         case TDS_DONEINPROC_RESULT:
!            status = done & TDS_DONE_ERROR ? TDS_FAIL : TDS_NO_MORE_RESULTS;
             break;
         case TDS_ROW_RESULT:
         case TDS_COMPUTE_RESULT:
             handle->statement = (void *)GET_TDS(handle)->res_info;
--- 191,198 ----
         case TDS_DONEPROC_RESULT:
         case TDS_DONEINPROC_RESULT:
!            if(done & TDS_DONE_ERROR) status = TDS_FAIL;
             break;
         case TDS_ROW_RESULT:
+        case TDS_ROWFMT_RESULT: 
         case TDS_COMPUTE_RESULT:
             handle->statement = (void *)GET_TDS(handle)->res_info;
***************
*** 200,203 ****
--- 204,208 ----
             break;
        }
+       
      }
      if((status != TDS_SUCCEED && status != TDS_NO_MORE_RESULTS) || handle->dsExceptionMsg.length) {
***************
*** 219,230 ****
  
      if(!handle->fetchingRows || !handle->row->size) {
!       Ns_DbSetException(handle,"NSDB","no rows waiting to fetch");
!       return NS_ERROR;
      }
      rc = tds_process_tokens(GET_TDS(handle),&resulttype,&computeid,TDS_STOPAT_ROWFMT|TDS_RETURN_DONE|TDS_RETURN_ROW|TDS_RETURN_COMPUTE);
      if(rc != TDS_SUCCEED && rc != TDS_NO_MORE_RESULTS) {
!       Ns_Log(Error,"Db_GetRow(%s): tds_process_row_tokens: %d",handle->datasource,rc);
!       Db_Cancel(handle);
!       return NS_ERROR;
      }
      if(rc == TDS_NO_MORE_RESULTS || 
--- 224,235 ----
  
      if(!handle->fetchingRows || !handle->row->size) {
!        Ns_DbSetException(handle,"NSDB","no rows waiting to fetch");
!        return NS_ERROR;
      }
      rc = tds_process_tokens(GET_TDS(handle),&resulttype,&computeid,TDS_STOPAT_ROWFMT|TDS_RETURN_DONE|TDS_RETURN_ROW|TDS_RETURN_COMPUTE);
      if(rc != TDS_SUCCEED && rc != TDS_NO_MORE_RESULTS) {
!        Ns_Log(Error,"Db_GetRow(%s): tds_process_row_tokens: %d",handle->datasource,rc);
!        Db_Cancel(handle);
!        return NS_ERROR;
      }
      if(rc == TDS_NO_MORE_RESULTS || 
***************
*** 259,264 ****
  Db_Flush(Ns_DbHandle *handle)
  {
!     Db_Cancel(handle);
!     return NS_OK;
  }
  
--- 264,268 ----
  Db_Flush(Ns_DbHandle *handle)
  {
!     return Db_Cancel(handle);
  }
  
***************
*** 266,271 ****
  Db_Cancel(Ns_DbHandle *handle)
  {
!     if(handle->fetchingRows) {
!        tds_process_simple_query(GET_TDS(handle));
      }
      tds_free_all_results(GET_TDS(handle));
--- 270,282 ----
  Db_Cancel(Ns_DbHandle *handle)
  {
!     if(IS_TDSDEAD(GET_TDS(handle))) {
!        Ns_Log(Error, "Db_Cancel(%s): dead connection detected.", handle->datasource);
!        handle->statement = NULL;
!        handle->fetchingRows = 0;
!        handle->connected = NS_FALSE;
!        return NS_ERROR;
!     }
!     if(tds_process_simple_query(GET_TDS(handle)) == TDS_FAIL) {
!        Ns_Log(Error,"Db_Cancel(%s): tds_process_simple_query failed",handle->datasource);
      }
      tds_free_all_results(GET_TDS(handle));
***************
*** 283,288 ****
  
      if(GET_TDS_RESULTS(handle)) {
!       for(i = 0; i < GET_TDS_RESULTS(handle)->num_cols; i++)
          Ns_SetPut((Ns_Set *)handle->row,GET_TDS_RESULTS(handle)->columns[i]->column_name,NULL);
      }
      return (Ns_Set *)handle->row;
--- 294,300 ----
  
      if(GET_TDS_RESULTS(handle)) {
!       for(i = 0; i < GET_TDS_RESULTS(handle)->num_cols; i++) {
          Ns_SetPut((Ns_Set *)handle->row,GET_TDS_RESULTS(handle)->columns[i]->column_name,NULL);
+       }
      }
      return (Ns_Set *)handle->row;
***************
*** 292,296 ****
  Db_SpStart(Ns_DbHandle *handle, char *procname)
  {
!     if(Db_Exec(handle, procname) != NS_ERROR) return NS_OK;
      return NS_ERROR;
  }
--- 304,310 ----
  Db_SpStart(Ns_DbHandle *handle, char *procname)
  {
!     if(Db_Exec(handle, procname) != NS_ERROR) {
!        return NS_OK;
!     }
      return NS_ERROR;
  }
***************
*** 299,303 ****
  Db_SpExec(Ns_DbHandle *handle)
  {
!     if(GET_TDS(handle)->res_info == NULL) return NS_DML;
      return NS_ROWS;
  }
--- 313,319 ----
  Db_SpExec(Ns_DbHandle *handle)
  {
!     if(GET_TDS(handle)->res_info == NULL) {
!        return NS_DML;
!     }
      return NS_ROWS;
  }
***************
*** 318,326 ****
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
  
!     Ns_Log(Notice, "Db_Msg_Handler(%s:%d,%d,%s): %s",
!            handle->datasource,msg->msg_level,msg->msg_state,
!            msg->sql_state ? msg->sql_state : "0",msg->message);
!     if(msg->msg_level > 10)
         Ns_DbSetException(handle, "NSDB", msg->message);
      return 0;
  }
--- 334,345 ----
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
  
!     if(handle->verbose) {
!        Ns_Log(Notice, "Db_Msg_Handler(%s:%d,%d,%s): %s",
!               handle->datasource,msg->msg_level,msg->msg_state,
!               msg->sql_state ? msg->sql_state : "0",msg->message);
!     }
!     if(msg->msg_level > 10) {
         Ns_DbSetException(handle, "NSDB", msg->message);
+     }
      return 0;
  }

[naviserver-commits] modules/nsfreetds nsfreetds.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsfreetds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18316

Modified Files:
	nsfreetds.c 
Log Message:
Updated to FreeTDS 0.64+ and fixed error handling


Index: nsfreetds.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfreetds/nsfreetds.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsfreetds.c	25 May 2005 22:13:41 -0000	1.2
--- nsfreetds.c	26 May 2005 04:09:35 -0000	1.3
***************
*** 2,6 ****
   * FreeTDS internal driver for NaviServer 4.x
   *
!  * Requires FreeTDS version 0.63+
   *
   * Vlad Seryakov vl...@cr...
--- 2,6 ----
   * FreeTDS internal driver for NaviServer 4.x
   *
!  * Requires FreeTDS version 0.64+
   *
   * Vlad Seryakov vl...@cr...
***************
*** 49,54 ****
  static int Db_SpStart(Ns_DbHandle *handle,char *procname);
  static int Db_SpExec(Ns_DbHandle *handle);
! static int Db_Msg_Handler(TDSCONTEXT *,TDSSOCKET *,TDSMESSAGE *);
! static int Db_Err_Handler(TDSCONTEXT *,TDSSOCKET *tds,TDSMESSAGE *);
  
  static Ns_DbProc freetdsProcs[] = {
--- 49,54 ----
  static int Db_SpStart(Ns_DbHandle *handle,char *procname);
  static int Db_SpExec(Ns_DbHandle *handle);
! static int Db_Msg_Handler(const TDSCONTEXT *,TDSSOCKET *,TDSMESSAGE *);
! static int Db_Err_Handler(const TDSCONTEXT *,TDSSOCKET *tds,TDSMESSAGE *);
  
  static Ns_DbProc freetdsProcs[] = {
***************
*** 115,119 ****
  
      login = tds_alloc_login();
!     context = tds_alloc_context();
      tds = tds_alloc_socket(context,512);
  
--- 115,119 ----
  
      login = tds_alloc_login();
!     context = tds_alloc_context(0);
      tds = tds_alloc_socket(context,512);
  
***************
*** 173,180 ****
  Db_Exec(Ns_DbHandle *handle, char *sql)
  {
!     int rc, done = 0;
      TDS_INT resulttype;
  
!     Db_Flush(handle);
  
      if(tds_submit_query(GET_TDS(handle),sql) != TDS_SUCCEED) {
--- 173,180 ----
  Db_Exec(Ns_DbHandle *handle, char *sql)
  {
!     int status = TDS_SUCCEED, rc = NS_DML, done = 0;
      TDS_INT resulttype;
  
!     Db_Cancel(handle);
  
      if(tds_submit_query(GET_TDS(handle),sql) != TDS_SUCCEED) {
***************
*** 182,223 ****
        return NS_ERROR;
      }
!     handle->statement = NULL;
!     handle->fetchingRows = 0;
! 
!     while(1) {
!       rc = tds_process_result_tokens(GET_TDS(handle),&resulttype,&done);
!       switch(rc) {
!        case TDS_SUCCEED:
!           if(done == TDS_DONE_ERROR || done == TDS_DONE_SRVERROR) {
!             return NS_ERROR;
!           }
!           switch(resulttype) {
!            case TDS_NO_MORE_RESULTS:
!                return NS_DML;
!            case TDS_DONE_RESULT:
!            case TDS_DONEPROC_RESULT:
!            case TDS_DONEINPROC_RESULT:
!            case TDS_ROWFMT_RESULT:
!            case TDS_ROW_RESULT:
!            case TDS_COMPUTE_RESULT:
!            default:
!                if((handle->statement = (void *)GET_TDS(handle)->res_info)) {
!                  handle->fetchingRows = 1;
!                  return NS_ROWS;
!                }
!                break;
!           }
!           break;
!        case TDS_NO_MORE_RESULTS:
!           if(done == TDS_DONE_ERROR || done == TDS_DONE_SRVERROR) {
!             return NS_ERROR;
!           }
!           return NS_DML;
!        case TDS_FAIL:
!        case TDS_ERROR:
!           return NS_ERROR;
        }
      }
!     return NS_DML;
  }
  
--- 182,210 ----
        return NS_ERROR;
      }
!     while(status == TDS_SUCCEED) {
!       status = tds_process_tokens(GET_TDS(handle),&resulttype,&done,TDS_TOKEN_RESULTS);
!       switch(resulttype) {
!        case TDS_DONE_RESULT:
!        case TDS_DONEPROC_RESULT:
!        case TDS_DONEINPROC_RESULT:
!            status = done & TDS_DONE_ERROR ? TDS_FAIL : TDS_NO_MORE_RESULTS;
!            break;
!        case TDS_ROW_RESULT:
!        case TDS_COMPUTE_RESULT:
!            handle->statement = (void *)GET_TDS(handle)->res_info;
!            if(rc != NS_ERROR && handle->statement) {
!               handle->fetchingRows = 1;
!               rc = NS_ROWS;
!               status = TDS_NO_MORE_RESULTS;
!            }
!            break;
        }
      }
!     if((status != TDS_SUCCEED && status != TDS_NO_MORE_RESULTS) || handle->dsExceptionMsg.length) {
!        handle->statement = NULL;
!        handle->fetchingRows = 1;
!        return NS_ERROR;
!     }
!     return rc;
  }
  
***************
*** 229,244 ****
      CONV_RESULT dres;
      unsigned char *src;
!     TDS_INT srclen,rowtype,computeid;
  
!     if(!handle->fetchingRows) {
!       Ns_Log(Error,"Db_GetRow(%s):  No rows waiting to fetch.",handle->datasource);
!       Ns_DbSetException(handle,"NSDB","no rows waiting to fetch.");
        return NS_ERROR;
      }
! 
!     if((rc = tds_process_row_tokens(GET_TDS(handle),&rowtype,&computeid)) != TDS_SUCCEED ||
!        GET_TDS(handle)->res_info == 0 ||
!        GET_TDS(handle)->res_info->num_cols == 0 ||
!        handle->row->size == 0) {
        handle->statement = NULL;
        handle->fetchingRows = 0;
--- 216,235 ----
      CONV_RESULT dres;
      unsigned char *src;
!     TDS_INT srclen,resulttype,computeid;
  
!     if(!handle->fetchingRows || !handle->row->size) {
!       Ns_DbSetException(handle,"NSDB","no rows waiting to fetch");
        return NS_ERROR;
      }
!     rc = tds_process_tokens(GET_TDS(handle),&resulttype,&computeid,TDS_STOPAT_ROWFMT|TDS_RETURN_DONE|TDS_RETURN_ROW|TDS_RETURN_COMPUTE);
!     if(rc != TDS_SUCCEED && rc != TDS_NO_MORE_RESULTS) {
!       Ns_Log(Error,"Db_GetRow(%s): tds_process_row_tokens: %d",handle->datasource,rc);
!       Db_Cancel(handle);
!       return NS_ERROR;
!     }
!     if(rc == TDS_NO_MORE_RESULTS || 
!        !GET_TDS(handle)->res_info ||
!        !GET_TDS(handle)->current_results ||
!        (resulttype != TDS_ROW_RESULT && resulttype != TDS_COMPUTE_RESULT)) {
        handle->statement = NULL;
        handle->fetchingRows = 0;
***************
*** 246,254 ****
      }
      for(i = 0; i < GET_TDS(handle)->res_info->num_cols; i++) {
!       if(tds_get_null(GET_TDS(handle)->res_info->current_row,i)) {
          Ns_SetPutValue(row,i,"");
          continue;
        }
-       col = GET_TDS(handle)->res_info->columns[i];
        ctype = tds_get_conversion_type(col->column_type,col->column_size);
        src = &(GET_TDS(handle)->res_info->current_row[col->column_offset]);
--- 237,245 ----
      }
      for(i = 0; i < GET_TDS(handle)->res_info->num_cols; i++) {
!       col = GET_TDS(handle)->res_info->columns[i];
!       if(col->column_cur_size < 0) {
          Ns_SetPutValue(row,i,"");
          continue;
        }
        ctype = tds_get_conversion_type(col->column_type,col->column_size);
        src = &(GET_TDS(handle)->res_info->current_row[col->column_offset]);
***************
*** 275,278 ****
--- 266,272 ----
  Db_Cancel(Ns_DbHandle *handle)
  {
+     if(handle->fetchingRows) {
+        tds_process_simple_query(GET_TDS(handle));
+     }
      tds_free_all_results(GET_TDS(handle));
      tds_send_cancel(GET_TDS(handle));
***************
*** 310,314 ****
  
  
! int Db_Err_Handler(TDSCONTEXT *ctx,TDSSOCKET *tds,TDSMESSAGE *msg)
  {
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
--- 304,308 ----
  
  
! int Db_Err_Handler(const TDSCONTEXT *ctx,TDSSOCKET *tds,TDSMESSAGE *msg)
  {
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
***************
*** 320,329 ****
  }
  
! int Db_Msg_Handler(TDSCONTEXT *ctx,TDSSOCKET *tds,TDSMESSAGE *msg)
  {
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
  
!     Ns_Log(Notice, "Db_Msg_Handler(%s:%d,%d): %s",
!            handle->datasource,msg->msg_level,msg->msg_state,msg->message);
      if(msg->msg_level > 10)
         Ns_DbSetException(handle, "NSDB", msg->message);
--- 314,324 ----
  }
  
! int Db_Msg_Handler(const TDSCONTEXT *ctx,TDSSOCKET *tds,TDSMESSAGE *msg)
  {
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
  
!     Ns_Log(Notice, "Db_Msg_Handler(%s:%d,%d,%s): %s",
!            handle->datasource,msg->msg_level,msg->msg_state,
!            msg->sql_state ? msg->sql_state : "0",msg->message);
      if(msg->msg_level > 10)
         Ns_DbSetException(handle, "NSDB", msg->message);

[naviserver-commits] modules/nsfreetds nsfreetds.c,1.1.1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsfreetds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20647

Modified Files:
	nsfreetds.c 
Log Message:
new FreeTDS 0.63 error handling needs setting DB exception inside the message handler, 
because FreeTDS does not return error condition


Index: nsfreetds.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfreetds/nsfreetds.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nsfreetds.c	24 May 2005 17:52:01 -0000	1.1.1.1
--- nsfreetds.c	25 May 2005 22:13:41 -0000	1.2
***************
*** 324,328 ****
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
  
!     Ns_Log(Notice, "Db_Msg_Handler(%s): %s",handle->datasource,msg->message);
      return 0;
  }
--- 324,331 ----
      Ns_DbHandle *handle = (Ns_DbHandle *)tds->parent;
  
!     Ns_Log(Notice, "Db_Msg_Handler(%s:%d,%d): %s",
!            handle->datasource,msg->msg_level,msg->msg_state,msg->message);
!     if(msg->msg_level > 10)
!        Ns_DbSetException(handle, "NSDB", msg->message);
      return 0;
  }

[naviserver-commits] naviserver ChangeLog,1.79,1.80

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25332

Modified Files:
	ChangeLog 
Log Message:
See fileCVS: ----------------------------------------------------------------------


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** ChangeLog	20 May 2005 20:30:15 -0000	1.79
--- ChangeLog	21 May 2005 14:18:36 -0000	1.80
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-05-21  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/driver.c: fixed coredump in NsStartDrivers() if the driver
+ 	does not have the bindaddr defined (i.e. it is NULL).
+ 
  2005-05-20  Vlad Seryakov  <ser...@us...>
  

[naviserver-commits] naviserver/nsd driver.c,1.6,1.7

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24628

Modified Files:
	driver.c 
Log Message:
Fixed coredump in NsStartDrivers() which happened if the driver does
not have bindaddr set (i.e. it is NULL).


Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** driver.c	20 May 2005 20:53:54 -0000	1.6
--- driver.c	21 May 2005 14:17:05 -0000	1.7
***************
*** 434,458 ****
      drvPtr = firstDrvPtr;
      while (drvPtr != NULL) {
!         if (drvPtr->bindaddr[0] == '/') {
              drvPtr->opts |= NS_DRIVER_UNIX;
          }
          if (drvPtr->opts & NS_DRIVER_UDP) {
              drvPtr->sock = Ns_SockListenUdp(drvPtr->bindaddr, drvPtr->port);
!         } else
!         if (drvPtr->opts & NS_DRIVER_UNIX) {
              drvPtr->sock = Ns_SockListenUnix(drvPtr->bindaddr);
          } else {
!             drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port, drvPtr->backlog);
          }
! 	if (drvPtr->sock == INVALID_SOCKET) {
! 	    Ns_Log(Error, "%s: failed to listen on %s:%d: %s",
! 		drvPtr->name, drvPtr->address, drvPtr->port,
! 		ns_sockstrerror(ns_sockerrno));
! 	} else {
      	    Ns_SockSetNonBlocking(drvPtr->sock);
      	    Ns_Log(Notice, "%s: listening on %s:%d",
! 		drvPtr->name, drvPtr->address, drvPtr->port);
! 	}
! 	drvPtr = drvPtr->nextPtr;
      }
  
--- 434,458 ----
      drvPtr = firstDrvPtr;
      while (drvPtr != NULL) {
!         if (drvPtr->bindaddr && drvPtr->bindaddr[0] == '/') {
              drvPtr->opts |= NS_DRIVER_UNIX;
          }
          if (drvPtr->opts & NS_DRIVER_UDP) {
              drvPtr->sock = Ns_SockListenUdp(drvPtr->bindaddr, drvPtr->port);
!         } else if (drvPtr->opts & NS_DRIVER_UNIX) {
              drvPtr->sock = Ns_SockListenUnix(drvPtr->bindaddr);
          } else {
!             drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port,
!                                            drvPtr->backlog);
          }
!         if (drvPtr->sock == INVALID_SOCKET) {
!             Ns_Log(Error, "%s: failed to listen on %s:%d: %s",
!                    drvPtr->name, drvPtr->address, drvPtr->port,
!                    ns_sockstrerror(ns_sockerrno));
!         } else {
      	    Ns_SockSetNonBlocking(drvPtr->sock);
      	    Ns_Log(Notice, "%s: listening on %s:%d",
!                    drvPtr->name, drvPtr->address, drvPtr->port);
!         }
!         drvPtr = drvPtr->nextPtr;
      }