diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2004-04-16 07:44:34 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2004-04-16 07:44:34 +0000 |
| commit | 02020776c8aeba9b80382f3e2ba426bb7f20da4e (patch) | |
| tree | 9df7b007e01147f2cc38bc16a823cb875efd5912 /lang/php4/files | |
| parent | Use a copy of libpng shipped with rrdtool. This fixes build with ancient (diff) | |
Update to 4.3.6 release.
- Fix build curl dependency
- Fix (hopefully) the core dump on apache restart
- Fix DaylightSavingTime issue
Notes
Notes:
svn path=/head/; revision=107196
Diffstat (limited to 'lang/php4/files')
| -rw-r--r-- | lang/php4/files/patch-ext::pcre::php_pcre.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/lang/php4/files/patch-ext::pcre::php_pcre.c b/lang/php4/files/patch-ext::pcre::php_pcre.c new file mode 100644 index 000000000000..c9efc2e0d480 --- /dev/null +++ b/lang/php4/files/patch-ext::pcre::php_pcre.c @@ -0,0 +1,44 @@ +--- ext/pcre/php_pcre.c.orig Fri Apr 16 09:21:14 2004 ++++ ext/pcre/php_pcre.c Fri Apr 16 09:23:36 2004 +@@ -106,15 +106,6 @@ + REGISTER_LONG_CONSTANT("PREG_SPLIT_DELIM_CAPTURE", PREG_SPLIT_DELIM_CAPTURE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PREG_SPLIT_OFFSET_CAPTURE", PREG_SPLIT_OFFSET_CAPTURE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PREG_GREP_INVERT", PREG_GREP_INVERT, CONST_CS | CONST_PERSISTENT); +- +- pcre_malloc = php_pcre_malloc; +- pcre_free = php_pcre_free; +- +-#ifdef NO_RECURSE +- pcre_stack_malloc = php_pcre_malloc; +- pcre_stack_free = php_pcre_free; +-#endif +- + return SUCCESS; + } + /* }}} */ +@@ -130,6 +121,16 @@ + } + /* }}} */ + ++/* {{{ PHP_RINIT_FUNCTION(pcre) */ ++static PHP_RINIT_FUNCTION(pcre) ++{ ++ pcre_malloc = php_pcre_malloc; ++ pcre_free = php_pcre_free; ++ ++ return SUCCESS; ++} ++/* }}} */ ++ + /* {{{ pcre_get_compiled_regex + */ + PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options) { +@@ -1527,7 +1528,7 @@ + pcre_functions, + PHP_MINIT(pcre), + PHP_MSHUTDOWN(pcre), +- NULL, ++ PHP_RINIT(pcre), + NULL, + PHP_MINFO(pcre), + NO_VERSION_YET, |