Move two variable assignments off the fast path.

[apache] / server / util_pcre.c

diff --git a/server/util_pcre.c b/server/util_pcre.c
index 4d2adef25b67d20f430a568808d2d5eca5ccbd5c..e90408e0c9367f6186f1aa378008ee21e23adc43 100644 (file)
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -125,7 +125,12 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)
     const char *errorptr;
     int erroffset;
     int errcode = 0;
+    /* PCRE_DUPNAMES is only present in more recent versions of PCRE */
+#ifdef PCRE_DUPNAMES
     int options = PCRE_DUPNAMES;
+#else
+#error PCRE_DUPNAMES does not exist in this PCRE implementation; too old.
+#endif
 
     if ((cflags & AP_REG_ICASE) != 0)
         options |= PCRE_CASELESS;