diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-05-04 20:00:41 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-05-04 20:00:41 +0000 |
commit | b2c353d874b85e06f355a9419852e2616613c7d0 (patch) | |
tree | f0773e0a930d308198ef5036d4f74e7f53015e6e /extra/php | |
parent | 0a24fb835cac4007388213ad0afb15257b035b14 (diff) |
Fri May 4 20:00:31 UTC 2012
Diffstat (limited to 'extra/php')
-rw-r--r-- | extra/php/pcre_info.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/extra/php/pcre_info.patch b/extra/php/pcre_info.patch deleted file mode 100644 index e6d10df06..000000000 --- a/extra/php/pcre_info.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 |