From 6f548e91f73c108967df89d220ad1e4f1a4d0cdc Mon Sep 17 00:00:00 2001 From: b1v1r Date: Fri, 5 Feb 2010 19:11:38 +0000 Subject: [PATCH] Fixed bad merge in CHANGES. --- CHANGES | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/CHANGES b/CHANGES index 5727fbf7..4422f63a 100644 --- a/CHANGES +++ b/CHANGES @@ -26,6 +26,29 @@ pave support for allowing access to all ModSecurity variables from mog_log_config. [Ivan Ristic] + * Added the URLENCODED_ERROR flag, which is raised whenever invalid URL + encoding is encountered in the query string or in the request body + (but only if URLENCODED request body processor is used). (MODSEC-111) + [Ivan Ristic] + + * Removed the obsolete PDF UXSS functionality. (MODSEC-96) [Ivan Ristic] + + * Renamed normalisePath to normalizePath and normalisePathWin to + normalizePathWin. Kept the previous names for backward compatibility. + (MODSEC-103) [Ivan Ristic] + + * Moved phase 1 to be run in the same Apache hook as phase 2. This means + that you can now have phase 1 rules in tags and, more + importantly, override server configuration in and others. + (MODSEC-98) [Ivan Ristic] + + * Renamed the sanitise family of actiont to sanitize. Kept the old variants + for backward compatibility. (MODSEC-95) [Ivan Ristic] + + * Improve the logging of the ctl action. (MODSEC-99) [Ivan Ristic] + + * Cleanup build files that were from the Apache source. + 04 Feb 2010 - 2.5.12 -------------------- @@ -76,32 +99,9 @@ * Fixed SecAction not working when CONNECT request method is used (MODSEC-110). [Ivan Ristic] - * Added the URLENCODED_ERROR flag, which is raised whenever invalid URL - encoding is encountered in the query string or in the request body - (but only if URLENCODED request body processor is used). (MODSEC-111) - [Ivan Ristic] - - * Removed the obsolete PDF UXSS functionality. (MODSEC-96) [Ivan Ristic] - - * Renamed normalisePath to normalizePath and normalisePathWin to - normalizePathWin. Kept the previous names for backward compatibility. - (MODSEC-103) [Ivan Ristic] - - * Moved phase 1 to be run in the same Apache hook as phase 2. This means - that you can now have phase 1 rules in tags and, more - importantly, override server configuration in and others. - (MODSEC-98) [Ivan Ristic] - - * Renamed the sanitise family of actiont to sanitize. Kept the old variants - for backward compatibility. (MODSEC-95) [Ivan Ristic] - - * Improve the logging of the ctl action. (MODSEC-99) [Ivan Ristic] - * Do not escape quotes in macro resolution and only escape NUL in setenv values. - * Cleanup build files that were from the Apache source. - 04 Nov 2009 - 2.5.11 --------------------