geoff 2003/10/08 06:28:14
Modified: lib/ModPerl Code.pm
t/response/TestApache conftree.pm
xs/tables/current/ModPerl FunctionTable.pm
Removed: t/hooks default_port.t
t/hooks/TestHooks default_port.pm
Log:
undo PerlDefaultPortHandler
Revision Changes Path
1.109 +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.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Code.pm 7 Oct 2003 19:09:05 -0000 1.108
+++ Code.pm 8 Oct 2003 13:28:14 -0000 1.109
@@ -18,7 +18,7 @@
my %handlers = (
Process => [qw(ChildInit ChildExit)], #Restart PreConfig
Files => [qw(OpenLogs PostConfig)],
- PerSrv => [qw(PostReadRequest Trans DefaultPort)],
+ PerSrv => [qw(PostReadRequest Trans)],
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|PORT/) {
+ if ($ix =~ m/AUTH|TYPE|TRANS/) {
$pass =~ s/MP_HOOK_RUN_ALL/MP_HOOK_RUN_FIRST/;
}
}
1.7 +0 -6 modperl-2.0/t/response/TestApache/conftree.pm
Index: conftree.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestApache/conftree.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- conftree.pm 7 Oct 2003 19:09:05 -0000 1.6
+++ conftree.pm 8 Oct 2003 13:28:14 -0000 1.7
@@ -52,12 +52,6 @@
my $vhost_failed;
for my $vhost ($tree->lookup("VirtualHost")) {
-
- # temporary fix for foo.example.com ServerName override
- if (ref $vhost->{'ServerName'} eq 'ARRAY') {
- $vhost->{'ServerName'} = $vhost->{'ServerName'}[0]
- }
-
unless (exists $vhosts{$vhost->{'ServerName'}
|| $vhost->{'PerlProcessConnectionHandler'}}) {
$vhost_failed++;
1.125 +0 -10 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.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- FunctionTable.pm 7 Oct 2003 19:09:05 -0000 1.124
+++ FunctionTable.pm 8 Oct 2003 13:28:14 -0000 1.125
@@ -4718,16 +4718,6 @@
},
{
'return_type' => 'int',
- 'name' => 'modperl_default_port__handler',
- 'args' => [
- {
- 'type' => 'request_rec *',
- 'name' => 'r'
- }
- ]
- },
- {
- 'return_type' => 'int',
'name' => 'modperl_type_handler',
'args' => [
{
