use Exporter;
use CGI;
use URI::URL;
-use CGI::Carp qw(fatalsToBrowser);
+#use CGI::Carp qw(fatalsToBrowser);
use FS::UID;
@ISA = qw(Exporter);
sub header {
my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
- use Carp;
+ #use Carp;
$etc = '' unless defined $etc;
my $x = <<END;
sub eidiot {
warn "eidiot depriciated";
+ $HTML::Mason::Commands::r->send_http_header
+ if defined $HTML::Mason::Commands::r;
idiot(@_);
&myexit();
}
sub myexit {
if (exists $ENV{MOD_PERL}) {
- $main::Response->End()
- if defined $main::Response
- && $main::Response->isa('Apache::ASP::Response');
- require Apache;
- Apache::exit();
+
+ if ( defined $main::Response
+ && $main::Response->isa('Apache::ASP::Response') ) { #Apache::ASP
+ $main::Response->End();
+ require Apache;
+ Apache::exit();
+ } elsif ( defined $HTML::Mason::Commands::m ) { #Mason
+ #$HTML::Mason::Commands::m->flush_buffer();
+ $HTML::Mason::Commands::m->abort();
+ die "shouldn't fall through to here (mason \$m->abort didn't)";
+ } else {
+ #??? well, it is $ENV{MOD_PERL}
+ warn "running under unknown mod_perl environment; trying Apache::exit()";
+ require Apache;
+ Apache::exit();
+ }
} else {
exit;
}