From 8c57a463516776d4a5071109a57bdd4817db149a Mon Sep 17 00:00:00 2001 From: brectanus Date: Tue, 27 Nov 2007 18:37:37 +0000 Subject: [PATCH] Update SVN eol properties to 'native'. --- CHANGES | 25 +++++++------------------ apache2/Makefile | 7 ++++++- apache2/modsecurity.h | 2 +- doc/modsecurity2-apache-reference.xml | 9 +++++++-- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index d027081f..4a1233e1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,27 +1,16 @@ -09 Nov 2007 - 2.1.4-rc4 ------------------------ +27 Nov 2007 - 2.1.4 +------------------- - * Fix for an evasion FP, mistaking a multipart non-boundary for a boundary. + * Updated included Core Ruleset to version 1.5 and noted in the docs that + XML support is required to use the rules without modification. + * Fixed an evasion FP, mistaking a multipart non-boundary for a boundary. -06 Nov 2007 - 2.1.4-rc3 ------------------------ - - * Fix warnings on Solaris and/or 64bit builds. - - -25 Oct 2007 - 2.1.4-rc2 ------------------------ + * Fixed multiple warnings on Solaris and/or 64bit builds. * Do not process subrequests in phase 2-4, but do hand off the request data. - -15 Oct 2007 - 2.1.4-rc1 ------------------------ - - * Do not process subrequests in phase 2-4. - - * Fix a blocking FP in the multipart parser, which affected Safari. + * Fixed a blocking FP in the multipart parser, which affected Safari. 11 Sep 2007 - 2.1.3 diff --git a/apache2/Makefile b/apache2/Makefile index 9180a099..7924cbdf 100644 --- a/apache2/Makefile +++ b/apache2/Makefile @@ -17,7 +17,7 @@ builddir = . # Debian - /usr/share/apache2 (apache2-prefork-dev or apache2-threaded-dev # needed, depending on your installation type) # -# NOTE: On Solaris the top_builddir is /var/apache2. This version of Apache +# On Solaris the top_builddir is /var/apache2. This version of Apache # httpd uses the buildin PCRE, but you must still install the PCRE headers # to compile ModSecurity as they are not installed with Apache httpd. Because # of this, it is recommended to install your own version of Apache httpd. @@ -27,6 +27,11 @@ builddir = . # include directory to the INCLUDES variable below # Something like: -I /path/to/httpd-x.y/srclib/pcre # +# XML Support: Please note that the included Core Ruleset may assume XML +# support is available (-DWITH_LIBXML2). You may have to manually remove any +# XML references in the Core Ruleset if you choose not to include XML support. +# In future versions of ModSecurity XML support will be required. +# top_dir = /usr/local/apache2 top_srcdir = ${top_dir} diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h index ea5cc238..ee795fe6 100644 --- a/apache2/modsecurity.h +++ b/apache2/modsecurity.h @@ -48,7 +48,7 @@ typedef struct msc_string msc_string; #include "http_protocol.h" #define MODULE_NAME "ModSecurity" -#define MODULE_RELEASE "2.1.4-rc4" +#define MODULE_RELEASE "2.1.4" #define MODULE_NAME_FULL (MODULE_NAME " v" MODULE_RELEASE " (Apache 2.x)") #define PHASE_REQUEST_HEADERS 1 diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml index b86deb0f..86d72399 100644 --- a/doc/modsecurity2-apache-reference.xml +++ b/doc/modsecurity2-apache-reference.xml @@ -3,7 +3,7 @@ ModSecurity Reference Manual - Version 2.1.4-rc4 / (November 9, 2007) + Version 2.1.4 / (November 27, 2007) 2004-2007 @@ -318,6 +318,11 @@ Edit Makefile to configure the correct include path for libxml (for example: INCLUDES=-I/usr/include/libxml2) + Please consider XML support required. Note that the ModSecurity + Core rules may assume XML support is available (-DWITH_LIBXML2). You + may have to manually remove any XML references in the Core rules if + you choose not to include XML support. In future versions of + ModSecurity XML support will be required. @@ -978,7 +983,7 @@ SecAuditLogStorageDir logs/audit The default value is: - SecDefaultAction log,auditlog,deny,status:403,phase:2,t:none + SecDefaultAction log,auditlog,deny,status:403,phase:2,t:lowercase,t:replaceNulls,t:compressWhitespace Note