diff options
-rw-r--r-- | AUTHORS | 6 | ||||
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | LICENCE | 6 | ||||
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | README | 9 | ||||
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | doc/html/README.txt | 9 | ||||
-rw-r--r-- | doc/html/index.html | 14 | ||||
-rw-r--r-- | doc/html/pcretest.html | 18 | ||||
-rw-r--r-- | doc/pcre.txt | 76 | ||||
-rw-r--r-- | doc/pcretest.1 | 22 | ||||
-rw-r--r-- | pcre_compile.c | 4 | ||||
-rw-r--r-- | pcrecpp.cc | 2 |
13 files changed, 101 insertions, 93 deletions
@@ -8,7 +8,7 @@ Email domain: cam.ac.uk University of Cambridge Computing Service, Cambridge, England. -Copyright (c) 1997-2019 University of Cambridge +Copyright (c) 1997-2020 University of Cambridge All rights reserved @@ -19,7 +19,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Emain domain: freemail.hu -Copyright(c) 2010-2019 Zoltan Herczeg +Copyright(c) 2010-2020 Zoltan Herczeg All rights reserved. @@ -30,7 +30,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Emain domain: freemail.hu -Copyright(c) 2009-2019 Zoltan Herczeg +Copyright(c) 2009-2020 Zoltan Herczeg All rights reserved. @@ -5,8 +5,8 @@ Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All development is happening in the PCRE2 10.xx series. -Version 8.44-RC1 01 March-2019 ------------------------------- +Version 8.44 12 February-2020 +----------------------------- 1. Setting --enable-jit=auto for an out-of-tree build failed because the source directory wasn't in the search path for AC_TRY_COMPILE always. Patch @@ -27,10 +27,10 @@ added. after a successful compile, instead of at the start of matching to avoid a sanitizer complaint (regexec is supposed to be thread safe). -6. Check the size of the number after (?C as it is read, in order to avoid +6. Check the size of the number after (?C as it is read, in order to avoid integer overflow. -7. Tidy up left shifts to avoid sanitize warnings; also fix one NULL deference +7. Tidy up left shifts to avoid sanitize warnings; also fix one NULL deference in pcretest. @@ -25,7 +25,7 @@ Email domain: cam.ac.uk University of Cambridge Computing Service, Cambridge, England. -Copyright (c) 1997-2019 University of Cambridge +Copyright (c) 1997-2020 University of Cambridge All rights reserved. @@ -36,7 +36,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Email domain: freemail.hu -Copyright(c) 2010-2019 Zoltan Herczeg +Copyright(c) 2010-2020 Zoltan Herczeg All rights reserved. @@ -47,7 +47,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Email domain: freemail.hu -Copyright(c) 2009-2019 Zoltan Herczeg +Copyright(c) 2009-2020 Zoltan Herczeg All rights reserved. @@ -5,6 +5,12 @@ Note that this library (now called PCRE1) is now being maintained for bug fixes only. New projects are advised to use the new PCRE2 libraries. +Release 8.44 12-February-2020 +----------------------------- + +This is a bug-fix release. + + Release 8.43 23-February-2019 ----------------------------- @@ -13,9 +13,10 @@ libraries. The latest release of PCRE1 is always available in three alternative formats from: - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.gz - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.bz2 - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.zip + https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.gz + https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.bz2 + https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.zip + There is a mailing list for discussion about the development of PCRE at pcre-dev@exim.org. You can access the archives and subscribe or manage your @@ -999,4 +1000,4 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx. Philip Hazel Email local part: ph10 Email domain: cam.ac.uk -Last updated: 10 February 2015 +Last updated: 12 February 2020 diff --git a/configure.ac b/configure.ac index 8a82cf1..6a3e5f3 100644 --- a/configure.ac +++ b/configure.ac @@ -10,18 +10,18 @@ dnl be defined as -RC2, for example. For real releases, it should be empty. m4_define(pcre_major, [8]) m4_define(pcre_minor, [44]) -m4_define(pcre_prerelease, [-RC1]) -m4_define(pcre_date, [2019-03-01]) +m4_define(pcre_prerelease, []) +m4_define(pcre_date, [2020-02-12]) # NOTE: The CMakeLists.txt file searches for the above variables in the first # 50 lines of this file. Please update that if the variables above are moved. # Libtool shared library interface versions (current:revision:age) -m4_define(libpcre_version, [3:11:2]) -m4_define(libpcre16_version, [2:11:2]) -m4_define(libpcre32_version, [0:11:0]) -m4_define(libpcreposix_version, [0:6:0]) -m4_define(libpcrecpp_version, [0:1:0]) +m4_define(libpcre_version, [3:12:2]) +m4_define(libpcre16_version, [2:12:2]) +m4_define(libpcre32_version, [0:12:0]) +m4_define(libpcreposix_version, [0:7:0]) +m4_define(libpcrecpp_version, [0:2:0]) AC_PREREQ(2.57) AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre) diff --git a/doc/html/README.txt b/doc/html/README.txt index 4887ebf..334362b 100644 --- a/doc/html/README.txt +++ b/doc/html/README.txt @@ -13,9 +13,10 @@ libraries. The latest release of PCRE1 is always available in three alternative formats from: - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.gz - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.bz2 - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.zip + https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.gz + https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.bz2 + https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.zip + There is a mailing list for discussion about the development of PCRE at pcre-dev@exim.org. You can access the archives and subscribe or manage your @@ -999,4 +1000,4 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx. Philip Hazel Email local part: ph10 Email domain: cam.ac.uk -Last updated: 10 February 2015 +Last updated: 12 February 2020 diff --git a/doc/html/index.html b/doc/html/index.html index 887f4d7..352c55d 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ <html> -<!-- This is a manually maintained file that is the root of the HTML version of - the PCRE documentation. When the HTML documents are built from the man - page versions, the entire doc/html directory is emptied, this file is then - copied into doc/html/index.html, and the remaining files therein are +<!-- This is a manually maintained file that is the root of the HTML version of + the PCRE documentation. When the HTML documents are built from the man + page versions, the entire doc/html directory is emptied, this file is then + copied into doc/html/index.html, and the remaining files therein are created by the 132html script. ---> +--> <head> <title>PCRE specification</title> </head> @@ -96,7 +96,7 @@ in the library. There is a single page for each triple of 8-bit/16-bit/32-bit functions. </p> -<table> +<table> <tr><td><a href="pcre_assign_jit_stack.html">pcre_assign_jit_stack</a></td> <td> Assign stack for JIT matching</td></tr> @@ -162,7 +162,7 @@ functions. <tr><td><a href="pcre_maketables.html">pcre_maketables</a></td> <td> Build character tables in current locale</td></tr> - + <tr><td><a href="pcre_pattern_to_host_byte_order.html">pcre_pattern_to_host_byte_order</a></td> <td> Convert compiled pattern to host byte order if necessary</td></tr> diff --git a/doc/html/pcretest.html b/doc/html/pcretest.html index ea5d1f3..842ff3c 100644 --- a/doc/html/pcretest.html +++ b/doc/html/pcretest.html @@ -98,22 +98,22 @@ the 16-bit library, or <b>pcre32_xx</b> when using the 32-bit library". </P> <br><a name="SEC4" href="#TOC1">COMMAND LINE OPTIONS</a><br> <P> -<b>-8</b> +<b>-8</b> If the 8-bit library has been built, this option causes it to be used (this is -the default). If the 8-bit library has not been built, this option causes an -error. +the default). If the 8-bit library has not been built, this option causes an +error. </P> <P> -<b>-16</b> +<b>-16</b> If the 16-bit library has been built, this option causes it to be used. If only -the 16-bit library has been built, this is the default. If the 16-bit library -has not been built, this option causes an error. +the 16-bit library has been built, this is the default. If the 16-bit library +has not been built, this option causes an error. </P> <P> -<b>-32</b> +<b>-32</b> If the 32-bit library has been built, this option causes it to be used. If only -the 32-bit library has been built, this is the default. If the 32-bit library -has not been built, this option causes an error. +the 32-bit library has been built, this is the default. If the 32-bit library +has not been built, this option causes an error. </P> <P> <b>-b</b> diff --git a/doc/pcre.txt b/doc/pcre.txt index a01d709..8ffc902 100644 --- a/doc/pcre.txt +++ b/doc/pcre.txt @@ -193,8 +193,8 @@ REVISION Last updated: 10 February 2015 Copyright (c) 1997-2015 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRE(3) Library Functions Manual PCRE(3) @@ -525,8 +525,8 @@ REVISION Last updated: 12 May 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRE(3) Library Functions Manual PCRE(3) @@ -853,8 +853,8 @@ REVISION Last updated: 12 May 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREBUILD(3) Library Functions Manual PCREBUILD(3) @@ -1356,8 +1356,8 @@ REVISION Last updated: 12 May 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREMATCHING(3) Library Functions Manual PCREMATCHING(3) @@ -1574,8 +1574,8 @@ REVISION Last updated: 12 November 2013 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREAPI(3) Library Functions Manual PCREAPI(3) @@ -4275,8 +4275,8 @@ REVISION Last updated: 18 December 2015 Copyright (c) 1997-2015 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRECALLOUT(3) Library Functions Manual PCRECALLOUT(3) @@ -4525,8 +4525,8 @@ REVISION Last updated: 12 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRECOMPAT(3) Library Functions Manual PCRECOMPAT(3) @@ -4720,8 +4720,8 @@ REVISION Last updated: 10 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPATTERN(3) Library Functions Manual PCREPATTERN(3) @@ -7670,8 +7670,8 @@ REVISION Last updated: 23 October 2016 Copyright (c) 1997-2016 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRESYNTAX(3) Library Functions Manual PCRESYNTAX(3) @@ -8076,8 +8076,8 @@ REVISION Last updated: 08 January 2014 Copyright (c) 1997-2014 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREUNICODE(3) Library Functions Manual PCREUNICODE(3) @@ -8295,8 +8295,8 @@ REVISION Last updated: 27 February 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREJIT(3) Library Functions Manual PCREJIT(3) @@ -8750,8 +8750,8 @@ REVISION Last updated: 05 July 2017 Copyright (c) 1997-2017 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPARTIAL(3) Library Functions Manual PCREPARTIAL(3) @@ -9235,8 +9235,8 @@ REVISION Last updated: 02 July 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPRECOMPILE(3) Library Functions Manual PCREPRECOMPILE(3) @@ -9374,8 +9374,8 @@ REVISION Last updated: 12 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPERFORM(3) Library Functions Manual PCREPERFORM(3) @@ -9544,8 +9544,8 @@ REVISION Last updated: 25 August 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPOSIX(3) Library Functions Manual PCREPOSIX(3) @@ -9808,8 +9808,8 @@ REVISION Last updated: 09 January 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRECPP(3) Library Functions Manual PCRECPP(3) @@ -10151,8 +10151,8 @@ REVISION Last updated: 08 January 2012 ------------------------------------------------------------------------------ - - + + PCRESAMPLE(3) Library Functions Manual PCRESAMPLE(3) @@ -10305,8 +10305,8 @@ REVISION Last updated: 05 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRESTACK(3) Library Functions Manual PCRESTACK(3) @@ -10491,5 +10491,5 @@ REVISION Last updated: 24 June 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + diff --git a/doc/pcretest.1 b/doc/pcretest.1 index adfdef2..fec964d 100644 --- a/doc/pcretest.1 +++ b/doc/pcretest.1 @@ -77,20 +77,20 @@ the 16-bit library, or \fBpcre32_xx\fP when using the 32-bit library". .SH "COMMAND LINE OPTIONS" .rs .TP 10 -\fB-8\fP +\fB-8\fP If the 8-bit library has been built, this option causes it to be used (this is -the default). If the 8-bit library has not been built, this option causes an -error. -.TP 10 -\fB-16\fP +the default). If the 8-bit library has not been built, this option causes an +error. +.TP 10 +\fB-16\fP If the 16-bit library has been built, this option causes it to be used. If only -the 16-bit library has been built, this is the default. If the 16-bit library -has not been built, this option causes an error. -.TP 10 -\fB-32\fP +the 16-bit library has been built, this is the default. If the 16-bit library +has not been built, this option causes an error. +.TP 10 +\fB-32\fP If the 32-bit library has been built, this option causes it to be used. If only -the 32-bit library has been built, this is the default. If the 32-bit library -has not been built, this option causes an error. +the 32-bit library has been built, this is the default. If the 32-bit library +has not been built, this option causes an error. .TP 10 \fB-b\fP Behave as if each pattern has the \fB/B\fP (show byte code) modifier; the diff --git a/pcre_compile.c b/pcre_compile.c index 32e5b91..3be0fbf 100644 --- a/pcre_compile.c +++ b/pcre_compile.c @@ -7130,14 +7130,14 @@ for (;; ptr++) int n = 0; ptr++; while(IS_DIGIT(*ptr)) - { + { n = n * 10 + *ptr++ - CHAR_0; if (n > 255) { *errorcodeptr = ERR38; goto FAILED; } - } + } if (*ptr != CHAR_RIGHT_PARENTHESIS) { *errorcodeptr = ERR39; @@ -92,7 +92,7 @@ static const char *start_options[] = { "(*LIMIT_RECURSION=", "(*LIMIT_MATCH=", "(*CRLF)", - "(*LF)", + "(*LF)", "(*CR)", "(*BSR_UNICODE)", "(*BSR_ANYCRLF)", |