stas 2003/03/02 15:23:57
Modified: ModPerl-Registry/lib/ModPerl RegistryCooker.pm Log: good bye tabs Revision Changes Path 1.33 +18 -18 modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm Index: RegistryCooker.pm =================================================================== RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- RegistryCooker.pm 2 Mar 2003 22:47:19 -0000 1.32 +++ RegistryCooker.pm 2 Mar 2003 23:23:57 -0000 1.33 @@ -187,9 +187,9 @@ # %INC cleanup in case .pl files do not declare package ...; for (keys %INC) { - next if $orig_inc{$_}; - next if /\.pm$/; - delete $INC{$_}; + next if $orig_inc{$_}; + next if /\.pm$/; + delete $INC{$_}; } $self->flush_namespace; @@ -220,7 +220,7 @@ unless (-r $r->my_finfo && -s _) { $self->log_error("$self->{FILENAME} not found or unable to stat"); - return Apache::NOT_FOUND; + return Apache::NOT_FOUND; } return Apache::DECLINED if -d _; @@ -310,9 +310,9 @@ my $self = shift; my $path_info = $self->{REQ}->path_info; - my $script_name = $path_info && $self->{URI} =~ /$path_info$/ ? - substr($self->{URI}, 0, length($self->{URI}) - length($path_info)) : - $self->{URI}; + my $script_name = $path_info && $self->{URI} =~ /$path_info$/ + ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info)) + : $self->{URI}; if ($ModPerl::RegistryCooker::NameWithVirtualHost && $self->{REQ}->server->is_virtual) { @@ -370,7 +370,7 @@ #$self->chdir_file("$Apache::Server::CWD/"); # if(my $opt = $r->dir_config("PerlRunOnce")) { -# $r->child_terminate if lc($opt) eq "on"; +# $r->child_terminate if lc($opt) eq "on"; # } $self->cache_it; @@ -499,8 +499,8 @@ else { *{$fullname} = sub {}; } - undef &$fullname; - } + undef &$fullname; + } if (*{$fullname}{IO}) { if (fileno $fullname) { close $fullname; @@ -556,12 +556,12 @@ my $prepend = ""; for my $s (@cmdline) { - next unless $s =~ s/^-//; - last if substr($s,0,1) eq "-"; - for (split //, $s) { - next unless exists $switches{$_}; - $prepend .= $switches{$_}->(); - } + next unless $s =~ s/^-//; + last if substr($s,0,1) eq "-"; + for (split //, $s) { + next unless exists $switches{$_}; + $prepend .= $switches{$_}->(); + } } ${ $self->{CODE} } =~ s/^/$prepend/ if $prepend; } @@ -661,8 +661,8 @@ sub error_check { my $self = shift; if ($@ and substr($@,0,4) ne " at ") { - $self->log_error($@); - return Apache::SERVER_ERROR; + $self->log_error($@); + return Apache::SERVER_ERROR; } return Apache::OK; }