]>
Commit | Line | Data |
---|---|---|
26216b81 | 1 | --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c 2012/02/06 17:57:47 323095 |
2 | +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c 2012/02/06 18:11:56 323096 | |
3 | @@ -252,10 +252,10 @@ | |
4 | back the compiled pattern, otherwise go on and compile it. */ | |
5 | if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { | |
6 | /* | |
7 | - * We use a quick pcre_info() check to see whether cache is corrupted, and if it | |
8 | + * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it | |
9 | * is, we flush it and compile the pattern from scratch. | |
10 | */ | |
11 | - if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { | |
12 | + if (pcre_fullinfo(pce->re, NULL, NULL, NULL) == PCRE_ERROR_BADMAGIC) { | |
13 | zend_hash_clean(&PCRE_G(pcre_cache)); | |
14 | } else { | |
15 | #if HAVE_SETLOCALE | |
16 | --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def 2012/02/06 17:57:47 323095 | |
17 | +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def 2012/02/06 18:11:56 323096 | |
18 | @@ -4,7 +4,6 @@ | |
19 | php_pcre_exec | |
20 | php_pcre_get_substring | |
21 | php_pcre_get_substring_list | |
22 | -php_pcre_info | |
23 | php_pcre_maketables | |
24 | php_pcre_study | |
25 | php_pcre_version | |
26 | --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c 2012/02/06 18:11:56 323096 | |
27 | +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c 2012/02/06 18:18:53 323097 | |
28 | @@ -241,6 +241,7 @@ | |
29 | char *pattern; | |
30 | int do_study = 0; | |
31 | int poptions = 0; | |
32 | + int count = 0; | |
33 | unsigned const char *tables = NULL; | |
34 | #if HAVE_SETLOCALE | |
35 | char *locale = setlocale(LC_CTYPE, NULL); | |
36 | @@ -255,7 +256,7 @@ | |
37 | * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it | |
38 | * is, we flush it and compile the pattern from scratch. | |
39 | */ | |
40 | - if (pcre_fullinfo(pce->re, NULL, NULL, NULL) == PCRE_ERROR_BADMAGIC) { | |
41 | + if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { | |
42 | zend_hash_clean(&PCRE_G(pcre_cache)); | |
43 | } else { | |
44 | #if HAVE_SETLOCALE |