dougm 02/02/20 17:45:34
Modified: lib/ModPerl Code.pm
src/modules/perl mod_perl.c modperl_callback.c
modperl_callback.h modperl_types.h
Log:
adjust to pre_connection hook prototype change.
not supporting PreConnection handler for the moment.
Revision Changes Path
1.75 +8 -2 modperl-2.0/lib/ModPerl/Code.pm
Index: Code.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Code.pm 18 Dec 2001 05:58:54 -0000 1.74
+++ Code.pm 21 Feb 2002 01:45:34 -0000 1.75
@@ -18,7 +18,8 @@
Access Authen Authz
Type Fixup Response Log
InputFilter OutputFilter)], #Init Cleanup
- Connection => [qw(PreConnection ProcessConnection)],
+ Connection => [qw(ProcessConnection)],
+ PreConnection => [qw(PreConnection)],
);
my %hooks = map { $_, canon_lc($_) }
@@ -47,6 +48,11 @@
ret => 'int',
args => [{type => 'conn_rec', name => 'c'}],
},
+ PreConnection => {
+ ret => 'int',
+ args => [{type => 'conn_rec', name => 'c'},
+ {type => 'void', name => 'csd'}],
+ },
);
$hook_proto{PerDir} = $hook_proto{PerSrv};
@@ -73,7 +79,7 @@
},
);
-for my $class (qw(Process Connection Files)) {
+for my $class (qw(Process Connection PreConnection Files)) {
$directive_proto{$class}->{cfg}->{name} = 'scfg';
$directive_proto{$class}->{cfg}->{get} = $scfg_get;
1.106 +1 -1 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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mod_perl.c 18 Jan 2002 06:50:10 -0000 1.105
+++ mod_perl.c 21 Feb 2002 01:45:34 -0000 1.106
@@ -414,7 +414,7 @@
*/
}
-static int modperl_hook_pre_connection(conn_rec *c)
+static int modperl_hook_pre_connection(conn_rec *c, void *csd)
{
modperl_input_filter_register_connection(c);
modperl_output_filter_register_connection(c);
1.48 +5 -0 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- modperl_callback.c 24 Nov 2001 01:15:01 -0000 1.47
+++ modperl_callback.c 21 Feb 2002 01:45:34 -0000 1.48
@@ -217,6 +217,11 @@
NULL, NULL, NULL);
}
+int modperl_callback_pre_connection(int idx, conn_rec *c, void *csd)
+{
+ return DECLINED; /*XXX*/
+}
+
void modperl_callback_process(int idx, apr_pool_t *p, server_rec *s)
{
modperl_callback_run_handlers(idx, MP_HANDLER_TYPE_PROCESS,
1.21 +2 -0 modperl-2.0/src/modules/perl/modperl_callback.h
Index: modperl_callback.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- modperl_callback.h 24 Nov 2001 01:15:01 -0000 1.20
+++ modperl_callback.h 21 Feb 2002 01:45:34 -0000 1.21
@@ -25,6 +25,8 @@
int modperl_callback_connection(int idx, conn_rec *c);
+int modperl_callback_pre_connection(int idx, conn_rec *c, void *csd);
+
void modperl_callback_process(int idx, apr_pool_t *p, server_rec *s);
int modperl_callback_files(int idx,
1.56 +1 -0 modperl-2.0/src/modules/perl/modperl_types.h
Index: modperl_types.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- modperl_types.h 6 Jan 2002 20:45:36 -0000 1.55
+++ modperl_types.h 21 Feb 2002 01:45:34 -0000 1.56
@@ -119,6 +119,7 @@
MpAV *handlers_per_srv[MP_HANDLER_NUM_PER_SRV];
MpAV *handlers_files[MP_HANDLER_NUM_FILES];
MpAV *handlers_process[MP_HANDLER_NUM_PROCESS];
+ MpAV *handlers_pre_connection[MP_HANDLER_NUM_PRE_CONNECTION];
MpAV *handlers_connection[MP_HANDLER_NUM_CONNECTION];
int threaded_mpm;
#ifdef USE_ITHREADS
