granicus.if.org Git - php/commit

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

author	Stanislav Malyshev <stas@php.net>
	Thu, 30 Apr 2015 05:31:06 +0000 (22:31 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Thu, 30 Apr 2015 05:34:54 +0000 (22:34 -0700)
commit	98fe9405e26ae7aa25592557ef92d238ba34ff51
tree	a4a74031a975d92e9432c0442c5950bf54941a0b	tree \| snapshot
parent	972e94a24d46ccabb0b78623c1598c4998c26a76	commit \| diff
parent	428d0983cd785b9cc91f291d5b22c4411a966f94	commit \| diff

ext/pcre/pcrelib/ChangeLog	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/README	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/pcre_compile.c	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/pcre_exec.c	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/pcre_internal.h	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/pcre_study.c	diff1 \|	diff2 \|	blob \| history