Fixed bug #37586 (Bumped minimum PCRE version to 6.6, needed for recurssion

limit support).

diff --git a/NEWS b/NEWS
index d7ea3af133f35cdc608147b1fe79b2ca116f9603..3196d83d35b53f787faeaf87e4d852e7d3fd950d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,8 @@ PHP                                                                        NEWS
 - Fixed handling of extremely long paths inside tempnam() function. (Ilia)
 - Fixed bug #37614 (Class name lowercased in error message). (Johannes)
 - Fixed bug #37587 (var without attribute causes segfault). (Marcus)
+- Fixed bug #37586 (Bumped minimum PCRE version to 6.6, needed for recurssion
+  limit support). (Ilia)
 - Fixed bug #37569 (WDDX incorrectly encodes high-ascii characters). (Ilia)
 - Fixed bug #37565 (Using reflection::export with simplexml causing a crash).
   (Marcus)

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 3ae740d682596a3c1d52b5f25ea54a04c0af5551..4ab39efce22b0d5eec23cfd604648c67427e3dd1 100644 (file)
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -43,8 +43,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then
       pcre_minor="$pcre_minor"0
     fi
     pcre_version=$pcre_major$pcre_minor
-    if test "$pcre_version" -lt 208; then
-      AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 2.08])
+    if test "$pcre_version" -lt 660; then
+      AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6])
     fi
 
     PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)