Skip to content

Commit 6ec23fa

Browse files
author
Scott MacVicar
committed
Update bundled PCRE to 8.12
1 parent 735b342 commit 6ec23fa

22 files changed

+755
-71
lines changed

‎ext/pcre/pcrelib/ChangeLog

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,40 @@
11
ChangeLog for PCRE
22
------------------
33

4+
Version 8.12 15-Jan-2011
5+
------------------------
6+
7+
1. Fixed some typos in the markup of the man pages, and wrote a script that
8+
checks for such things as part of the documentation building process.
9+
10+
2. On a big-endian 64-bit system, pcregrep did not correctly process the
11+
--match-limit and --recursion-limit options (added for 8.11). In
12+
particular, this made one of the standard tests fail. (The integer value
13+
went into the wrong half of a long int.)
14+
15+
3. If the --colour option was given to pcregrep with -v (invert match), it
16+
did strange things, either producing crazy output, or crashing. It should,
17+
of course, ignore a request for colour when reporting lines that do not
18+
match.
19+
20+
4. Another pcregrep bug caused similar problems if --colour was specified with
21+
-M (multiline) and the pattern match finished with a line ending.
22+
23+
5. In pcregrep, when a pattern that ended with a literal newline sequence was
24+
matched in multiline mode, the following line was shown as part of the
25+
match. This seems wrong, so I have changed it.
26+
27+
6. Another pcregrep bug in multiline mode, when --colour was specified, caused
28+
the check for further matches in the same line (so they could be coloured)
29+
to overrun the end of the current line. If another match was found, it was
30+
incorrectly shown (and then shown again when found in the next line).
31+
32+
7. If pcregrep was compiled under Windows, there was a reference to the
33+
function pcregrep_exit() before it was defined. I am assuming this was
34+
the cause of the "error C2371: 'pcregrep_exit' : redefinition;" that was
35+
reported by a user. I've moved the definition above the reference.
36+
37+
438
Version 8.11 10-Dec-2010
539
------------------------
640

‎ext/pcre/pcrelib/NEWS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
News about PCRE releases
22
------------------------
33

4+
Release 8.12 15-Jan-2011
5+
------------------------
6+
7+
This release fixes some bugs in pcregrep, one of which caused the tests to fail
8+
on 64-bit big-endian systems. There are no changes to the code of the library.
9+
10+
411
Release 8.11 10-Dec-2010
512
------------------------
613

‎ext/pcre/pcrelib/config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ them both to 0; an emulation function will be used. */
282282
#define PACKAGE_NAME "PCRE"
283283

284284
/* Define to the full name and version of this package. */
285-
#define PACKAGE_STRING "PCRE 8.11"
285+
#define PACKAGE_STRING "PCRE 8.12"
286286

287287
/* Define to the one symbol short name of this package. */
288288
#define PACKAGE_TARNAME "pcre"
@@ -291,7 +291,7 @@ them both to 0; an emulation function will be used. */
291291
#define PACKAGE_URL ""
292292

293293
/* Define to the version of this package. */
294-
#define PACKAGE_VERSION "8.11"
294+
#define PACKAGE_VERSION "8.12"
295295

296296

297297
/* If you are compiling for a system other than a Unix-like system or
@@ -347,7 +347,7 @@ them both to 0; an emulation function will be used. */
347347

348348
/* Version number of package */
349349
#ifndef VERSION
350-
#define VERSION "8.11"
350+
#define VERSION "8.12"
351351
#endif
352352

353353
/* Define to empty if `const' does not conform to ANSI C. */

‎ext/pcre/pcrelib/doc/pcre.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6512,6 +6512,7 @@ SAVING AND RE-USING PRECOMPILED PCRE PATTERNS
65126512

65136513

65146514
SAVING A COMPILED PATTERN
6515+
65156516
The value returned by pcre_compile() points to a single block of memory
65166517
that holds the compiled pattern and associated data. You can find the
65176518
length of this block in bytes by calling pcre_fullinfo() with an argu-

‎ext/pcre/pcrelib/pcre.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
4242
/* The current PCRE version information. */
4343

4444
#define PCRE_MAJOR 8
45-
#define PCRE_MINOR 11
45+
#define PCRE_MINOR 12
4646
#define PCRE_PRERELEASE
47-
#define PCRE_DATE 2010-12-10
47+
#define PCRE_DATE 2011-01-15
4848

4949
/* When an application links to a PCRE DLL in Windows, the symbols that are
5050
imported have to be identified as such. When building PCRE, the appropriate

‎ext/pcre/pcrelib/pcre_internal.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ stdint.h is available, include it; it may define INT64_MAX. Systems that do not
192192
have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
193193
by "configure". */
194194

195-
#ifdef PHP_WIN32
196-
#include "win32/php_stdint.h"
197-
#elif HAVE_STDINT_H
195+
#if HAVE_STDINT_H
198196
#include <stdint.h>
199197
#elif HAVE_INTTYPES_H
200198
#include <inttypes.h>

0 commit comments

Comments
 (0)