From dc71842cee7908c34e64a99087433333e4a85a9c Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Mon, 1 Oct 2007 18:45:06 +0000
Subject: [PATCH] Revert to apr_psprintf (vs apr_pstrcat) to get around what
 appears to be an apr bug with FC4.

---
 apache2/re.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apache2/re.c b/apache2/re.c
index 2d9eb4df..aa4d7eb9 100644
--- a/apache2/re.c
+++ b/apache2/re.c
@@ -1295,7 +1295,9 @@ static int execute_operator(msre_var *var, msre_rule *rule, modsec_rec *msr,
                                     var->name, var->param);
     }
     else if ((var->name != NULL) && var->is_counting && (*var->name != '&')) {
-        full_varname = apr_pstrcat(mptmp, "&", var->name);
+        // TODO: This fails (sigsegv) on FC4, but apr_psprintf works
+        //full_varname = apr_pstrcat(mptmp, "&", var->name);
+        full_varname = apr_psprintf(mptmp, "&%s", var->name);
     }
     else {
         full_varname = var->name;