diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-12 20:16:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-12 20:48:02 +0000 |
| commit | bb9bbcea206a3a0cb154396b6c61f1f71527aa5c (patch) | |
| tree | b2e4887e848003025e6bc65373d9989bd99b07bb /main/apache2/httpd-2.2.22-pcre830.patch | |
| parent | 2d43d0722559ba3012bd5419919fc7f05aadf8cb (diff) | |
| download | aports-bb9bbcea206a3a0cb154396b6c61f1f71527aa5c.tar.bz2 aports-bb9bbcea206a3a0cb154396b6c61f1f71527aa5c.tar.xz | |
main/apache2: rebuild against pcre-8.30
Diffstat (limited to 'main/apache2/httpd-2.2.22-pcre830.patch')
| -rw-r--r-- | main/apache2/httpd-2.2.22-pcre830.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/main/apache2/httpd-2.2.22-pcre830.patch b/main/apache2/httpd-2.2.22-pcre830.patch new file mode 100644 index 0000000000..6942a80d66 --- /dev/null +++ b/main/apache2/httpd-2.2.22-pcre830.patch @@ -0,0 +1,24 @@ + +http://svn.apache.org/viewvc?view=revision&revision=r1243176 + +--- httpd-2.2.22/server/util_pcre.c.pcre830 ++++ httpd-2.2.22/server/util_pcre.c +@@ -128,6 +128,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *p + 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; +@@ -137,7 +138,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; + } + |