summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--NEWS4
-rw-r--r--configure.ac4
-rw-r--r--src/config.h.generic6
-rw-r--r--src/pcre2.h4
-rw-r--r--src/pcre2.h.generic4
6 files changed, 21 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 103c39b..7f520bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@ Change Log for PCRE2
--------------------
-Version 10.31 13-January-2018
------------------------------
+Version 10.31 12-February-2018
+------------------------------
1. Fix typo (missing ]) in VMS code in pcre2test.c.
@@ -42,7 +42,7 @@ full path file names, which may be up to 2047 characters long.
12. When an assertion contained (*ACCEPT) it caused all open capturing groups
to be closed (as for a non-assertion ACCEPT), which was wrong and could lead to
misbehaviour for subsequent references to groups that started outside the
-recursion. ACCEPT in an assertion now closes only those groups that were
+assertion. ACCEPT in an assertion now closes only those groups that were
started within that assertion. Fixes oss-fuzz issues 3852 and 3891.
13. Multiline matching in pcre2grep was misbehaving if the pattern matched
@@ -129,18 +129,18 @@ call with zero length.
element. Their actual memory is obtained dynamically, giving an ovector of
appropriate length. However, they are defined in the structure as
ovector[NUMBER], where NUMBER is large so that array bound checkers don't
-grumble. The value of NUMBER was 10000, but a fuzzer exceeded 5000 capturing
-groups, making the ovector larger than this. The number has been increased to
-131072, which allows for the maximum number of captures (65535) plus the
+grumble. The value of NUMBER was 10000, but a fuzzer exceeded 5000 capturing
+groups, making the ovector larger than this. The number has been increased to
+131072, which allows for the maximum number of captures (65535) plus the
overall match. This fixes oss-fuzz issue 5415.
-31. Auto-possessification at the end of a capturing group was dependent on what
-follows the group (e.g. /(a+)b/ would auto-possessify the a+) but this caused
-incorrect behaviour when the group was called recursively from elsewhere in the
+31. Auto-possessification at the end of a capturing group was dependent on what
+follows the group (e.g. /(a+)b/ would auto-possessify the a+) but this caused
+incorrect behaviour when the group was called recursively from elsewhere in the
pattern where something different might follow. This bug is an unforseen
consequence of change #1 for 10.30 - the implementation of backtracking into
recursions. Iterators at the ends of capturing groups are no longer considered
-for auto-possessification if the pattern contains any recursions. Fixes
+for auto-possessification if the pattern contains any recursions. Fixes
Bugzilla #2232.
diff --git a/NEWS b/NEWS
index 5372049..0093eb7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
News about PCRE2 releases
-------------------------
-Version 10.31 13-January-2018
------------------------------
+Version 10.31 12-February-2018
+------------------------------
This is mainly a bugfix and tidying release (see ChangeLog for full details).
However, there are some minor enhancements.
diff --git a/configure.ac b/configure.ac
index 6c6442a..2164e4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [31])
-m4_define(pcre2_prerelease, [-RC1])
-m4_define(pcre2_date, [2018-01-11])
+m4_define(pcre2_prerelease, [])
+m4_define(pcre2_date, [2018-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.
diff --git a/src/config.h.generic b/src/config.h.generic
index 56a59a6..f738616 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -210,7 +210,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_NAME "PCRE2"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.31-RC1"
+#define PACKAGE_STRING "PCRE2 10.31"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2"
@@ -219,7 +219,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "10.31-RC1"
+#define PACKAGE_VERSION "10.31"
/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
parentheses (of any kind) in a pattern. This limits the amount of system
@@ -339,7 +339,7 @@ sure both macros are undefined; an emulation function will then be used. */
#endif
/* Version number of package */
-#define VERSION "10.31-RC1"
+#define VERSION "10.31"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
diff --git a/src/pcre2.h b/src/pcre2.h
index d147364..fffcc30 100644
--- a/src/pcre2.h
+++ b/src/pcre2.h
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 31
-#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2018-01-11
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2018-02-12
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index d147364..fffcc30 100644
--- a/src/pcre2.h.generic
+++ b/src/pcre2.h.generic
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 31
-#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2018-01-11
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2018-02-12
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate