Commit 399beba5 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent 87f5cbed

CHANGES

+5 −0
Original line number Diff line number Diff line 
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

STATUS

+1 −6
Original line number Diff line number Diff line 
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.

modules/experimental/mod_charset_lite.c

+4 −4
Original line number Diff line number Diff line
@@ -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

         */

modules/experimental/mod_ext_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

modules/http/http_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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 }

};