clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug 60986

Browse Source
This commit is contained in:
Rasmus Lerdorf 2012-02-06 18:11:56 +00:00
parent 2500b7e5ba
commit 0f0261e0b7
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/pcre/php_pcre.c
View File

@ -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

1
ext/pcre/php_pcre.def
View File

@ -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

1
main/php_compat.h
View File

@ -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