diff options
Diffstat (limited to 'extra/apache/pcre_info.patch')
| -rw-r--r-- | extra/apache/pcre_info.patch | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch index f1774db63..906a3159e 100644 --- a/extra/apache/pcre_info.patch +++ b/extra/apache/pcre_info.patch @@ -1,11 +1,22 @@ ---- httpd-2.2.22/server/util_pcre.c 2005-11-11 01:20:05.000000000 +1000 -+++ httpd-2.2.22/server/util_pcre.c 2012-02-06 23:45:37.687946748 +1000 -@@ -137,7 +137,7 @@ +--- 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 (preg->re_pcre == NULL) return AP_REG_INVARG; + 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); -+preg->re_nsub = pcre_fullinfo((const pcre *)preg->re_pcre, NULL, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &nsub); ++preg->re_nsub = nsub; return 0; } |