[arch-commits] Commit in php/trunk (PKGBUILD pcre_info.patch)
Pierre Schmitz
pierre at archlinux.org
Mon Feb 6 19:14:01 UTC 2012
Date: Monday, February 6, 2012 @ 14:14:01
Author: pierre
Revision: 149319
Fix pcre_info patch
See https://bugs.php.net/bug.php?id=60986
Modified:
php/trunk/PKGBUILD
php/trunk/pcre_info.patch
-----------------+
PKGBUILD | 4 ++--
pcre_info.patch | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-02-06 19:13:03 UTC (rev 149318)
+++ PKGBUILD 2012-02-06 19:14:01 UTC (rev 149319)
@@ -23,7 +23,7 @@
'php-xsl')
pkgver=5.3.10
_suhosinver=5.3.9-0.9.10
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -44,7 +44,7 @@
'b01be5f816988fcee7e78225836e5e27'
'740ec5fe2ecfd9d7febd4081c90ec65b'
'07c4e412909ac65a44ec90e7a2c4bade'
- '7ccc77d2446ae660dabefceae1fc4940')
+ '8d3806bbb19e390f9b32ccf21611d937')
build() {
phpconfig="--srcdir=../${pkgbase}-${pkgver} \
Modified: pcre_info.patch
===================================================================
--- pcre_info.patch 2012-02-06 19:13:03 UTC (rev 149318)
+++ pcre_info.patch 2012-02-06 19:14:01 UTC (rev 149319)
@@ -1,5 +1,13 @@
--- 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) {
@@ -9,7 +17,7 @@
* 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) {
++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(&PCRE_G(pcre_cache));
} else {
#if HAVE_SETLOCALE
More information about the arch-commits
mailing list