dougm 02/04/05 17:19:15
Modified: src/modules/perl mod_perl.c modperl_filter.c
modperl_filter.h
Log:
get t/filter/input_msg.t working again
Revision Changes Path
1.110 +10 -2 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_perl.c 10 Mar 2002 00:09:52 -0000 1.109
+++ mod_perl.c 6 Apr 2002 01:19:15 -0000 1.110
@@ -502,13 +502,21 @@
ap_hook_insert_filter(modperl_input_filter_register_request,
NULL, NULL, APR_HOOK_LAST);
- ap_register_output_filter(MODPERL_OUTPUT_FILTER_NAME,
+ ap_register_output_filter(MP_FILTER_REQUEST_OUTPUT_NAME,
modperl_output_filter_handler,
AP_FTYPE_CONTENT_SET);
- ap_register_input_filter(MODPERL_INPUT_FILTER_NAME,
+ ap_register_input_filter(MP_FILTER_REQUEST_INPUT_NAME,
modperl_input_filter_handler,
AP_FTYPE_CONTENT_SET);
+
+ ap_register_output_filter(MP_FILTER_CONNECTION_OUTPUT_NAME,
+ modperl_output_filter_handler,
+ AP_FTYPE_CONNECTION);
+
+ ap_register_input_filter(MP_FILTER_CONNECTION_INPUT_NAME,
+ modperl_input_filter_handler,
+ AP_FTYPE_CONNECTION);
ap_hook_pre_connection(modperl_hook_pre_connection,
NULL, NULL, APR_HOOK_FIRST);
1.34 +4 -4 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- modperl_filter.c 29 Mar 2002 16:16:43 -0000 1.33
+++ modperl_filter.c 6 Apr 2002 01:19:15 -0000 1.34
@@ -527,7 +527,7 @@
{
modperl_filter_register_connection(c,
MP_OUTPUT_FILTER_HANDLER,
- MODPERL_OUTPUT_FILTER_NAME,
+ MP_FILTER_CONNECTION_OUTPUT_NAME,
ap_add_output_filter,
"OutputFilter");
}
@@ -536,7 +536,7 @@
{
modperl_filter_register_request(r,
MP_OUTPUT_FILTER_HANDLER,
- MODPERL_OUTPUT_FILTER_NAME,
+ MP_FILTER_REQUEST_OUTPUT_NAME,
ap_add_output_filter,
"OutputFilter",
r->connection->output_filters);
@@ -546,7 +546,7 @@
{
modperl_filter_register_connection(c,
MP_INPUT_FILTER_HANDLER,
- MODPERL_INPUT_FILTER_NAME,
+ MP_FILTER_CONNECTION_INPUT_NAME,
ap_add_input_filter,
"InputFilter");
}
@@ -555,7 +555,7 @@
{
modperl_filter_register_request(r,
MP_INPUT_FILTER_HANDLER,
- MODPERL_INPUT_FILTER_NAME,
+ MP_FILTER_REQUEST_INPUT_NAME,
ap_add_input_filter,
"InputFilter",
r->connection->input_filters);
1.13 +5 -2 modperl-2.0/src/modules/perl/modperl_filter.h
Index: modperl_filter.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modperl_filter.h 25 Jan 2002 04:04:22 -0000 1.12
+++ modperl_filter.h 6 Apr 2002 01:19:15 -0000 1.13
@@ -1,8 +1,11 @@
#ifndef MODPERL_FILTER_H
#define MODPERL_FILTER_H
-#define MODPERL_OUTPUT_FILTER_NAME "MODPERL_OUTPUT"
-#define MODPERL_INPUT_FILTER_NAME "MODPERL_INPUT"
+#define MP_FILTER_CONNECTION_OUTPUT_NAME "MODPERL_CONNECTION_OUTPUT"
+#define MP_FILTER_CONNECTION_INPUT_NAME "MODPERL_CONNECTION_INPUT"
+
+#define MP_FILTER_REQUEST_OUTPUT_NAME "MODPERL_REQUEST_OUTPUT"
+#define MP_FILTER_REQUEST_INPUT_NAME "MODPERL_REQUEST_INPUT"
#define MP_FILTER_CONNECTION_HANDLER 0x01
#define MP_FILTER_REQUEST_HANDLER 0x02
