You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by Stas Bekman <st...@stason.org> on 2003/01/03 01:44:28 UTC
[patch] s/filter_register/filter_add/
I propose to s/filter_register/filter_add/ because all these functions
insert the filters, they don't register them. The current naming makes
it hard to follow the flow.
If +1, I'll adjust the indentation and FunctionTable.pm, before
committing it.
Index: src/modules/perl/mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.145
diff -u -r1.145 mod_perl.c
--- src/modules/perl/mod_perl.c 12 Dec 2002 10:05:07 -0000 1.145
+++ src/modules/perl/mod_perl.c 3 Jan 2003 00:33:48 -0000
@@ -481,8 +481,8 @@
static int modperl_hook_pre_connection(conn_rec *c, void *csd)
{
- modperl_input_filter_register_connection(c);
- modperl_output_filter_register_connection(c);
+ modperl_input_filter_add_connection(c);
+ modperl_output_filter_add_connection(c);
return OK;
}
@@ -595,10 +595,10 @@
ap_hook_handler(modperl_response_handler_cgi,
NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_insert_filter(modperl_output_filter_register_request,
+ ap_hook_insert_filter(modperl_output_filter_add_request,
NULL, NULL, APR_HOOK_LAST);
- ap_hook_insert_filter(modperl_input_filter_register_request,
+ ap_hook_insert_filter(modperl_input_filter_add_request,
NULL, NULL, APR_HOOK_LAST);
ap_register_output_filter(MP_FILTER_REQUEST_OUTPUT_NAME,
Index: src/modules/perl/modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.40
diff -u -r1.40 modperl_filter.c
--- src/modules/perl/modperl_filter.c 25 Nov 2002 22:47:39 -0000 1.40
+++ src/modules/perl/modperl_filter.c 3 Jan 2003 00:33:49 -0000
@@ -443,7 +443,7 @@
typedef ap_filter_t * MP_FUNC_T(filter_add_t) (const char *, void *,
request_rec *, conn_rec *);
-static int modperl_filter_register_connection(conn_rec *c,
+static int modperl_filter_add_connection(conn_rec *c,
int idx,
const char *name,
filter_add_t addfunc,
@@ -483,7 +483,7 @@
return DECLINED;
}
-static int modperl_filter_register_request(request_rec *r,
+static int modperl_filter_add_request(request_rec *r,
int idx,
const char *name,
filter_add_t addfunc,
@@ -510,7 +510,7 @@
((modperl_filter_ctx_t *)f->ctx)->handler;
if (modperl_handler_equal(ctx_handler, handlers[i])) {
- /* skip if modperl_filter_register_connection
+ /* skip if modperl_filter_add_connection
* already registered this handler
* XXX: set a flag in the modperl_handler_t
instead
*/
@@ -546,18 +546,18 @@
return DECLINED;
}
-void modperl_output_filter_register_connection(conn_rec *c)
+void modperl_output_filter_add_connection(conn_rec *c)
{
- modperl_filter_register_connection(c,
+ modperl_filter_add_connection(c,
MP_OUTPUT_FILTER_HANDLER,
MP_FILTER_CONNECTION_OUTPUT_NAME,
ap_add_output_filter,
"OutputFilter");
}
-void modperl_output_filter_register_request(request_rec *r)
+void modperl_output_filter_add_request(request_rec *r)
{
- modperl_filter_register_request(r,
+ modperl_filter_add_request(r,
MP_OUTPUT_FILTER_HANDLER,
MP_FILTER_REQUEST_OUTPUT_NAME,
ap_add_output_filter,
@@ -565,18 +565,18 @@
r->connection->output_filters);
}
-void modperl_input_filter_register_connection(conn_rec *c)
+void modperl_input_filter_add_connection(conn_rec *c)
{
- modperl_filter_register_connection(c,
+ modperl_filter_add_connection(c,
MP_INPUT_FILTER_HANDLER,
MP_FILTER_CONNECTION_INPUT_NAME,
ap_add_input_filter,
"InputFilter");
}
-void modperl_input_filter_register_request(request_rec *r)
+void modperl_input_filter_add_request(request_rec *r)
{
- modperl_filter_register_request(r,
+ modperl_filter_add_request(r,
MP_INPUT_FILTER_HANDLER,
MP_FILTER_REQUEST_INPUT_NAME,
ap_add_input_filter,
Index: src/modules/perl/modperl_filter.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v
retrieving revision 1.14
diff -u -r1.14 modperl_filter.h
--- src/modules/perl/modperl_filter.h 30 May 2002 02:33:48 -0000 1.14
+++ src/modules/perl/modperl_filter.h 3 Jan 2003 00:33:49 -0000
@@ -37,9 +37,9 @@
apr_status_t modperl_output_filter_handler(ap_filter_t *f,
apr_bucket_brigade *bb);
-void modperl_output_filter_register_connection(conn_rec *c);
+void modperl_output_filter_add_connection(conn_rec *c);
-void modperl_output_filter_register_request(request_rec *r);
+void modperl_output_filter_add_request(request_rec *r);
MP_INLINE apr_status_t modperl_output_filter_flush(modperl_filter_t
*filter);
@@ -61,8 +61,8 @@
apr_read_type_e block,
apr_off_t readbytes);
-void modperl_input_filter_register_connection(conn_rec *c);
+void modperl_input_filter_add_connection(conn_rec *c);
-void modperl_input_filter_register_request(request_rec *r);
+void modperl_input_filter_add_request(request_rec *r);
#endif /* MODPERL_FILTER_H */
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org