httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: httpd-2.0 README LICENSE
Date Wed, 20 Mar 2002 23:28:05 GMT
fielding    02/03/20 15:28:05

  Modified:    .        README LICENSE
  Log:
  Update license description for PCRE inclusion
  
  Revision  Changes    Path
  1.11      +3 -3      httpd-2.0/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/README,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- README	26 Nov 2001 22:46:32 -0000	1.10
  +++ README	20 Mar 2002 23:28:05 -0000	1.11
  @@ -80,9 +80,9 @@
     modifications by Spyglass Inc., Carnegie Mellon University, and
     Bell Communications Research, Inc (Bellcore).
   
  -  Regular expression support is provided by the PCRE library package,
  -  which is open source software, copyright by the University of Cambridge
  -  and authored by Philip Hazel.  The original software is available from
  +  Regular expression support is provided by the PCRE library package, which
  +  is open source software, written by Philip Hazel, and copyright by the
  +  University of Cambridge, England.  The original software is available from
        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
   
     Apache 2.0 relies heavily on the use of autoconf and libtool to provide
  
  
  
  1.7       +21 -13    httpd-2.0/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/LICENSE,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LICENSE	13 Mar 2002 20:47:39 -0000	1.6
  +++ LICENSE	20 Mar 2002 23:28:05 -0000	1.7
  @@ -425,15 +425,18 @@
   
   For the pcre component:
   
  -/*
   PCRE LICENCE
   ------------
  +
   PCRE is a library of functions to support regular expressions whose syntax
   and semantics are as close as possible to those of the Perl 5 language.
  +
   Written by: Philip Hazel <ph10@cam.ac.uk>
  +
   University of Cambridge Computing Service,
   Cambridge, England. Phone: +44 1223 334714.
  -Copyright (c) 1997-2000 University of Cambridge
  +
  +Copyright (c) 1997-2001 University of Cambridge
   
   Permission is granted to anyone to use this software for any purpose on any
   computer system, and to redistribute it freely, subject to the following
  @@ -444,29 +447,34 @@
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   
   2. The origin of this software must not be misrepresented, either by
  -   explicit claim or by omission. In practice, this means you must put
  -   a sentence like this
  +   explicit claim or by omission. In practice, this means that if you use
  +   PCRE in software which you distribute to others, commercially or
  +   otherwise, you must put a sentence like this
   
        Regular expression support is provided by the PCRE library package,
  -     which is open source software, copyright by the University of
  -     Cambridge.
  +     which is open source software, written by Philip Hazel, and copyright
  +     by the University of Cambridge, England.
   
      somewhere reasonably visible in your documentation and in any relevant
  -   files. A reference to the ftp site for the source should also be given
  +   files or online help data or similar. A reference to the ftp site for
  +   the source, that is, to
  +
  +     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
   
  -   ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
  -   in the documentation.
  +   should also be given in the documentation.
   
   3. Altered versions must be plainly marked as such, and must not be
      misrepresented as being the original software.
   
   4. If PCRE is embedded in any software that is released under the GNU
  -   General Purpose Licence (GPL), then the terms of that licence shall
  -   supersede any condition above with which it is incompatible.
  +   General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
  +   then the terms of that licence shall supersede any condition above with
  +   which it is incompatible.
   
  -End
  -*/
  +The documentation for PCRE, supplied in the "doc" directory, is distributed
  +under the same terms as the software itself.
   
  +End PCRE LICENCE
   
   
   For the test\zb.c component:
  
  
  

Mime
View raw message