Update SVN eol properties to 'native'.

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
+ * Fixed multiple warnings on Solaris and/or 64bit builds.
------------------------
-
- * Fix warnings on Solaris and/or 64bit builds.
-
-
-25 Oct 2007 - 2.1.4-rc2
------------------------
 
  * Do not process subrequests in phase 2-4, but do hand off the request data.
 
-
+ * Fixed a blocking FP in the multipart parser, which affected Safari.
-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.
 
 
 11 Sep 2007 - 2.1.3

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}

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

doc/modsecurity2-apache-reference.xml

@@ -3,7 +3,7 @@
   <title>ModSecurity Reference Manual</title>
 
   <articleinfo>
-    <releaseinfo>Version 2.1.4-rc4 / (November 9, 2007)</releaseinfo>
+    <releaseinfo>Version 2.1.4 / (November 27, 2007)</releaseinfo>
 
     <copyright>
       <year>2004-2007</year>
@@ -318,6 +318,11 @@
         <para>Edit Makefile to configure the correct include path for libxml
         (for example: <filename
         moreinfo="none">INCLUDES=-I/usr/include/libxml2</filename>)</para>
+        <para>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.</para>
       </listitem>
 
       <listitem>
@@ -978,7 +983,7 @@ SecAuditLogStorageDir logs/audit
 
       <para>The default value is:</para>
 
-      <programlisting format="linespecific">SecDefaultAction log,auditlog,deny,status:403,phase:2,t:none</programlisting>
+      <programlisting format="linespecific">SecDefaultAction log,auditlog,deny,status:403,phase:2,t:lowercase,t:replaceNulls,t:compressWhitespace</programlisting>
 
       <para><emphasis role="bold">Note</emphasis></para>