VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch]

Browse Source 
and correct LICENSE/NOTICE to match.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824973 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2018-02-21 14:56:01 +00:00
parent 7c6effa44e
commit d771a84dbf
4 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
LICENSE
View File

@ -322,6 +322,40 @@ For the server\util_md5.c component:
* 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.

4
NOTICE
View File

@ -12,3 +12,7 @@ This software contains code derived from the RSA Data Security
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.

7
include/ap_regex.h
View File

@ -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 <ph10@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

33
server/util_pcre.c
View File

@ -1,16 +1,25 @@
/*************************************************
* 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 module is a wrapper that provides a POSIX API to the underlying PCRE
functions.
Written by: Philip Hazel <ph10@cam.ac.uk>
/* This code is based on pcreposix.c from the PCRE Library distribution,
* as originally written by Philip Hazel <ph10@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;
Copyright (c) 1997-2004 University of Cambridge