aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-09-06 15:33:16 +0200
committerRickard Green <[email protected]>2018-09-06 15:33:16 +0200
commitd4d6ed058530e5db26782dea4a0fd62c2d1098c4 (patch)
tree3959e2acd0940d4ab2b48019a94aa7881c755fda /system
parentdb0ebbb8e7eb02b78bce9e87ab67ae15d6d65ff3 (diff)
parent384e8b3b36c6c8ced0778cab9e1569ed0b55e09a (diff)
downloadotp-d4d6ed058530e5db26782dea4a0fd62c2d1098c4.tar.gz
otp-d4d6ed058530e5db26782dea4a0fd62c2d1098c4.tar.bz2
otp-d4d6ed058530e5db26782dea4a0fd62c2d1098c4.zip
Merge branch 'rickard/pcre-8.42/OTP-15217' into maint
* rickard/pcre-8.42/OTP-15217: Update PCRE from version 8.41 to version 8.42
Diffstat (limited to 'system')
-rw-r--r--system/COPYRIGHT35
1 files changed, 30 insertions, 5 deletions
diff --git a/system/COPYRIGHT b/system/COPYRIGHT
index 5d47e0ca38..ff5cc30793 100644
--- a/system/COPYRIGHT
+++ b/system/COPYRIGHT
@@ -41,12 +41,15 @@ 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.
-Release 7 of PCRE is distributed under the terms of the "BSD" licence, as
+Release 8 of PCRE is distributed under the terms of the "BSD" licence, as
specified below. The documentation for PCRE, supplied in the "doc"
-directory, is distributed under the same terms as the software itself.
+directory, is distributed under the same terms as the software itself. The data
+in the testdata directory is not copyrighted and is in the public domain.
The basic library functions are written in C and are freestanding. Also
-included in the distribution is a set of C++ wrapper functions.
+included in the distribution is a set of C++ wrapper functions, and a
+just-in-time compiler that can be used to optimize pattern matching. These
+are both optional features that can be omitted when the library is built.
THE BASIC LIBRARY FUNCTIONS
@@ -59,7 +62,29 @@ Email domain: cam.ac.uk
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2008 University of Cambridge
+Copyright (c) 1997-2018 University of Cambridge
+All rights reserved.
+
+
+PCRE JUST-IN-TIME COMPILATION SUPPORT
+-------------------------------------
+
+Written by: Zoltan Herczeg
+Email local part: hzmester
+Emain domain: freemail.hu
+
+Copyright(c) 2010-2018 Zoltan Herczeg
+All rights reserved.
+
+
+STACK-LESS JUST-IN-TIME COMPILER
+--------------------------------
+
+Written by: Zoltan Herczeg
+Email local part: hzmester
+Emain domain: freemail.hu
+
+Copyright(c) 2009-2018 Zoltan Herczeg
All rights reserved.
@@ -68,7 +93,7 @@ THE C++ WRAPPER FUNCTIONS
Contributed by: Google Inc.
-Copyright (c) 2007-2008, Google Inc.
+Copyright (c) 2007-2012, Google Inc.
All rights reserved.