37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
--- php-5.2.17/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100
|
|
+++ php-5.2.17/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100
|
|
@@ -252,10 +252,11 @@
|
|
back the compiled pattern, otherwise go on and compile it. */
|
|
if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
|
|
/*
|
|
- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
|
|
+ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
|
|
* is, we flush it and compile the pattern from scratch.
|
|
*/
|
|
- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
|
|
+ int count = 0;
|
|
+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
|
|
zend_hash_clean(&PCRE_G(pcre_cache));
|
|
} else {
|
|
#if HAVE_SETLOCALE
|
|
--- php-5.2.17/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100
|
|
+++ php-5.2.17/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100
|
|
@@ -4,7 +4,6 @@
|
|
php_pcre_exec
|
|
php_pcre_get_substring
|
|
php_pcre_get_substring_list
|
|
-php_pcre_info
|
|
php_pcre_maketables
|
|
php_pcre_study
|
|
php_pcre_version
|
|
--- php-5.2.17/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100
|
|
+++ php-5.2.17/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100
|
|
@@ -34,7 +34,6 @@
|
|
#define pcre_exec php_pcre_exec
|
|
#define pcre_get_substring php_pcre_get_substring
|
|
#define pcre_get_substring_list php_pcre_get_substring_list
|
|
-#define pcre_info php_pcre_info
|
|
#define pcre_maketables php_pcre_maketables
|
|
#define pcre_study php_pcre_study
|
|
#define pcre_version php_pcre_version
|