Author: rjung
Date: Tue Nov 21 14:37:37 2017
New Revision: 1815927
URL: http://svn.apache.org/viewvc?rev=1815927&view=rev
Log:
Update PCRE bundled with ISAPI redirector to
version 8.41.
Modified:
tomcat/jk/trunk/native/iis/pcre/AUTHORS
tomcat/jk/trunk/native/iis/pcre/CMakeLists.txt
tomcat/jk/trunk/native/iis/pcre/ChangeLog
tomcat/jk/trunk/native/iis/pcre/LICENCE
tomcat/jk/trunk/native/iis/pcre/Makefile.in
tomcat/jk/trunk/native/iis/pcre/NEWS
tomcat/jk/trunk/native/iis/pcre/aclocal.m4
tomcat/jk/trunk/native/iis/pcre/config.h.generic
tomcat/jk/trunk/native/iis/pcre/config.hw
tomcat/jk/trunk/native/iis/pcre/configure
tomcat/jk/trunk/native/iis/pcre/configure.ac
tomcat/jk/trunk/native/iis/pcre/doc/html/pcrecompat.html
tomcat/jk/trunk/native/iis/pcre/doc/html/pcrejit.html
tomcat/jk/trunk/native/iis/pcre/doc/html/pcrepattern.html
tomcat/jk/trunk/native/iis/pcre/doc/html/pcretest.html
tomcat/jk/trunk/native/iis/pcre/doc/pcre.txt
tomcat/jk/trunk/native/iis/pcre/doc/pcrecompat.3
tomcat/jk/trunk/native/iis/pcre/doc/pcrejit.3
tomcat/jk/trunk/native/iis/pcre/doc/pcrepattern.3
tomcat/jk/trunk/native/iis/pcre/doc/pcretest.1
tomcat/jk/trunk/native/iis/pcre/doc/pcretest.txt
tomcat/jk/trunk/native/iis/pcre/pcre.h.generic
tomcat/jk/trunk/native/iis/pcre/pcre_compile.c
tomcat/jk/trunk/native/iis/pcre/pcre_dfa_exec.c
tomcat/jk/trunk/native/iis/pcre/pcre_exec.c
tomcat/jk/trunk/native/iis/pcre/pcre_internal.h
tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c
tomcat/jk/trunk/native/iis/pcre/pcre_jit_test.c
tomcat/jk/trunk/native/iis/pcre/pcre_scanner_unittest.cc
tomcat/jk/trunk/native/iis/pcre/pcre_stringpiece.h.in
tomcat/jk/trunk/native/iis/pcre/pcre_stringpiece_unittest.cc
tomcat/jk/trunk/native/iis/pcre/pcre_tables.c
tomcat/jk/trunk/native/iis/pcre/pcre_ucd.c
tomcat/jk/trunk/native/iis/pcre/pcrecpp_unittest.cc
tomcat/jk/trunk/native/iis/pcre/pcregrep.c
tomcat/jk/trunk/native/iis/pcre/pcreposix.c
tomcat/jk/trunk/native/iis/pcre/pcretest.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitConfig.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitConfigInternal.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitExecAllocator.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_T2_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeSPARC_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeSPARC_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX-encoder.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeTILEGX_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitUtils.c
tomcat/jk/trunk/native/iis/pcre/testdata/testinput1
tomcat/jk/trunk/native/iis/pcre/testdata/testinput12
tomcat/jk/trunk/native/iis/pcre/testdata/testinput15
tomcat/jk/trunk/native/iis/pcre/testdata/testinput16
tomcat/jk/trunk/native/iis/pcre/testdata/testinput19
tomcat/jk/trunk/native/iis/pcre/testdata/testinput2
tomcat/jk/trunk/native/iis/pcre/testdata/testinput6
tomcat/jk/trunk/native/iis/pcre/testdata/testinput7
tomcat/jk/trunk/native/iis/pcre/testdata/testinput8
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput1
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput12
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput15
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput16
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput19
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput2
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput6
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput7
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput8
Modified: tomcat/jk/trunk/native/iis/pcre/AUTHORS
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/AUTHORS?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/AUTHORS (original)
+++ tomcat/jk/trunk/native/iis/pcre/AUTHORS Tue Nov 21 14:37:37 2017
@@ -8,7 +8,7 @@ Email domain: cam.ac.uk
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2016 University of Cambridge
+Copyright (c) 1997-2017 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-2016 Zoltan Herczeg
+Copyright(c) 2010-2017 Zoltan Herczeg
All rights reserved.
@@ -30,7 +30,7 @@ Written by: Zoltan Herczeg
Email local part: hzmester
Emain domain: freemail.hu
-Copyright(c) 2009-2016 Zoltan Herczeg
+Copyright(c) 2009-2017 Zoltan Herczeg
All rights reserved.
Modified: tomcat/jk/trunk/native/iis/pcre/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/CMakeLists.txt?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/CMakeLists.txt (original)
+++ tomcat/jk/trunk/native/iis/pcre/CMakeLists.txt Tue Nov 21 14:37:37 2017
@@ -66,6 +66,7 @@
# 2013-10-08 PH got rid of the "source" command, which is a bash-ism (use ".")
# 2013-11-05 PH added support for PARENS_NEST_LIMIT
# 2016-03-01 PH applied Chris Wilson's patch for MSVC static build
+# 2016-06-24 PH applied Chris Wilson's revised patch (adds a separate option)
PROJECT(PCRE C CXX)
@@ -190,6 +191,9 @@ IF (MINGW)
ENDIF(MINGW)
IF(MSVC)
+ OPTION(PCRE_STATIC_RUNTIME
+ "ON=Compile against the static runtime (/MT)."
+ OFF)
OPTION(INSTALL_MSVC_PDB
"ON=Install .pdb files built by MSVC, if generated"
OFF)
@@ -573,8 +577,8 @@ ENDIF(MSVC AND NOT PCRE_STATIC)
# Fix static compilation with MSVC: https://bugs.exim.org/show_bug.cgi?id=1681
# This code was taken from the CMake wiki, not from WebM.
-IF(MSVC AND PCRE_STATIC)
- MESSAGE(STATUS "** MSVC and PCRE_STATIC: modifying compiler flags to use
static runtime library")
+IF(MSVC AND PCRE_STATIC_RUNTIME)
+ MESSAGE(STATUS "** MSVC and PCRE_STATIC_RUNTIME: modifying compiler flags to
use static runtime library")
foreach(flag_var
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
@@ -582,7 +586,7 @@ IF(MSVC AND PCRE_STATIC)
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
endforeach()
-ENDIF(MSVC AND PCRE_STATIC)
+ENDIF(MSVC AND PCRE_STATIC_RUNTIME)
SET(PCRECPP_HEADERS
pcrecpp.h
Modified: tomcat/jk/trunk/native/iis/pcre/ChangeLog
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/ChangeLog?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/ChangeLog (original)
+++ tomcat/jk/trunk/native/iis/pcre/ChangeLog Tue Nov 21 14:37:37 2017
@@ -4,6 +4,100 @@ ChangeLog for PCRE
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.41 05-July-2017
+-------------------------
+
+1. Fixed typo in CMakeLists.txt (wrong number of arguments for
+PCRE_STATIC_RUNTIME (affects MSVC only).
+
+2. Issue 1 for 8.40 below was not correctly fixed. If pcregrep in multiline
+mode with --only-matching matched several lines, it restarted scanning at the
+next line instead of moving on to the end of the matched string, which can be
+several lines after the start.
+
+3. Fix a missing else in the JIT compiler reported by 'idaifish'.
+
+4. A (?# style comment is now ignored between a basic quantifier and a
+following '+' or '?' (example: /X+(?#comment)?Y/.
+
+5. Avoid use of a potentially overflowing buffer in pcregrep (patch by Petr
+Pisar).
+
+6. Fuzzers have reported issues in pcretest. These are NOT serious (it is,
+after all, just a test program). However, to stop the reports, some easy ones
+are fixed:
+
+ (a) Check for values < 256 when calling isprint() in pcretest.
+ (b) Give an error for too big a number after \O.
+
+7. In the 32-bit library in non-UTF mode, an attempt to find a Unicode
+property for a character with a code point greater than 0x10ffff (the Unicode
+maximum) caused a crash.
+
+8. The alternative matching function, pcre_dfa_exec() misbehaved if it
+encountered a character class with a possessive repeat, for example [a-f]{3}+.
+
+9. When pcretest called pcre_copy_substring() in 32-bit mode, it set the buffer
+length incorrectly, which could result in buffer overflow.
+
+10. Remove redundant line of code (accidentally left in ages ago).
+
+11. Applied C++ patch from Irfan Adilovic to guard 'using std::' directives
+with namespace pcrecpp (Bugzilla #2084).
+
+12. Remove a duplication typo in pcre_tables.c.
+
+13. Fix returned offsets from regexec() when REG_STARTEND is used with a
+starting offset greater than zero.
+
+
+Version 8.40 11-January-2017
+----------------------------
+
+1. Using -o with -M in pcregrep could cause unnecessary repeated output when
+ the match extended over a line boundary.
+
+2. Applied Chris Wilson's second patch (Bugzilla #1681) to CMakeLists.txt for
+ MSVC static compilation, putting the first patch under a new option.
+
+3. Fix register overwite in JIT when SSE2 acceleration is enabled.
+
+4. Ignore "show all captures" (/=) for DFA matching.
+
+5. Fix JIT unaligned accesses on x86. Patch by Marc Mutz.
+
+6. In any wide-character mode (8-bit UTF or any 16-bit or 32-bit mode),
+ without PCRE_UCP set, a negative character type such as \D in a positive
+ class should cause all characters greater than 255 to match, whatever else
+ is in the class. There was a bug that caused this not to happen if a
+ Unicode property item was added to such a class, for example [\D\P{Nd}] or
+ [\W\pL].
+
+7. When pcretest was outputing information from a callout, the caret indicator
+ for the current position in the subject line was incorrect if it was after
+ an escape sequence for a character whose code point was greater than
+ \x{ff}.
+
+8. A pattern such as (?<RA>abc)(?(R)xyz) was incorrectly compiled such that
+ the conditional was interpreted as a reference to capturing group 1 instead
+ of a test for recursion. Any group whose name began with R was
+ misinterpreted in this way. (The reference interpretation should only
+ happen if the group's name is precisely "R".)
+
+9. A number of bugs have been mended relating to match start-up optimizations
+ when the first thing in a pattern is a positive lookahead. These all
+ applied only when PCRE_NO_START_OPTIMIZE was *not* set:
+
+ (a) A pattern such as (?=.*X)X$ was incorrectly optimized as if it needed
+ both an initial 'X' and a following 'X'.
+ (b) Some patterns starting with an assertion that started with .* were
+ incorrectly optimized as having to match at the start of the subject or
+ after a newline. There are cases where this is not true, for example,
+ (?=.*[A-Z])(?=.{8,16})(?!.*[\s]) matches after the start in lines that
+ start with spaces. Starting .* in an assertion is no longer taken as an
+ indication of matching at the start (or after a newline).
+
+
Version 8.39 14-June-2016
-------------------------
Modified: tomcat/jk/trunk/native/iis/pcre/LICENCE
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/LICENCE?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/LICENCE (original)
+++ tomcat/jk/trunk/native/iis/pcre/LICENCE Tue Nov 21 14:37:37 2017
@@ -25,7 +25,7 @@ Email domain: cam.ac.uk
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2016 University of Cambridge
+Copyright (c) 1997-2017 University of Cambridge
All rights reserved.
@@ -36,7 +36,7 @@ Written by: Zoltan Herczeg
Email local part: hzmester
Emain domain: freemail.hu
-Copyright(c) 2010-2016 Zoltan Herczeg
+Copyright(c) 2010-2017 Zoltan Herczeg
All rights reserved.
@@ -47,7 +47,7 @@ Written by: Zoltan Herczeg
Email local part: hzmester
Emain domain: freemail.hu
-Copyright(c) 2009-2016 Zoltan Herczeg
+Copyright(c) 2009-2017 Zoltan Herczeg
All rights reserved.
Modified: tomcat/jk/trunk/native/iis/pcre/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/Makefile.in?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/Makefile.in (original)
+++ tomcat/jk/trunk/native/iis/pcre/Makefile.in Tue Nov 21 14:37:37 2017
@@ -2832,7 +2832,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c
>$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c
>$(distdir).tar.bz2
@@ -2857,7 +2857,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
@@ -2874,7 +2874,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -2884,7 +2884,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Modified: tomcat/jk/trunk/native/iis/pcre/NEWS
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/NEWS?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/NEWS (original)
+++ tomcat/jk/trunk/native/iis/pcre/NEWS Tue Nov 21 14:37:37 2017
@@ -1,6 +1,18 @@
News about PCRE releases
------------------------
+Release 8.41 13-June-2017
+-------------------------
+
+This is a bug-fix release.
+
+
+Release 8.40 11-January-2017
+----------------------------
+
+This is a bug-fix release.
+
+
Release 8.39 14-June-2016
-------------------------
Modified: tomcat/jk/trunk/native/iis/pcre/aclocal.m4
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/aclocal.m4?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/aclocal.m4 (original)
+++ tomcat/jk/trunk/native/iis/pcre/aclocal.m4 Tue Nov 21 14:37:37 2017
@@ -20,9 +20,9 @@ You have another version of autoconf. I
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
'autoreconf'.])])
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
dnl Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.li...@gmail.com>
dnl
@@ -63,7 +63,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but
]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler fl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -174,11 +174,11 @@ and $1[]_LIBS to avoid the need to call
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -195,7 +195,7 @@ installed software in a non-standard pre
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
Modified: tomcat/jk/trunk/native/iis/pcre/config.h.generic
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.h.generic?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/config.h.generic (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.h.generic Tue Nov 21 14:37:37 2017
@@ -235,7 +235,7 @@ sure both macros are undefined; an emula
#define PACKAGE_NAME "PCRE"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE 8.39"
+#define PACKAGE_STRING "PCRE 8.41"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre"
@@ -244,7 +244,7 @@ sure both macros are undefined; an emula
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "8.39"
+#define PACKAGE_VERSION "8.41"
/* 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
@@ -336,7 +336,7 @@ sure both macros are undefined; an emula
/* #undef SUPPORT_VALGRIND */
/* Version number of package */
-#define VERSION "8.39"
+#define VERSION "8.41"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Modified: tomcat/jk/trunk/native/iis/pcre/config.hw
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.hw?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/config.hw (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.hw Tue Nov 21 14:37:37 2017
@@ -235,7 +235,7 @@ sure both macros are undefined; an emula
#define PACKAGE_NAME "PCRE"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE 8.39"
+#define PACKAGE_STRING "PCRE 8.41"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre"
@@ -244,7 +244,7 @@ sure both macros are undefined; an emula
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "8.39"
+#define PACKAGE_VERSION "8.41"
/* 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
@@ -336,7 +336,7 @@ sure both macros are undefined; an emula
/* #undef SUPPORT_VALGRIND */
/* Version number of package */
-#define VERSION "8.39"
+#define VERSION "8.41"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Modified: tomcat/jk/trunk/native/iis/pcre/configure
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/configure?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/configure (original)
+++ tomcat/jk/trunk/native/iis/pcre/configure Tue Nov 21 14:37:37 2017
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PCRE 8.39.
+# Generated by GNU Autoconf 2.69 for PCRE 8.41.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='PCRE'
PACKAGE_TARNAME='pcre'
-PACKAGE_VERSION='8.39'
-PACKAGE_STRING='PCRE 8.39'
+PACKAGE_VERSION='8.41'
+PACKAGE_STRING='PCRE 8.41'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures PCRE 8.39 to adapt to many kinds of systems.
+\`configure' configures PCRE 8.41 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1488,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of PCRE 8.39:";;
+ short | recursive ) echo "Configuration of PCRE 8.41:";;
esac
cat <<\_ACEOF
@@ -1662,7 +1662,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-PCRE configure 8.39
+PCRE configure 8.41
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2419,7 +2419,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by PCRE $as_me 8.39, which was
+It was created by PCRE $as_me 8.41, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3283,7 +3283,7 @@ fi
# Define the identity of the package.
PACKAGE='pcre'
- VERSION='8.39'
+ VERSION='8.41'
cat >>confdefs.h <<_ACEOF
@@ -17634,9 +17634,9 @@ _ACEOF
# Versioning
PCRE_MAJOR="8"
-PCRE_MINOR="39"
+PCRE_MINOR="41"
PCRE_PRERELEASE=""
-PCRE_DATE="2016-06-14"
+PCRE_DATE="2017-07-05"
if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09"
then
@@ -19658,16 +19658,16 @@ esac
# (Note: The libpcre*_version bits are m4 variables, assigned above)
EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
- $NO_UNDEFINED -version-info 3:7:2"
+ $NO_UNDEFINED -version-info 3:9:2"
EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \
- $NO_UNDEFINED -version-info 2:7:2"
+ $NO_UNDEFINED -version-info 2:9:2"
EXTRA_LIBPCRE32_LDFLAGS="$EXTRA_LIBPCRE32_LDFLAGS \
- $NO_UNDEFINED -version-info 0:7:0"
+ $NO_UNDEFINED -version-info 0:9:0"
EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
- $NO_UNDEFINED -version-info 0:4:0"
+ $NO_UNDEFINED -version-info 0:5:0"
EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \
$NO_UNDEFINED -version-info 0:1:0 \
@@ -19872,8 +19872,8 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND" >&5
-$as_echo_n "checking for VALGRIND... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
+$as_echo_n "checking for valgrind... " >&6; }
if test -n "$VALGRIND_CFLAGS"; then
pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"
@@ -19913,7 +19913,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -19940,7 +19940,7 @@ Alternatively, you may set the environme
and VALGRIND_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -20719,7 +20719,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by PCRE $as_me 8.39, which was
+This file was extended by PCRE $as_me 8.41, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20785,7 +20785,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-PCRE config.status 8.39
+PCRE config.status 8.41
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: tomcat/jk/trunk/native/iis/pcre/configure.ac
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/configure.ac?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/configure.ac (original)
+++ tomcat/jk/trunk/native/iis/pcre/configure.ac Tue Nov 21 14:37:37 2017
@@ -9,18 +9,18 @@ dnl The PCRE_PRERELEASE feature is for i
dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre_major, [8])
-m4_define(pcre_minor, [39])
+m4_define(pcre_minor, [41])
m4_define(pcre_prerelease, [])
-m4_define(pcre_date, [2016-06-14])
+m4_define(pcre_date, [2017-07-05])
# 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:7:2])
-m4_define(libpcre16_version, [2:7:2])
-m4_define(libpcre32_version, [0:7:0])
-m4_define(libpcreposix_version, [0:4:0])
+m4_define(libpcre_version, [3:9:2])
+m4_define(libpcre16_version, [2:9:2])
+m4_define(libpcre32_version, [0:9:0])
+m4_define(libpcreposix_version, [0:5:0])
m4_define(libpcrecpp_version, [0:1:0])
AC_PREREQ(2.57)
Modified: tomcat/jk/trunk/native/iis/pcre/doc/html/pcrecompat.html
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/html/pcrecompat.html?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/doc/html/pcrecompat.html (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/html/pcrecompat.html Tue Nov 21
14:37:37 2017
@@ -128,7 +128,7 @@ the pattern /^(a(b)?)+$/ in Perl leaves
14. PCRE's handling of duplicate subpattern numbers and duplicate subpattern
names is not as general as Perl's. This is a consequence of the fact the PCRE
works internally just with numbers, using an external table to translate
-between numbers and names. In particular, a pattern such as
(?|(?<a>A)|(?<b)B),
+between numbers and names. In particular, a pattern such as
(?|(?<a>A)|(?<b>B),
where the two capturing parentheses have the same number but different names,
is not supported, and causes an error at compile time. If it were allowed, it
would not be possible to distinguish which parentheses matched, because both
Modified: tomcat/jk/trunk/native/iis/pcre/doc/html/pcrejit.html
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/html/pcrejit.html?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/doc/html/pcrejit.html (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/html/pcrejit.html Tue Nov 21 14:37:37
2017
@@ -79,9 +79,12 @@ API that is JIT-specific.
</P>
<P>
If your program may sometimes be linked with versions of PCRE that are older
-than 8.20, but you want to use JIT when it is available, you can test
-the values of PCRE_MAJOR and PCRE_MINOR, or the existence of a JIT macro such
-as PCRE_CONFIG_JIT, for compile-time control of your code.
+than 8.20, but you want to use JIT when it is available, you can test the
+values of PCRE_MAJOR and PCRE_MINOR, or the existence of a JIT macro such as
+PCRE_CONFIG_JIT, for compile-time control of your code. Also beware that the
+<b>pcre_jit_exec()</b> function was not available at all before 8.32,
+and may not be available at all if PCRE isn't compiled with
+--enable-jit. See the "JIT FAST PATH API" section below for details.
</P>
<br><a name="SEC4" href="#TOC1">SIMPLE USE OF JIT</a><br>
<P>
@@ -119,6 +122,20 @@ when you call <b>pcre_study()</b>:
PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE
PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE
</pre>
+If using <b>pcre_jit_exec()</b> and supporting a pre-8.32 version of
+PCRE, you can insert:
+<pre>
+ #if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
+ pcre_jit_exec(...);
+ #else
+ pcre_exec(...)
+ #endif
+</pre>
+but as described in the "JIT FAST PATH API" section below this assumes
+version 8.32 and later are compiled with --enable-jit, which may
+break.
+<br>
+<br>
The JIT compiler generates different optimized code for each of the three
modes (normal, soft partial, hard partial). When <b>pcre_exec()</b> is called,
the appropriate code is run if it is available. Otherwise, the pattern is
@@ -428,6 +445,36 @@ fast path, and if invalid data is passed
Bypassing the sanity checks and the <b>pcre_exec()</b> wrapping can give
speedups of more than 10%.
</P>
+<P>
+Note that the <b>pcre_jit_exec()</b> function is not available in versions of
+PCRE before 8.32 (released in November 2012). If you need to support versions
+that old you must either use the slower <b>pcre_exec()</b>, or switch between
+the two codepaths by checking the values of PCRE_MAJOR and PCRE_MINOR.
+</P>
+<P>
+Due to an unfortunate implementation oversight, even in versions 8.32
+and later there will be no <b>pcre_jit_exec()</b> stub function defined
+when PCRE is compiled with --disable-jit, which is the default, and
+there's no way to detect whether PCRE was compiled with --enable-jit
+via a macro.
+</P>
+<P>
+If you need to support versions older than 8.32, or versions that may
+not build with --enable-jit, you must either use the slower
+<b>pcre_exec()</b>, or switch between the two codepaths by checking the
+values of PCRE_MAJOR and PCRE_MINOR.
+</P>
+<P>
+Switching between the two by checking the version assumes that all the
+versions being targeted are built with --enable-jit. To also support
+builds that may use --disable-jit either <b>pcre_exec()</b> must be
+used, or a compile-time check for JIT via <b>pcre_config()</b> (which
+assumes the runtime environment will be the same), or as the Git
+project decided to do, simply assume that <b>pcre_jit_exec()</b> is
+present in 8.32 or later unless a compile-time flag is provided, see
+the "grep: un-break building with PCRE >= 8.32 without --enable-jit"
+commit in git.git for an example of that.
+</P>
<br><a name="SEC12" href="#TOC1">SEE ALSO</a><br>
<P>
<b>pcreapi</b>(3)
@@ -443,9 +490,9 @@ Cambridge CB2 3QH, England.
</P>
<br><a name="SEC14" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 17 March 2013
+Last updated: 05 July 2017
<br>
-Copyright © 1997-2013 University of Cambridge.
+Copyright © 1997-2017 University of Cambridge.
<br>
<p>
Return to the <a href="index.html">PCRE index page</a>.
Modified: tomcat/jk/trunk/native/iis/pcre/doc/html/pcrepattern.html
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/html/pcrepattern.html?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/doc/html/pcrepattern.html (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/html/pcrepattern.html Tue Nov 21
14:37:37 2017
@@ -358,24 +358,24 @@ When PCRE is compiled in EBCDIC mode, \a
generate the appropriate EBCDIC code values. The \c escape is processed
as specified for Perl in the <b>perlebcdic</b> document. The only characters
that are allowed after \c are A-Z, a-z, or one of @, [, \, ], ^, _, or ?. Any
-other character provokes a compile-time error. The sequence \@ encodes
-character code 0; the letters (in either case) encode characters 1-26 (hex 01
-to hex 1A); [, \, ], ^, and _ encode characters 27-31 (hex 1B to hex 1F), and
-\? becomes either 255 (hex FF) or 95 (hex 5F).
+other character provokes a compile-time error. The sequence \c@ encodes
+character code 0; after \c the letters (in either case) encode characters 1-26
+(hex 01 to hex 1A); [, \, ], ^, and _ encode characters 27-31 (hex 1B to hex
+1F), and \c? becomes either 255 (hex FF) or 95 (hex 5F).
</P>
<P>
-Thus, apart from \?, these escapes generate the same character code values as
+Thus, apart from \c?, these escapes generate the same character code values as
they do in an ASCII environment, though the meanings of the values mostly
-differ. For example, \G always generates code value 7, which is BEL in ASCII
+differ. For example, \cG always generates code value 7, which is BEL in ASCII
but DEL in EBCDIC.
</P>
<P>
-The sequence \? generates DEL (127, hex 7F) in an ASCII environment, but
+The sequence \c? generates DEL (127, hex 7F) in an ASCII environment, but
because 127 is not a control character in EBCDIC, Perl makes it generate the
APC character. Unfortunately, there are several variants of EBCDIC. In most of
them the APC character has the value 255 (hex FF), but in the one Perl calls
POSIX-BC its value is 95 (hex 5F). If certain other characters have POSIX-BC
-values, PCRE makes \? generate 95; otherwise it generates 255.
+values, PCRE makes \c? generate 95; otherwise it generates 255.
</P>
<P>
After \0 up to two further octal digits are read. If there are fewer than two
@@ -1512,13 +1512,8 @@ J, U and X respectively.
<P>
When one of these option changes occurs at top level (that is, not inside
subpattern parentheses), the change applies to the remainder of the pattern
-that follows. If the change is placed right at the start of a pattern, PCRE
-extracts it into the global options (and it will therefore show up in data
-extracted by the <b>pcre_fullinfo()</b> function).
-</P>
-<P>
-An option change within a subpattern (see below for a description of
-subpatterns) affects only that part of the subpattern that follows it, so
+that follows. An option change within a subpattern (see below for a description
+of subpatterns) affects only that part of the subpattern that follows it, so
<pre>
(a(?i)b)c
</pre>
@@ -2160,6 +2155,14 @@ capturing is carried out only for positi
always, does do capturing in negative assertions.)
</P>
<P>
+WARNING: If a positive assertion containing one or more capturing subpatterns
+succeeds, but failure to match later in the pattern causes backtracking over
+this assertion, the captures within the assertion are reset only if no higher
+numbered captures are already set. This is, unfortunately, a fundamental
+limitation of the current implementation, and as PCRE1 is now in
+maintenance-only status, it is unlikely ever to change.
+</P>
+<P>
For compatibility with Perl, assertion subpatterns may be repeated; though
it makes no sense to assert the same thing several times, the side effect of
capturing parentheses may occasionally be useful. In practice, there only three
@@ -3264,9 +3267,9 @@ Cambridge CB2 3QH, England.
</P>
<br><a name="SEC30" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 14 June 2015
+Last updated: 23 October 2016
<br>
-Copyright © 1997-2015 University of Cambridge.
+Copyright © 1997-2016 University of Cambridge.
<br>
<p>
Return to the <a href="index.html">PCRE index page</a>.
Modified: tomcat/jk/trunk/native/iis/pcre/doc/html/pcretest.html
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/html/pcretest.html?rev=1815927&r1=1815926&r2=1815927&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/doc/html/pcretest.html (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/html/pcretest.html Tue Nov 21 14:37:37
2017
@@ -74,6 +74,11 @@ newline as data characters. However, in
maximum portability, therefore, it is safest to use only ASCII characters in
<b>pcretest</b> input files.
</P>
+<P>
+The input is processed using using C's string functions, so must not
+contain binary zeroes, even though in Unix-like environments, <b>fgets()</b>
+treats any bytes other than newline as data characters.
+</P>
<br><a name="SEC3" href="#TOC1">PCRE's 8-BIT, 16-BIT AND 32-BIT
LIBRARIES</a><br>
<P>
From release 8.30, two separate PCRE libraries can be built. The original one
@@ -1149,9 +1154,9 @@ Cambridge CB2 3QH, England.
</P>
<br><a name="SEC17" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 09 February 2014
+Last updated: 23 February 2017
<br>
-Copyright © 1997-2014 University of Cambridge.
+Copyright © 1997-2017 University of Cambridge.
<br>
<p>
Return to the <a href="index.html">PCRE index page</a>.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
