I made a fundamental mistake as we removed PCRE from
the source tree of httpd; although we stopped distributing the
pcre library in 2.4.x source tree, our own util_pcre.c is largely
founded on the work of Philip Hazel/Cambridge; although the
larger work doesn't need to be advertised in our LICENSE and
NOTICE (except in the case of binaries derived from those
sources, which is up to the packager/builder), the origin of this
specific source file remains largely based on pcreposix.c.
We can later ask for a relicensing by the PCRE effort, or we
may agree to license that entire file, including our corrections
and enhancements back under this compatible license. Since
it is largely pcre's own license, I would like to keep them in
harmony but not keep this file under a bifurcated license.
I ran into the same headache with my complete rewrite of
the fnmatch.c logic of BSD that we ship in APR, and delivered
my rewrite of the file under both licenses.
I have the attached proposal to correct this in trunk for any
immediate release on the 2.4.x branch, and would open a
dialog with Philip and Cambridge over their preferred manner
of handling this file. Cambridge may already have a statement
on simplifying the advertising aspects, much like MIT.
Any objections?
Index: LICENSE
===================================================================
--- LICENSE (revision 1824908)
+++ LICENSE (working copy)
@@ -322,6 +322,40 @@
* WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
*/
+
+For the util_pcre.c and ap_regex.h components:
+
+ Copyright (c) 1997-2004 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of the University of Cambridge nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+
+
For the srclib\apr\include\apr_md5.h component:
/*
* This is work is derived from material Copyright RSA Data Security, Inc.
Index: NOTICE
===================================================================
--- NOTICE (revision 1824908)
+++ NOTICE (working copy)
@@ -12,3 +12,7 @@
Inc. MD5 Message-Digest Algorithm, including various
modifications by Spyglass Inc., Carnegie Mellon University, and
Bell Communications Research, Inc (Bellcore).
+
+This software contains code derived from the PCRE library pcreposix.c
+source code, written by Philip Hazel, Copyright 1997-2004
+by the University of Cambridge, England.
Index: include/ap_regex.h
===================================================================
--- include/ap_regex.h (revision 1824908)
+++ include/ap_regex.h (working copy)
@@ -14,7 +14,12 @@
* limitations under the License.
*/
-/* Derived from PCRE's pcreposix.h.
+/* This code is based on pcreposix.h from the PCRE Library distribution,
+ * as originally written by Philip Hazel <p...@cam.ac.uk>, and forked by
+ * the Apache HTTP Server project to provide POSIX-style regex function
+ * wrappers around underlying PCRE library functions for httpd.
+ *
+ * The original source file pcreposix.h is copyright and licensed as follows;
Copyright (c) 1997-2004 University of Cambridge
Index: server/util_pcre.c
===================================================================
--- server/util_pcre.c (revision 1824908)
+++ server/util_pcre.c (working copy)
@@ -1,17 +1,26 @@
-/*************************************************
- * Perl-Compatible Regular Expressions *
- *************************************************/
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
-/*
-This 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. See
-the file Tech.Notes for some information on the internals.
+/* This code is based on pcreposix.c from the PCRE Library distribution,
+ * as originally written by Philip Hazel <p...@cam.ac.uk>, and forked by
+ * the Apache HTTP Server project to provide POSIX-style regex function
+ * wrappers around underlying PCRE library functions for httpd.
+ *
+ * The original source file pcreposix.c is copyright and licensed as follows;
-This module is a wrapper that provides a POSIX API to the underlying PCRE
-functions.
-
-Written by: Philip Hazel <p...@cam.ac.uk>
-
Copyright (c) 1997-2004 University of Cambridge
-----------------------------------------------------------------------------
