]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 1 Feb 2016 05:29:46 +0000 (21:29 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Feb 2016 05:39:24 +0000 (21:39 -0800)
* PHP-5.6:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

Conflicts:
ext/pcre/pcrelib/config.h

1  2 
ext/pcre/pcrelib/ChangeLog
ext/pcre/pcrelib/doc/pcre.txt
ext/pcre/pcrelib/pcre_compile.c
ext/pcre/pcrelib/pcre_exec.c
ext/pcre/pcrelib/pcre_internal.h
ext/pcre/pcrelib/pcre_study.c
ext/pcre/pcrelib/pcre_xclass.c
ext/pcre/tests/backtrack_limit.phpt

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 419e6c20090ad385419023bea517ef8fc69438f0,419e6c20090ad385419023bea517ef8fc69438f0..3f0d8e64468a0696c2cf38c6b92b3c5de7528ad6
@@@ -8,6 -8,6 +8,7 @@@ if (@preg_match_all('/\p{N}/', '0123456
  ?>
  --INI--
  pcre.backtrack_limit=2
++pcre.jit=0
  --FILE--
  <?php