From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 23 Jul 2014 21:15:06 +0000 (+0000)
Subject: Re-introduce check for sufficient PCRE version.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc1045b665d1c99354b0fec375151fb804037a9e;p=thirdparty%2Fapache%2Fhttpd.git

Re-introduce check for sufficient PCRE version.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612945 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util_pcre.c b/server/util_pcre.c
index 22eb33cf663..3e4fbb94443 100644
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -48,6 +48,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "apr_tables.h"
 #include "pcre.h"
 
+/* PCRE_DUPNAMES is only present since version 6.7 of PCRE */
+#ifndef PCRE_DUPNAMES
+#error PCRE Version 6.7 or later required!
+#else
+
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
@@ -308,4 +313,6 @@ AP_DECLARE(int) ap_regname(const ap_regex_t *preg,
     return namecount;
 }
 
+#endif /* PCRE_DUPNAMES defined */
+
 /* End of pcreposix.c */