Fix for bug 60986

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 17418435ab28e48a6e4f0beba2d17c63eccccfa2..fc96ef6bef966460ffc26150a9f629c4b0b11f80 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -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

diff --git a/ext/pcre/php_pcre.def b/ext/pcre/php_pcre.def
index 0e49897662a136834f6af2aba811838d758f2287..769b06428aab35f69c2de715f6df20a41da656fa 100644 (file)
--- a/ext/pcre/php_pcre.def
+++ b/ext/pcre/php_pcre.def
@@ -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

diff --git a/main/php_compat.h b/main/php_compat.h
index 0163844eba50a40a585ecce69d52059d4be71ac2..80f43d4ee26ada1608b20763d567981ba0a79047 100644 (file)
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -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