backport r631342 from trunk (mod_ext_filter command_rec usage)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@654333 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 01277aa5ce30a7d1645a9e502fdd623a767c940f..89df53a122e07af6635254bac61c7c4dd56e8dd1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,11 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      trunk patch applies
    +1: trawick, covener, niq
 
- * mod_ext_filter: Include recently added TranslateAllMimeTypes option 
-   to this AP_INIT_ITERATE parameter (the help message parameter)
-      http://svn.apache.org/viewvc?rev=631342&view=rev
-   +1: covener, trawick, rpluem
-
  * mod_headers: Add merge option to avoid duplicate values within
    the same header.
    Trunk version of patch:

diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c
index 079876b1d54c17b183ba2f3047adcebe36159576..a44ecc33f287b0db3326517de9e81e0117212366 100644 (file)
--- a/modules/filters/mod_charset_lite.c
+++ b/modules/filters/mod_charset_lite.c
@@ -1102,7 +1102,8 @@ static const command_rec cmds[] =
                     add_charset_options,
                     NULL,
                     OR_FILEINFO,
-                    "valid options: ImplicitAdd, NoImplicitAdd, DebugLevel=n"),
+                    "valid options: ImplicitAdd, NoImplicitAdd, TranslateAllMimeTypes, "
+                    "NoTranslateAllMimeTypes, DebugLevel=n"),
     {NULL}
 };