From: Eric Covener <covener@apache.org>
Date: Thu, 8 May 2008 00:12:57 +0000 (+0000)
Subject: backport r631342 from trunk (mod_ext_filter command_rec usage)
X-Git-Tag: 2.2.9~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef962f774cae4a49a6950f0f57a913e7fa3b52ed;p=thirdparty%2Fapache%2Fhttpd.git

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 01277aa5ce3..89df53a122e 100644
--- 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 079876b1d54..a44ecc33f28 100644
--- 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}
 };