From: Stanislav Malyshev <stas@php.net>
Date: Mon, 1 Feb 2016 05:29:46 +0000 (-0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~54^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=916c1fb3af99706f73c5974616834bb5a71909e3;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* 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
---

916c1fb3af99706f73c5974616834bb5a71909e3
diff --cc ext/pcre/tests/backtrack_limit.phpt
index 419e6c2009,419e6c2009..3f0d8e6446
--- a/ext/pcre/tests/backtrack_limit.phpt
+++ b/ext/pcre/tests/backtrack_limit.phpt
@@@ -8,6 -8,6 +8,7 @@@ if (@preg_match_all('/\p{N}/', '0123456
  ?>
  --INI--
  pcre.backtrack_limit=2
++pcre.jit=0
  --FILE--
  <?php