From 45ceff4574c02b6838c173d048d1a63ecf6a2592 Mon Sep 17 00:00:00 2001 From: brenosilva Date: Fri, 30 Sep 2011 21:04:21 +0000 Subject: [PATCH] change release version, doc, CHANGES --- CHANGES | 7 ++ apache2/msc_release.h | 4 +- doc/Reference_Manual.html | 175 ++++++++++++++++++++++++-------------- 3 files changed, 120 insertions(+), 66 deletions(-) diff --git a/CHANGES b/CHANGES index ecabb574..04c54718 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +30 Sep 2011 - 2.6.2 +------------------- + + * Fixed hexDecode test during make. + + * Updated the reference manual into doc/ directory. + 15 Sep 2011 - 2.6.2-rc1 ------------------- diff --git a/apache2/msc_release.h b/apache2/msc_release.h index df581686..4f2094ee 100644 --- a/apache2/msc_release.h +++ b/apache2/msc_release.h @@ -39,8 +39,8 @@ #define MODSEC_VERSION_MAJOR "2" #define MODSEC_VERSION_MINOR "6" #define MODSEC_VERSION_MAINT "2" -#define MODSEC_VERSION_TYPE "-rc" -#define MODSEC_VERSION_RELEASE "1" +#define MODSEC_VERSION_TYPE "" +#define MODSEC_VERSION_RELEASE "" #define MODSEC_VERSION_SUFFIX MODSEC_VERSION_TYPE MODSEC_VERSION_RELEASE diff --git a/doc/Reference_Manual.html b/doc/Reference_Manual.html index cc30b988..2c986c6d 100644 --- a/doc/Reference_Manual.html +++ b/doc/Reference_Manual.html @@ -55,7 +55,7 @@ type="text/css"> var wgUserLanguage = "en"; var wgContentLanguage = "en"; var wgBreakFrames = false; - var wgCurRevisionId = 430; + var wgCurRevisionId = 441; var wgVersion = "1.15.1"; var wgEnableAPI = true; var wgEnableWriteAPI = true; @@ -250,87 +250,89 @@ class="tocnumber">6.21 SecDisableBackendCompression SecGsbLookupDb
  • 6.24 SecGuardianLog
    • +
  • 6.25 + SecHttpBlKey
  • 6.25 SecInterceptOnError
    • -
  • 6.26 +class="tocnumber">6.26 SecInterceptOnError
    • +
  • 6.27 SecMarker
  • 6.27 SecPcreMatchLimit
    • +class="tocnumber">6.28     SecPcreMatchLimit
  • 6.28 SecPcreMatchLimitRecursion
    • -
  • 6.29 +class="tocnumber">6.29 SecPcreMatchLimitRecursion
    • +
  • 6.30 SecPdfProtect
  • 6.30 SecPdfProtectMethod
    • +class="tocnumber">6.31 SecPdfProtectMethod
  • 6.31 SecPdfProtectSecret
    • +class="tocnumber">6.32 SecPdfProtectSecret
  • 6.32 SecPdfProtectTimeout
    • +class="tocnumber">6.33 SecPdfProtectTimeout
  • 6.33 SecPdfProtectTokenName
    • +class="tocnumber">6.34 SecPdfProtectTokenName
  • 6.34 SecReadStateLimit
    • +class="tocnumber">6.35 SecReadStateLimit
  • 6.35 SecWriteStateLimit
    • +class="tocnumber">6.36 SecWriteStateLimit
  • 6.36 SecRequestBodyAccess
    • +class="tocnumber">6.37 SecRequestBodyAccess
  • 6.37 SecRequestBodyInMemoryLimit
    • +class="tocnumber">6.38 SecRequestBodyInMemoryLimit
  • 6.38 SecRequestBodyLimit
    • +class="tocnumber">6.39 SecRequestBodyLimit
  • 6.39 SecRequestBodyNoFilesLimit
    • +class="tocnumber">6.40 SecRequestBodyNoFilesLimit
  • 6.40 SecRequestBodyLimitAction
    • +class="tocnumber">6.41 SecRequestBodyLimitAction
  • 6.41 SecResponseBodyLimit
    • +class="tocnumber">6.42 SecResponseBodyLimit
  • 6.42 SecResponseBodyLimitAction
    • +class="tocnumber">6.43 SecResponseBodyLimitAction
  • 6.43 SecResponseBodyMimeType
    • +class="tocnumber">6.44 SecResponseBodyMimeType
  • 6.44 SecResponseBodyMimeTypesClear
    • +class="tocnumber">6.45 SecResponseBodyMimeTypesClear
  • 6.45 SecResponseBodyAccess
    • -
  • 6.46 +class="tocnumber">6.46 SecResponseBodyAccess
    • +
  • 6.47 SecRule
  • 6.47 SecRuleInheritance
    • -
  • 6.48 +class="tocnumber">6.48 SecRuleInheritance
    • +
  • 6.49 SecRuleEngine
  • 6.49 SecRuleRemoveById
    • +class="tocnumber">6.50 SecRuleRemoveById
  • 6.50 SecRuleRemoveByMsg
    • +class="tocnumber">6.51 SecRuleRemoveByMsg
  • 6.51 SecRuleRemoveByTag
    • -
  • 6.52 +class="tocnumber">6.52 SecRuleRemoveByTag
    • +
  • 6.53 SecRuleScript
  • 6.53 SecRuleUpdateActionById
    • +class="tocnumber">6.54 SecRuleUpdateActionById
  • 6.54 SecRuleUpdateTargetById
    • +class="tocnumber">6.55 SecRuleUpdateTargetById
  • 6.55 SecServerSignature
    • +class="tocnumber">6.56 SecServerSignature
  • 6.56 SecStreamInBodyInspection
    • +class="tocnumber">6.57 SecStreamInBodyInspection
  • 6.57 SecStreamOutBodyInspection
    • -
  • 6.58 +class="tocnumber">6.58 SecStreamOutBodyInspection
    • +
  • 6.59 SecTmpDir
  • 6.59 SecUnicodeMapFile
    • +class="tocnumber">6.60 SecUnicodeMapFile
  • 6.60 SecUnicodeCodePage
    • -
  • 6.61 +class="tocnumber">6.61 SecUnicodeCodePage
    • +
  • 6.62 SecUploadDir
  • 6.62 SecUploadFileLimit
    • +class="tocnumber">6.63 SecUploadFileLimit
  • 6.63 SecUploadFileMode
    • +class="tocnumber">6.64 SecUploadFileMode
  • 6.64 SecUploadKeepFiles
    • -
  • 6.65 +class="tocnumber">6.65 SecUploadKeepFiles
    • +
  • 6.66 SecWebAppId
    • @@ -597,21 +599,25 @@ class="tocnumber">9.17 normalisePathWin< class="tocnumber">9.22 removeWhitespace
  • 9.23 replaceComments
    • -
  • 9.24 +
  • 9.24 removeCommentsChar
    • +
  • 9.25 + removeComments
    • +
  • 9.26 replaceNulls
    • -
  • 9.25 +
  • 9.27 urlDecode
    • -
  • 9.26 +
  • 9.28 urlDecodeUni
    • -
  • 9.27 +
  • 9.29 urlEncode
    • -
  • 9.28 +
  • 9.30 sha1
    • -
  • 9.29 +
  • 9.31 trimLeft
    • -
  • 9.30 +
  • 9.32 trimRight
    • -
  • 9.31 +
  • 9.33 trim
    • @@ -1740,6 +1746,21 @@ detailed instructions), you only need to add one line to your Apache configuration to deploy it: 

    SecGuardianLog |/path/to/httpd-guardian
    +

    SecHttpBlKey

    +

    Description: Configures the user's registered Honeypot Project + HTTP BL API Key to use with @rbl. +

    Syntax: SecHttpBlKey [12 char access key] +

    Example Usage: SecHttpBlKey whdkfieyhtnf +

    Scope: Main +

    Version: 2.7.0 +

    If the @rbl operator uses the dnsbl.httpbl.org RBL (http://www.projecthoneypot.org/httpbl_api.php) you +must provide an API key. This key is registered to individual users and + is included within the RBL DNS requests. +

    SecInterceptOnError

    Description: Configures how to respond when rule processing @@ -2158,8 +2179,8 @@ class="mw-headline"> SecRuleEngine

    SecRuleRemoveById

    @@ -3872,6 +3893,15 @@ compressed). Unterminated comments will also be replaced with a space (ASCII 0x20). However, a standalone termination of a comment (*/) will not be acted upon.

    +

    removeCommentsChar

    +

    Removes common comments chars (/*, */, --, #). +

    +

    removeComments

    +

    Removes each occurrence of comment (/* ... */, --, #). Multiple +consecutive occurrences of which will not be compressed. +

    replaceNulls

    Replaces NUL bytes in input with space characters (ASCII 0x20). @@ -3928,7 +3958,13 @@ does the opposite of blocking. There can only be one disruptive action per rule (if there are multiple disruptive actions present, or inherited, only the last one will take effect), or rule chain (in a chain, a disruptive action can only appear in the first rule). -

  • Non-disruptive actions - Do something, but that +
    • +
    Note 
    Disruptive actions will NOT be executed +if the SecRuleEngine is set to DetectionOnly. If you are creating +exception/whitelisting rules that use the allow action, you should also +add the ctl:ruleEngine=DetectionOnly action to execute the action. +
    + @@ -5875,15 +5922,15 @@ href="http://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Referen src="Reference_Manual_files/poweredby_mediawiki_88x31.png" alt="Powered by MediaWiki"> - +