[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
andiFri Jan 2 05:00:35 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
- MF PHP_5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.8&r2=1.4.2.5.2.9&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.8
php-src/ext/pcre/config.w32:1.4.2.5.2.9
--- php-src/ext/pcre/config.w32:1.4.2.5.2.8 Sun Nov 23 18:30:36 2008
+++ php-src/ext/pcre/config.w32 Fri Jan 2 05:00:35 2009
@@ -1,8 +1,8 @@
-// $Id: config.w32,v 1.4.2.5.2.8 2008/11/23 18:30:36 iliaa Exp $
+// $Id: config.w32,v 1.4.2.5.2.9 2009/01/02 05:00:35 andi Exp $
// vim:ft=javascript
EXTENSION("pcre", "php_pcre.c", false /* never shared */,
- "-DNO_RECURSE -Iext/pcre/pcrelib");
+ "-Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c pcre_ucd.c pcre_compile.c
pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c
pcre_maketables.c pcre_newline.c pcre_ord2utf8.c pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c pcre_version.c
pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32 config0.m4 upgrade-pcre.php /ext/pcre/pcrelib dftables.c pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcr
nlopess Tue Sep 11 16:17:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32 config0.m4 upgrade-pcre.php
/php-src/ext/pcre/pcrelib dftables.c pcre_chartables.c
pcre_compile.c pcre_config.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c
pcre_info.c pcre_maketables.c
pcre_newline.c pcre_ord2utf8.c
pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c
pcre_ucp_searchfuncs.c pcre_valid_utf8.c
pcre_version.c pcre_xclass.c pcregrep.c
pcreposix.c
Log:
remove the -DHAVE_CONFIG_H switch again to fix things on windows
this means that the upgrade script strips the #ifdef automatically
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.6&r2=1.4.2.5.2.7&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.6
php-src/ext/pcre/config.w32:1.4.2.5.2.7
--- php-src/ext/pcre/config.w32:1.4.2.5.2.6 Sat Sep 1 17:51:35 2007
+++ php-src/ext/pcre/config.w32 Tue Sep 11 16:17:33 2007
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5.2.6 2007/09/01 17:51:35 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.7 2007/09/11 16:17:33 nlopess Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
- "-DNO_RECURSE -DHAVE_CONFIG_H -Iext/pcre/pcrelib");
+ "-DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.9&r2=1.38.2.3.2.10&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.9
php-src/ext/pcre/config0.m4:1.38.2.3.2.10
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.9Sat Sep 1 17:51:35 2007
+++ php-src/ext/pcre/config0.m4 Tue Sep 11 16:17:33 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.9 2007/09/01 17:51:35 nlopess Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.10 2007/09/11 16:17:33 nlopess Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
-PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,-DHAVE_CONFIG_H [EMAIL PROTECTED]@/pcrelib)
+PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/upgrade-pcre.php?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pcre/upgrade-pcre.php
diff -u php-src/ext/pcre/upgrade-pcre.php:1.1.2.2
php-src/ext/pcre/upgrade-pcre.php:1.1.2.3
--- php-src/ext/pcre/upgrade-pcre.php:1.1.2.2 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/upgrade-pcre.php Tue Sep 11 16:17:33 2007
@@ -33,10 +33,13 @@
{
global $newpcre, $dirlen;
- foreach(scandir($path) as $file) {
+ foreach (scandir($path) as $file) {
- if ($file[0] === '.' || $file === 'CVS') continue;
- if (substr_compare($file, '.lo', -3, 3) == 0 ||
substr_compare($file, '.o', -2, 2) == 0) continue;
+ if ($file[0] === '.' ||
+ $file === 'CVS' ||
+ substr_compare($file, '.lo', -3, 3) == 0 ||
+ substr_compare($fil
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32 config0.m4 php_pcre.c
nlopess Sat Sep 1 17:51:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32 config0.m4 php_pcre.c
Log:
adapt for PCRE 7.3
remove ability to include config.h from php_pcre.c, as it seems pretty
useless and produces a few warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.5&r2=1.4.2.5.2.6&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.6
--- php-src/ext/pcre/config.w32:1.4.2.5.2.5 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/config.w32 Sat Sep 1 17:51:35 2007
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5.2.5 2007/06/15 19:09:24 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.6 2007/09/01 17:51:35 nlopess Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
- "-DNO_RECURSE -Iext/pcre/pcrelib");
+ "-DNO_RECURSE -DHAVE_CONFIG_H -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.8&r2=1.38.2.3.2.9&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.8
php-src/ext/pcre/config0.m4:1.38.2.3.2.9
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.8Tue Jul 3 17:25:34 2007
+++ php-src/ext/pcre/config0.m4 Sat Sep 1 17:51:35 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.8 2007/07/03 17:25:34 sniper Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.9 2007/09/01 17:51:35 nlopess Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
-PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
+PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,-DHAVE_CONFIG_H [EMAIL PROTECTED]@/pcrelib)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.19&r2=1.168.2.9.2.20&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.19
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.20
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.19 Tue Jul 24 22:35:18 2007
+++ php-src/ext/pcre/php_pcre.c Sat Sep 1 17:51:35 2007
@@ -16,11 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.19 2007/07/24 22:35:18 tony2001 Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* $Id: php_pcre.c,v 1.168.2.9.2.20 2007/09/01 17:51:35 nlopess Exp $ */
#include "php.h"
#include "php_ini.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32 config0.m4 /ext/pcre/pcrelib pcre_dfa_exec.c
nlopess Wed Jun 14 16:26:22 2006 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/pcre/pcrelib pcre_dfa_exec.c Modified files: /php-src/ext/pcre config.w32 config0.m4 Log: remove the pcre_dfa_exec.c file, as it is needed (we dont expose that API) the file is *not* needed, obiously :) We only expose the NFA agorithm, not the DFA. Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32 config0.m4 /ext/pcre/pcrelib pcre_dfa_exec.c
nlopess Wed Jun 14 16:26:22 2006 UTC
Removed files: (Branch: PHP_5_2)
/php-src/ext/pcre/pcrelib pcre_dfa_exec.c
Modified files:
/php-src/ext/pcre config.w32 config0.m4
Log:
remove the pcre_dfa_exec.c file, as it is needed (we dont expose that API)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.1&r2=1.4.2.5.2.2&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.1
php-src/ext/pcre/config.w32:1.4.2.5.2.2
--- php-src/ext/pcre/config.w32:1.4.2.5.2.1 Thu May 18 21:50:51 2006
+++ php-src/ext/pcre/config.w32 Wed Jun 14 16:26:22 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
+// $Id: config.w32,v 1.4.2.5.2.2 2006/06/14 16:26:22 nlopess Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
@@ -6,7 +6,7 @@
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
"-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib");
- ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
+ ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_ord2utf8.c
pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c
pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.1&r2=1.38.2.3.2.2&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.1
php-src/ext/pcre/config0.m4:1.38.2.3.2.2
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.1Sun May 28 15:33:56 2006
+++ php-src/ext/pcre/config0.m4 Wed Jun 14 16:26:22 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.1 2006/05/28 15:33:56 iliaa Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.2 2006/06/14 16:26:22 nlopess Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -13,7 +13,7 @@
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
-PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c
pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c
pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 [EMAIL PROTECTED]@/pcrelib)
+PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c
pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c
pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT=
-DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 [EMAIL PROTECTED]@/pcrelib)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
And it shouldn't.
-Andrei
On May 19, 2006, at 2:49 AM, Nuno Lopes wrote:
The unix build isn't using that config option, though.
Nuno
- Original Message -
I belive its better to have slower pcre than having php crash left
and right. Stack usage of php-5.1+ is so huge pcre becomes a real
stability issue due.
Edin
Nuno Lopes wrote:
This shouldn't be necessary because of Andrei's patch that allows
you to configure the max recursion depth through a ini setting.
Also, this patch will make pcre much slower (it will do thousands
of malloc's).
Nuno
- Original Message -
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack
overflow crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?
r1=1.4.2.5&r2=1.4.2.5.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5 php-src/ext/pcre/
config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions",
"yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
- "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -
DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -
DMATCH_LIMIT=1000 -DMATCH_LIMIT_RECURSION=1000 -Iext/
pcre/pcrelib");
+ "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -
DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -
DMATCH_LIMIT=1000 -DMATCH_LIMIT_RECURSION=1000 -
DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c
pcre_dfa_exec.c pcre_exec.c pcre_fullinfo.c pcre_get.c
pcre_globals.c pcre_info.c pcre_maketables.c pcre_ord2utf8.c
pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
The unix build isn't using that config option, though.
Nuno
- Original Message -
I belive its better to have slower pcre than having php crash left and
right. Stack usage of php-5.1+ is so huge pcre becomes a real stability
issue due.
Edin
Nuno Lopes wrote:
This shouldn't be necessary because of Andrei's patch that allows you to
configure the max recursion depth through a ini setting.
Also, this patch will make pcre much slower (it will do thousands of
malloc's).
Nuno
- Original Message -
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack overflow
crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5&r2=1.4.2.5.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
-
"-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10
-DMATCH_LIMIT=1000 -DMATCH_LIMIT_RECURSION=1000 -Iext/pcre/pcrelib");
+
"-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10
-DMATCH_LIMIT=1000 -DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c
pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c
pcre_maketables.c pcre_ord2utf8.c pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c pcre_version.c
pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
I belive its better to have slower pcre than having php crash left and
right. Stack usage of php-5.1+ is so huge pcre becomes a real stability
issue due.
Edin
Nuno Lopes wrote:
This shouldn't be necessary because of Andrei's patch that allows you to
configure the max recursion depth through a ini setting.
Also, this patch will make pcre much slower (it will do thousands of
malloc's).
Nuno
- Original Message -
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack
overflow crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5&r2=1.4.2.5.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
- "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -Iext/pcre/pcrelib");
+ "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c
pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c
pcre_maketables.c pcre_ord2utf8.c pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c pcre_version.c
pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
This shouldn't be necessary because of Andrei's patch that allows you to
configure the max recursion depth through a ini setting.
Also, this patch will make pcre much slower (it will do thousands of
malloc's).
Nuno
- Original Message -
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack overflow
crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5&r2=1.4.2.5.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
-
"-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10
-DMATCH_LIMIT=1000 -DMATCH_LIMIT_RECURSION=1000 -Iext/pcre/pcrelib");
+
"-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10
-DMATCH_LIMIT=1000 -DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c pcre_ucp_searchfuncs.c
pcre_compile.c pcre_config.c pcre_dfa_exec.c pcre_exec.c pcre_fullinfo.c
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_ord2utf8.c
pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32
edink Thu May 18 21:50:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32
Log:
Use heap insted of stack for recursion in hope of avoid stack overflow crashes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5&r2=1.4.2.5.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5 Mon Mar 6 22:49:16 2006
+++ php-src/ext/pcre/config.w32 Thu May 18 21:50:51 2006
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5 2006/03/06 22:49:16 sebastian Exp $
+// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
- "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -Iext/pcre/pcrelib");
+ "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000
-DMATCH_LIMIT_RECURSION=1000 -DNO_RECURSE -Iext/pcre/pcrelib");
ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
