diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-29 22:31:06 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-29 22:34:54 -0700 |
| commit | 98fe9405e26ae7aa25592557ef92d238ba34ff51 (patch) | |
| tree | a4a74031a975d92e9432c0442c5950bf54941a0b /ext/pcre/pcrelib/pcre_internal.h | |
| parent | 972e94a24d46ccabb0b78623c1598c4998c26a76 (diff) | |
| parent | 428d0983cd785b9cc91f291d5b22c4411a966f94 (diff) | |
| download | php-git-98fe9405e26ae7aa25592557ef92d238ba34ff51.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Upgrade to PCRE 8.37 due to various bugfixes
Conflicts:
ext/pcre/config.w32
ext/pcre/config0.m4
ext/pcre/pcrelib/pcre_jit_compile.c
ext/pcre/pcrelib/sljit/sljitConfig.h
ext/pcre/pcrelib/sljit/sljitConfigInternal.h
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeARM_64.c
ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c
ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
ext/pcre/pcrelib/sljit/sljitNativePPC_common.c
ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_32.c
ext/pcre/pcrelib/sljit/sljitNativeX86_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_common.c
ext/pcre/pcrelib/sljit/sljitUtils.c
Diffstat (limited to 'ext/pcre/pcrelib/pcre_internal.h')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/pcre/pcrelib/pcre_internal.h b/ext/pcre/pcrelib/pcre_internal.h index 02d3ab17c5..dd0ac7fc91 100644 --- a/ext/pcre/pcrelib/pcre_internal.h +++ b/ext/pcre/pcrelib/pcre_internal.h @@ -2446,6 +2446,7 @@ typedef struct compile_data { BOOL had_pruneorskip; /* (*PRUNE) or (*SKIP) encountered */ BOOL check_lookbehind; /* Lookbehinds need later checking */ BOOL dupnames; /* Duplicate names exist */ + BOOL iscondassert; /* Next assert is a condition */ int nltype; /* Newline type */ int nllen; /* Newline string length */ pcre_uchar nl[4]; /* Newline string when fixed length */ @@ -2459,6 +2460,13 @@ typedef struct branch_chain { pcre_uchar *current_branch; } branch_chain; +/* Structure for mutual recursion detection. */ + +typedef struct recurse_check { + struct recurse_check *prev; + const pcre_uchar *group; +} recurse_check; + /* Structure for items in a linked list that represents an explicit recursive call within the pattern; used by pcre_exec(). */ |