- fix for pcre 8.30 (do not use pcre_info deprecated 12 years ago)

Changed files:
    bug-60986.patch -> 1.1

diff --git a/bug-60986.patch b/bug-60986.patch
new file mode 100644 (file)
index 0000000..f29c317
--- /dev/null
+++ b/bug-60986.patch
@@ -0,0 +1,44 @@
+--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c   2012/02/06 17:57:47     323095
++++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c   2012/02/06 18:11:56     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
+--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def 2012/02/06 17:57:47     323095
++++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def 2012/02/06 18:11:56     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
+--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c   2012/02/06 18:11:56     323096
++++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c   2012/02/06 18:18:53     323097
+@@ -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);
+@@ -255,7 +256,7 @@
+                * 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_fullinfo(pce->re, NULL, 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