From new-httpd-return-8893-apmail-new-httpd-archive=apache.org@apache.org Tue Oct 17 07:00:57 2000 Return-Path: Delivered-To: apmail-new-httpd-archive@apache.org Received: (qmail 54468 invoked by uid 500); 17 Oct 2000 07:00:56 -0000 Mailing-List: contact new-httpd-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list new-httpd@apache.org Received: (qmail 54225 invoked from network); 17 Oct 2000 07:00:50 -0000 X-Authentication-Warning: kurgan.lyra.org: gstein set sender to gstein@lyra.org using -f Date: Tue, 17 Oct 2000 00:02:40 -0700 From: Greg Stein To: new-httpd@apache.org Subject: Re: cvs commit: apache-2.0/src/main http_core.c Message-ID: <20001017000240.L26134@lyra.org> Mail-Followup-To: new-httpd@apache.org References: <20001017013512.54760.qmail@locus.apache.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: <20001017013512.54760.qmail@locus.apache.org>; from trawick@locus.apache.org on Tue, Oct 17, 2000 at 01:35:12AM -0000 X-URL: http://www.lyra.org/greg/ X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N I'm a little confused here... *why* is runtime state being placed into the config structures? That makes zero sense. What am I missing? Cheers, -g On Tue, Oct 17, 2000 at 01:35:12AM -0000, trawick@locus.apache.org wrote: > trawick 00/10/16 18:35:12 > > Modified: src/include http_core.h > src/main http_core.c > Log: > Rename output filters field ("filters") in core_dir_config to > "output_filters" for consistency with the name of the input > filters field ("input_filters"). > > Revision Changes Path > 1.28 +1 -1 apache-2.0/src/include/http_core.h > > Index: http_core.h > =================================================================== > RCS file: /home/cvs/apache-2.0/src/include/http_core.h,v > retrieving revision 1.27 > retrieving revision 1.28 > diff -u -r1.27 -r1.28 > --- http_core.h 2000/10/16 19:11:45 1.27 > +++ http_core.h 2000/10/17 01:35:11 1.28 > @@ -422,7 +422,7 @@ > 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; > > > > 1.175 +6 -5 apache-2.0/src/main/http_core.c > > Index: http_core.c > =================================================================== > RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v > retrieving revision 1.174 > retrieving revision 1.175 > diff -u -r1.174 -r1.175 > --- http_core.c 2000/10/17 00:24:35 1.174 > +++ http_core.c 2000/10/17 01:35:12 1.175 > @@ -186,7 +186,7 @@ > 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 @@ > 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 @@ > 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 @@ > 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); > } > > > -- Greg Stein, http://www.lyra.org/