rasmus Fri Apr 23 14:08:58 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/pcre php_pcre.c
Log:
MFB: Fix for bug #27810
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1692&r2=1.1693&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1692 php-src/NEWS:1.1693
--- php-src/NEWS:1.1692 Fri Apr 23 09:28:05 2004
+++ php-src/NEWS Fri Apr 23 14:08:57 2004
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ????? 2004, PHP 5 Release Candidate 2
+- Fix for bug #27810 (Joe Orton)
- Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance.
(Dmitry, Andi)
- Moved yaz extension to PECL. (Wez)
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.155&r2=1.156&ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.155 php-src/ext/pcre/php_pcre.c:1.156
--- php-src/ext/pcre/php_pcre.c:1.155 Sun Feb 1 03:34:47 2004
+++ php-src/ext/pcre/php_pcre.c Fri Apr 23 14:08:58 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.155 2004/02/01 08:34:47 sebastian Exp $ */
+/* $Id: php_pcre.c,v 1.156 2004/04/23 18:08:58 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -47,20 +47,6 @@
ZEND_DECLARE_MODULE_GLOBALS(pcre)
-
-static void *php_pcre_malloc(size_t size)
-{
- return pemalloc(size, 1);
-}
-
-
-static void php_pcre_free(void *ptr)
-{
- if (ptr)
- pefree(ptr, 1);
-}
-
-
static void php_free_pcre_cache(void *data)
{
pcre_cache_entry *pce = (pcre_cache_entry *) data;
@@ -107,14 +93,6 @@
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;
}
/* }}} */
@@ -560,7 +538,7 @@
}
}
- php_pcre_free((void *) stringlist);
+ pcre_free((void *) stringlist);
}
}
else { /* Failed to match */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
