diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-11 10:57:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-11 10:57:18 -0300 |
| commit | c07ca5cb71d277e9f2fd5c7b94cf8a0021bdfab5 (patch) | |
| tree | d9d528762b726855cc356781c89abb1768c8be28 /testing/php/pcre_info.patch | |
| parent | ece2137c9569ec806aacf3740df98c399a51b21a (diff) | |
| parent | 8119da2eaadf53531cad2aed70981ed4606340d6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/sword/PKGBUILD
community/freedroidrpg/PKGBUILD
community/pgadmin3/PKGBUILD
libre/lame-libre/PKGBUILD
testing/dbus-core/PKGBUILD
testing/libwebkit/PKGBUILD
testing/tracker/PKGBUILD
testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
testing/udev/0002-reinstate-TIMEOUT-handling.patch
testing/udev/PKGBUILD
Diffstat (limited to 'testing/php/pcre_info.patch')
| -rw-r--r-- | testing/php/pcre_info.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/testing/php/pcre_info.patch b/testing/php/pcre_info.patch new file mode 100644 index 000000000..e6d10df06 --- /dev/null +++ b/testing/php/pcre_info.patch @@ -0,0 +1,43 @@ +--- php-5.3.10/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100 +@@ -241,6 +241,7 @@ + char *pattern; + int do_study = 0; + int poptions = 0; ++ int count = 0; + unsigned const char *tables = NULL; + #if HAVE_SETLOCALE + char *locale = setlocale(LC_CTYPE, NULL); +@@ -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, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { + zend_hash_clean(&PCRE_G(pcre_cache)); + } else { + #if HAVE_SETLOCALE +--- php-5.3.10/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100 +@@ -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 +--- php-5.3.10/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100 +@@ -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 |