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
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) {
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.
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));
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
20 php_pcre_get_substring
21 php_pcre_get_substring_list
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
33 unsigned const char *tables = NULL;
35 char *locale = setlocale(LC_CTYPE, NULL);
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.
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));