diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2012-02-06 18:11:56 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2012-02-06 18:11:56 +0000 |
| commit | 0f6e3408db4d8fd96e24459389b06dc7a6e40ee2 (patch) | |
| tree | 41d86a63b9daa7e68f9d192a041ecf222df32676 /ext/pcre | |
| parent | d00be8ce0bfc67ad928dc0d66b5ab26db2c84542 (diff) | |
| download | php-git-0f6e3408db4d8fd96e24459389b06dc7a6e40ee2.tar.gz | |
Fix for bug 60986
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/php_pcre.c | 4 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.def | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 940d856c98..f7d04049b4 100644 --- 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 0e49897662..769b06428a 100644 --- 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 |