geoff 2003/10/14 10:32:40
Modified: lib/ModPerl Code.pm
t/hooks stacked_handlers2.t
t/hooks/TestHooks stacked_handlers2.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
add PerlMapToStorageHandler
Reviewed by: stas
Revision Changes Path
1.110 +2 -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.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Code.pm 8 Oct 2003 13:28:14 -0000 1.109
+++ Code.pm 14 Oct 2003 17:32:40 -0000 1.110
@@ -18,7 +18,7 @@
my %handlers = (
Process => [qw(ChildInit ChildExit)], #Restart PreConfig
Files => [qw(OpenLogs PostConfig)],
- PerSrv => [qw(PostReadRequest Trans)],
+ PerSrv => [qw(PostReadRequest Trans MapToStorage)],
PerDir => [qw(HeaderParser
Access Authen Authz
Type Fixup Response Log Cleanup
@@ -217,7 +217,7 @@
my $ix = $self->{handler_index}->{$class}->[$i];
if ($callback =~ m/modperl_callback_per_(dir|srv)/) {
- if ($ix =~ m/AUTH|TYPE|TRANS/) {
+ if ($ix =~ m/AUTH|TYPE|TRANS|MAP/) {
$pass =~ s/MP_HOOK_RUN_ALL/MP_HOOK_RUN_FIRST/;
}
}
1.2 +1 -0 modperl-2.0/t/hooks/stacked_handlers2.t
Index: stacked_handlers2.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/stacked_handlers2.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stacked_handlers2.t 11 Aug 2003 20:34:22 -0000 1.1
+++ stacked_handlers2.t 14 Oct 2003 17:32:40 -0000 1.2
@@ -20,6 +20,7 @@
my $expected = q!ran 2 PerlPostReadRequestHandler handlers
ran 1 PerlTransHandler handlers
+ran 1 PerlMapToStorageHandler handlers
ran 4 PerlHeaderParserHandler handlers
ran 2 PerlAccessHandler handlers
ran 2 PerlAuthenHandler handlers
1.3 +5 -12 modperl-2.0/t/hooks/TestHooks/stacked_handlers2.pm
Index: stacked_handlers2.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/stacked_handlers2.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stacked_handlers2.pm 11 Sep 2003 01:57:33 -0000 1.2
+++ stacked_handlers2.pm 14 Oct 2003 17:32:40 -0000 1.3
@@ -22,17 +22,6 @@
return Apache::OK;
}
-sub ok_fileset {
-
- my $r = shift;
-
- $r->filename(__FILE__);
-
- callback($r);
-
- return Apache::OK;
-}
-
sub declined {
callback(shift);
@@ -85,6 +74,7 @@
foreach my $callback (qw(PerlPostReadRequestHandler
PerlTransHandler
+ PerlMapToStorageHandler
PerlHeaderParserHandler
PerlAccessHandler
PerlAuthenHandler
@@ -151,7 +141,10 @@
PerlPostReadRequestHandler TestHooks::stacked_handlers2::ok
TestHooks::stacked_handlers2::ok
# 1 run, 1 left behind
- PerlTransHandler TestHooks::stacked_handlers2::ok_fileset
TestHooks::stacked_handlers2::server_error
+ PerlTransHandler TestHooks::stacked_handlers2::ok
TestHooks::stacked_handlers2::server_error
+
+ # 1 run, 1 left behind
+ PerlMapToStorageHandler TestHooks::stacked_handlers2::ok
TestHooks::stacked_handlers2::server_error
<Location /TestHooks__stacked_handlers2>
# all 4 run
1.126 +10 -0 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- FunctionTable.pm 8 Oct 2003 13:28:14 -0000 1.125
+++ FunctionTable.pm 14 Oct 2003 17:32:40 -0000 1.126
@@ -3019,6 +3019,16 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'modperl_map_to_storage_handler',
+ 'args' => [
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
'return_type' => 'void',
'name' => 'modperl_mgv_append',
'args' => [
