rasmus Mon, 06 Feb 2012 18:11:56 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323096
Log: Fix for bug 60986 Bug: https://bugs.php.net/60986 (Critical) pcre_get_compiled_regex_cache: php_pcre.c: undefined reference to 'pcre_info' Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c U php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def U php/php-src/branches/PHP_5_3/main/php_compat.h U php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c U php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def U php/php-src/branches/PHP_5_4/main/php_compat.h U php/php-src/trunk/ext/pcre/php_pcre.c U php/php-src/trunk/ext/pcre/php_pcre.def U php/php-src/trunk/main/php_compat.h Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c 2012-02-06 18:11:56 UTC (rev 323096) @@ -252,10 +252,10 @@ 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 Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def =================================================================== --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def 2012-02-06 18:11:56 UTC (rev 323096) @@ -4,7 +4,6 @@ php_pcre_exec php_pcre_get_substring php_pcre_get_substring_list -php_pcre_info php_pcre_maketables php_pcre_study php_pcre_version Modified: php/php-src/branches/PHP_5_3/main/php_compat.h =================================================================== --- php/php-src/branches/PHP_5_3/main/php_compat.h 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/branches/PHP_5_3/main/php_compat.h 2012-02-06 18:11:56 UTC (rev 323096) @@ -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 Modified: php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.c 2012-02-06 18:11:56 UTC (rev 323096) @@ -252,10 +252,10 @@ 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 Modified: php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def =================================================================== --- php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/branches/PHP_5_4/ext/pcre/php_pcre.def 2012-02-06 18:11:56 UTC (rev 323096) @@ -4,7 +4,6 @@ php_pcre_exec php_pcre_get_substring php_pcre_get_substring_list -php_pcre_info php_pcre_maketables php_pcre_study php_pcre_version Modified: php/php-src/branches/PHP_5_4/main/php_compat.h =================================================================== --- php/php-src/branches/PHP_5_4/main/php_compat.h 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/branches/PHP_5_4/main/php_compat.h 2012-02-06 18:11:56 UTC (rev 323096) @@ -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 Modified: php/php-src/trunk/ext/pcre/php_pcre.c =================================================================== --- php/php-src/trunk/ext/pcre/php_pcre.c 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/trunk/ext/pcre/php_pcre.c 2012-02-06 18:11:56 UTC (rev 323096) @@ -252,10 +252,10 @@ 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 Modified: php/php-src/trunk/ext/pcre/php_pcre.def =================================================================== --- php/php-src/trunk/ext/pcre/php_pcre.def 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/trunk/ext/pcre/php_pcre.def 2012-02-06 18:11:56 UTC (rev 323096) @@ -4,7 +4,6 @@ php_pcre_exec php_pcre_get_substring php_pcre_get_substring_list -php_pcre_info php_pcre_maketables php_pcre_study php_pcre_version Modified: php/php-src/trunk/main/php_compat.h =================================================================== --- php/php-src/trunk/main/php_compat.h 2012-02-06 17:57:47 UTC (rev 323095) +++ php/php-src/trunk/main/php_compat.h 2012-02-06 18:11:56 UTC (rev 323096) @@ -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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
