summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--configure.ac4
-rw-r--r--doc/html/NON-AUTOTOOLS-BUILD.txt10
-rwxr-xr-xmaint/ManyConfigTests4
-rw-r--r--src/config.h.generic6
-rw-r--r--src/pcre2.h.generic4
-rw-r--r--src/pcre2_compile.c2
8 files changed, 18 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index f6d92ee..196e953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -170,12 +170,12 @@ was achieved on certain patterns.
44. The EBCDIC character 0x41 is a non-breaking space, equivalent to 0xa0 in
ASCII/Unicode. This has now been added to the list of characters that are
recognized as white space in EBCDIC.
-
+
45. When PCRE2 was compiled without Unicode support, the use of \p and \P gave
an error (correctly) when used outside a class, but did not give an error
within a class.
-46. \h within a class was incorrectly compiled in EBCDIC environments.
+46. \h within a class was incorrectly compiled in EBCDIC environments.
47. JIT should return with error when the compiled pattern requires
more stack space than the maximum.
diff --git a/NEWS b/NEWS
index c1c4cd0..84f0513 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
News about PCRE2 releases
-------------------------
-Version 10.20 16-June-2015
+Version 10.20 30-June-2015
--------------------------
1. Callouts with string arguments and the pcre2_callout_enumerate() function
diff --git a/configure.ac b/configure.ac
index 1b374ec..20f3937 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, [20])
-m4_define(pcre2_prerelease, [-RC1])
-m4_define(pcre2_date, [2015-06-16])
+m4_define(pcre2_prerelease, [])
+m4_define(pcre2_date, [2015-06-30])
# 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/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index 2c2162e..d8d9d2b 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -380,12 +380,12 @@ required. For details, please see this web site:
http://www.zaconsultants.net
-There is also a mirror here:
-
- http://www.vsoft-software.com/downloads.html
-
The site currently has ports for PCRE1 releases, but PCRE2 should follow in due
course.
+You may also download PCRE1 from WWW.CBTTAPE.ORG, file 882. Everything, source
+and executable, is in EBCDIC and native z/OS file formats and this is the
+recommended download site.
+
=============================
-Last Updated: 25 February 2015
+Last Updated: 15 June 2015
diff --git a/maint/ManyConfigTests b/maint/ManyConfigTests
index e38aa83..1830baa 100755
--- a/maint/ManyConfigTests
+++ b/maint/ManyConfigTests
@@ -238,8 +238,8 @@ if [ $ISGCC -ne 0 -a $usemain -ne 0 ]; then
runtest
fi
if [ $useusan -ne 0 ]; then
- echo "------- Maximally configured test with -fsanitize=undefined -fno-sanitize=shift -std=gnu99 -------"
- CFLAGS="$OFLAGS $SAVECFLAGS -fsanitize=undefined -fno-sanitize=shift -std=gnu99"
+ echo "------- Maximally configured test with -fsanitize=undefined -fno-sanitize=shift -fno-sanitize=alignment -std=gnu99 -------"
+ CFLAGS="$OFLAGS $SAVECFLAGS -fsanitize=undefined -fno-sanitize=shift -fno-sanitize=alignment -std=gnu99"
echo "CFLAGS=$CFLAGS"
opts="--disable-shared $enable_jit --disable-stack-for-recursion --enable-pcre2-16 --enable-pcre2-32"
runtest
diff --git a/src/config.h.generic b/src/config.h.generic
index 9b709df..0f9da50 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -200,7 +200,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.20-RC1"
+#define PACKAGE_STRING "PCRE2 10.20"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2"
@@ -209,7 +209,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.20-RC1"
+#define PACKAGE_VERSION "10.20"
/* 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
@@ -290,7 +290,7 @@ sure both macros are undefined; an emulation function will then be used. */
/* #undef SUPPORT_VALGRIND */
/* Version number of package */
-#define VERSION "10.20-RC1"
+#define VERSION "10.20"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index f91e8df..3e97fb8 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 20
-#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2015-06-16
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2015-06-30
/* 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_compile.c b/src/pcre2_compile.c
index fe81089..4a9e42e 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -4415,7 +4415,7 @@ for (;; ptr++)
break;
#else
*errorcodeptr = ERR45;
- goto FAILED;
+ goto FAILED;
#endif
/* Unrecognized escapes are faulted. */