Change AddInputFilter and AddOutputFilter to SetInputFilter and

SetOutputFilter.  This corresponds nicely with the other Set
directives, which operate on containers while the Add* directives
tend to work directly on extensions.  [Ryan Bloom]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88042 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a9fb368c5f65fb0e7f1cb34b0e9a377c405e551e..acfd169270c9c380445d814b2b99c6e090aa9090 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0b1
 
+  *) Change AddInputFilter and AddOutputFilter to SetInputFilter and
+     SetOutputFilter.  This corresponds nicely with the other Set 
+     directives, which operate on containers while the Add* directives
+     tend to work directly on extensions.  [Ryan Bloom]
+
   *) Cleanup the header handling a bit.  This uses the apr_brigade_*
      functions for the buffering so that we don't need to compute
      the length of the headers before we actually create the header

diff --git a/STATUS b/STATUS
index f8756803b23d8b94fdf2b5f922ef262b16d54b32..745d0bcc2084b1a005202e2ef22c7bf4bf3044d4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2001/02/08 00:20:10 $]
+Last modified at [$Date: 2001/02/10 00:33:36 $]
 
 Release:
 
@@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS:
 
 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
 
-    * The directives to setup output filters need to be re-visited.  These
-      directives aren't consistent with what we already have, and they don't
-      always make good sense.
-          Status:  rbb volunteers.
-
     * Combine log_child and piped_log_spawn. Clean up http_log.c.
       Common logging API.
 

diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index cc4d02353e0515e990dc93e4147dd293b61386c1..5d6de1ba4dd8b5f273efc35329b289b585d7119f 100644 (file)
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -421,7 +421,7 @@ static void xlate_insert_filter(request_rec *r)
                           "xlate output filter not added implicitly because %s",
                           !reqinfo->output_ctx ? 
                           "no output configuration available" :
-                          "AddOutputFilter was used to add the filter");
+                          "SetOutputFilter was used to add the filter");
         }
 
         if (reqinfo->input_ctx && !configured_on_input(r, XLATEIN_FILTER_NAME)) {
@@ -433,7 +433,7 @@ static void xlate_insert_filter(request_rec *r)
                           "xlate input filter not added implicitly because %s",
                           !reqinfo->input_ctx ?
                           "no input configuration available" :
-                          "AddInputFilter was used to add the filter");
+                          "SetInputFilter was used to add the filter");
         }
     }
 }
@@ -848,7 +848,7 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     apr_status_t rv = APR_SUCCESS;
 
     if (!ctx) { 
-        /* this is AddOutputFilter path; grab the preallocated context,
+        /* this is SetOutputFilter path; grab the preallocated context,
          * if any; note that if we decided not to do anything in an earlier
          * handler, we won't even have a reqinfo
          */
@@ -1017,7 +1017,7 @@ static int xlate_in_filter(ap_filter_t *f, apr_bucket_brigade *bb,
     int hit_eos;
 
     if (!ctx) { 
-        /* this is AddInputFilter path; grab the preallocated context,
+        /* this is SetInputFilter path; grab the preallocated context,
          * if any; note that if we decided not to do anything in an earlier
          * handler, we won't even have a reqinfo
          */

diff --git a/modules/experimental/mod_ext_filter.c b/modules/experimental/mod_ext_filter.c
index a8e1b1d9dbd634165896c5842ce2426fca5bb692..79b92fb163de7bc7b56f3b174c85b8fdb6a36fe0 100644 (file)
--- a/modules/experimental/mod_ext_filter.c
+++ b/modules/experimental/mod_ext_filter.c
@@ -330,7 +330,7 @@ static const command_rec cmds[] =
     AP_INIT_ITERATE("ExtFilterOptions",
                     add_options,
                     NULL,
-                    ACCESS_CONF, /* same as AddInputFilter/AddOutputFilter */
+                    ACCESS_CONF, /* same as SetInputFilter/SetOutputFilter */
                     "valid options: DebugLevel=n, LogStderr, NoLogStderr"),
     AP_INIT_RAW_ARGS("ExtFilterDefine",
                      define_filter,

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 15d2f04cb906c8b1a25ff7ef0c6cdbd823ea9a33..5f3956b9d76d53a4e44d1090975a1d1b43b99825 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2889,9 +2889,9 @@ AP_INIT_TAKE12("RLimitNPROC", no_set_limit, NULL,
  * to leave it just in the conf file.  Other should feel free to disagree
  * with me.  Rbb.
  */
-AP_INIT_ITERATE("AddOutputFilter", add_filter, NULL, ACCESS_CONF,
+AP_INIT_ITERATE("SetOutputFilter", add_filter, NULL, ACCESS_CONF,
    "filters to be run"),
-AP_INIT_ITERATE("AddInputFilter", add_input_filter, NULL, ACCESS_CONF,
+AP_INIT_ITERATE("SetInputFilter", add_input_filter, NULL, ACCESS_CONF,
    "filters to be run on the request body"),
 { NULL }
 };