From 51a5418b4bade7fea62d25de94640c99238d0379 Mon Sep 17 00:00:00 2001 From: brectanus Date: Thu, 5 Apr 2007 15:13:22 +0000 Subject: [PATCH] Update changes to reflect merges into 2.1.x branch --- CHANGES | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index e079ce7b..a659a5d4 100644 --- a/CHANGES +++ b/CHANGES @@ -2,12 +2,6 @@ ?? ??? 2007 - trunk ------------------- -* Add the PCRE_DOLLAR_ENDONLY option when compiling regular expression - for the @rx operator and variables. - -* Really set PCRE_DOTALL option when compiling the regular expression - for the @rx operator as the docs state. - * Removed CGI style HTTP_* variables in favor of REQUEST_HEADERS:Header-Name. * Store filename/line for each rule and display it and the ID (if available) @@ -25,6 +19,16 @@ and/or counting operator in the debug log. +04 Apr 2007 - 2.1.1-rc2 +----------------------- + + * Add the PCRE_DOLLAR_ENDONLY option when compiling regular expression + for the @rx operator and variables. + + * Really set PCRE_DOTALL option when compiling the regular expression + for the @rx operator as the docs state. + + 11 Mar 2007 - 2.1.1-rc1 -----------------------