Update to 4.3.6 release.

- Fix build curl dependency
- Fix (hopefully) the core dump on apache restart
- Fix DaylightSavingTime issue
This commit is contained in:
Alex Dupre 2004-04-16 07:44:34 +00:00
parent d0624ee2f2
commit 02020776c8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=107196
3 changed files with 47 additions and 4 deletions

View File

@ -20,8 +20,7 @@
#
PORTNAME= php4
PORTVERSION= 4.3.5
PORTREVISION= 7
PORTVERSION= 4.3.6
CATEGORIES?= lang devel www
MASTER_SITES= http://www.php.net/distributions/:release \
http://it.php.net/distributions/:release \

View File

@ -1,2 +1,2 @@
MD5 (php-4.3.5.tar.bz2) = 29e61c125ac6278897c6c219f5d100d1
SIZE (php-4.3.5.tar.bz2) = 3947414
MD5 (php-4.3.6.tar.bz2) = 79cde484e31871176137eb78014657fa
SIZE (php-4.3.6.tar.bz2) = 3957796

View File

@ -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,