Rename output filters field ("filters") in core_dir_config to

"output_filters" for consistency with the name of the input
filters field ("input_filters").

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

diff --git a/include/http_core.h b/include/http_core.h
index 588cb6790358e6af47c5e4b361dd5bf9f1264f85..f5b739bb077026fb8680d6ad8448e470fe81d01d 100644 (file)
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -422,7 +422,7 @@ typedef struct {
     interpreter_source_e script_interpreter_source;
 #endif    
 
-    apr_array_header_t *filters;
+    apr_array_header_t *output_filters;
     apr_array_header_t *input_filters;
     /* bucket brigade held by ap_get_client_block() between calls */
     struct ap_bucket_brigade *bb;

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index c5d32e4f05f41ca85915599348df398a9e47417e..29ebdd3480dc769143e4a923bfbd7cc8a873d551 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -186,7 +186,7 @@ static void *create_core_dir_config(apr_pool_t *a, char *dir)
     conf->add_default_charset = ADD_DEFAULT_CHARSET_UNSET;
     conf->add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
 
-    conf->filters = apr_make_array(a, 2, sizeof(void *));
+    conf->output_filters = apr_make_array(a, 2, sizeof(void *));
     conf->input_filters = apr_make_array(a, 2, sizeof(void *));
     return (void *)conf;
 }
@@ -327,7 +327,8 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
            conf->add_default_charset_name = new->add_default_charset_name;
        }
     }
-    conf->filters = apr_append_arrays(a, base->filters, new->filters);
+    conf->output_filters = apr_append_arrays(a, base->output_filters, 
+                                             new->output_filters);
     conf->input_filters = apr_append_arrays(a, base->input_filters,
                                             new->input_filters);
 
@@ -1905,7 +1906,7 @@ static const char *add_filter(cmd_parms *cmd, void *dummy, const char *arg)
     core_dir_config *conf = dummy;
     char **newfilter;
     
-    newfilter = (char **)apr_push_array(conf->filters);
+    newfilter = (char **)apr_push_array(conf->output_filters);
     *newfilter = apr_pstrdup(cmd->pool, arg);
     return NULL;
 }
@@ -3546,9 +3547,9 @@ static void core_insert_filter(request_rec *r)
     core_dir_config *conf = (core_dir_config *)
                             ap_get_module_config(r->per_dir_config,
                                                   &core_module); 
-    char **items = (char **)conf->filters->elts;
+    char **items = (char **)conf->output_filters->elts;
 
-    for (i = 0; i < conf->filters->nelts; i++) {
+    for (i = 0; i < conf->output_filters->nelts; i++) {
         char *foobar = items[i];
         ap_add_output_filter(foobar, NULL, r, r->connection);
     }