mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Fix for bug 60986
This commit is contained in:
parent
2500b7e5ba
commit
0f0261e0b7
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user