testing/apache/pcre_info.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

--- httpd-2.2.22/server/util_pcre.c	2005-11-10 16:20:05.000000000 +0100
+++ httpd-2.2.22/server/util_pcre.c	2012-02-08 11:23:56.273855663 +0100
@@ -128,6 +128,7 @@
 const char *errorptr;
 int erroffset;
 int options = 0;
+int nsub;
 
 if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
 if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
@@ -136,8 +137,9 @@
 preg->re_erroffset = erroffset;
 
 if (preg->re_pcre == NULL) return AP_REG_INVARG;
-
-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
+               PCRE_INFO_CAPTURECOUNT, &nsub);
+preg->re_nsub = nsub;
 return 0;
 }