Umm, let's not enable NO_RECURSE by default. The matches on some

patterns can be more than twice as slow as before.
# Maybe we should add a --disable-pcre-stack-recursion compile option

diff --git a/NEWS b/NEWS
index 647e3f1a3147c89995ce45bdfbf41b7b0f7365cd..e3a3b5b1991ba5a8f14ee5e494907595469c0a3d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2003, Version 4.3.5
-- Upgraded PCRE library to version 4.5. The bundled version now comes with
-  non-recursive matching functions which should help with some regular
-  expressions that ran into the stack limit. (Andrei)
+- Upgraded PCRE library to version 4.5. (Andrei)
 - Updated bundled PostgreSQL library to version 7.4 in Windows distribution.
   (Edin)
 - Added support for --program-prefix and --program-suffix configure options.

diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index b9a4c7880e307c421ce54c28dc79d516c372e8e6..02e71bd25b0f2cbe6ad03fd6a0170a3a039b17ea 100644 (file)
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -50,7 +50,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
     
     AC_DEFINE(HAVE_PCRE, 1, [ ])
     PHP_ADD_INCLUDE($PCRE_INCDIR)
-    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DNO_RECURSE)
+    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10)
   fi
   PHP_SUBST(PCRE_SHARED_LIBADD)
 fi