Permalink
Browse files

Fix for bug 60986

  • Loading branch information...
rlerdorf committed Feb 6, 2012
1 parent d00be8c commit 0f6e3408db4d8fd96e24459389b06dc7a6e40ee2
Showing with 2 additions and 4 deletions.
  1. +2 −2 ext/pcre/php_pcre.c
  2. +0 −1 ext/pcre/php_pcre.def
  3. +0 −1 main/php_compat.h
View
@@ -252,10 +252,10 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_le
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) {
+ if (pcre_fullinfo(pce->re, NULL, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(&PCRE_G(pcre_cache));
} else {
#if HAVE_SETLOCALE
View
@@ -4,7 +4,6 @@ php_pcre_copy_substring
php_pcre_exec
php_pcre_get_substring
php_pcre_get_substring_list
-php_pcre_info
php_pcre_maketables
php_pcre_study
php_pcre_version
View
@@ -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

0 comments on commit 0f6e340

Please sign in to comment.