mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 00:20:40 -04:00
76ea697dac
- update backports patch to latest version (20120504) - align pathnames in slave ports - bump PORTREVISION The only drawback of this change is that now for building of every slave port (php extension) we extracting full php52 source tree. Apologies that it took that long. PR: 164849 Submitted by: Svyatoslav Lempert <svyatoslav.lempert at gmail dot com> Approved by: Alex Keda <admin at lissyara dot su> Security: 60de13d5-95f0-11e1-806a-001143cd36d8
34 lines
1.2 KiB
C
34 lines
1.2 KiB
C
--- ext/pcre/php_pcre.c.orig 2009-03-06 10:58:43.000000000 +0100
|
|
+++ ext/pcre/php_pcre.c 2009-03-06 10:58:56.000000000 +0100
|
|
@@ -18,6 +18,10 @@
|
|
|
|
/* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */
|
|
|
|
+#ifdef HAVE_CONFIG_H
|
|
+#include "config.h"
|
|
+#endif
|
|
+
|
|
#include "php.h"
|
|
#include "php_ini.h"
|
|
#include "php_globals.h"
|
|
@@ -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 +253,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
|