diff options
| -rw-r--r-- | Bugzilla/Attachment/PatchReader.pm | 15 | ||||
| -rw-r--r-- | Bugzilla/CGI.pm | 8 | ||||
| -rw-r--r-- | Bugzilla/Error.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Quantum.pm | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | Bugzilla/Quantum/SES.pm | 0 | ||||
| -rw-r--r-- | Bugzilla/WebService/Server/XMLRPC.pm | 6 | ||||
| -rwxr-xr-x | Makefile.PL | 12 | ||||
| -rwxr-xr-x | buglist.cgi | 6 | ||||
| -rwxr-xr-x | colchange.cgi | 16 | ||||
| -rwxr-xr-x | heartbeat.cgi | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | jobqueue-worker.pl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/undo.pl | 0 | ||||
| -rw-r--r-- | t/001compile.t | 14 |
13 files changed, 12 insertions, 77 deletions
diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm index 2cfbf2c6b..8025f5b82 100644 --- a/Bugzilla/Attachment/PatchReader.pm +++ b/Bugzilla/Attachment/PatchReader.pm @@ -116,18 +116,9 @@ sub process_interdiff { $ENV{'PATH'} = $lc->{diffpath}; my ($pid, $interdiff_stdout, $interdiff_stderr); - if ($ENV{MOD_PERL}) { - require Apache2::RequestUtil; - require Apache2::SubProcess; - my $request = Apache2::RequestUtil->request; - (undef, $interdiff_stdout, $interdiff_stderr) = $request->spawn_proc_prog( - $lc->{interdiffbin}, [$old_filename, $new_filename] - ); - } else { - $interdiff_stderr = gensym; - my $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr, - $lc->{interdiffbin}, $old_filename, $new_filename); - } + $interdiff_stderr = gensym; + $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr, + $lc->{interdiffbin}, $old_filename, $new_filename); binmode $interdiff_stdout; # Check for errors diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index 2b8641d56..996987cc6 100644 --- a/Bugzilla/CGI.pm +++ b/Bugzilla/CGI.pm @@ -477,11 +477,6 @@ sub _prevent_unsafe_response { print $self->SUPER::header(-type => 'text/html', -status => '403 Forbidden'); if ($content_type ne 'text/html') { print "Untrusted Referer Header\n"; - if ($ENV{MOD_PERL}) { - my $r = $self->r; - $r->rflush; - $r->status(200); - } } exit; } @@ -804,9 +799,6 @@ sub redirect_to_https { # and do not work with 302. Our redirect really is permanent anyhow, so # it doesn't hurt to make it a 301. print $self->redirect(-location => $url, -status => 301); - - # When using XML-RPC with mod_perl, we need the headers sent immediately. - $self->r->rflush if $ENV{MOD_PERL}; exit; } diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 42757f39c..f932294b0 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -196,7 +196,7 @@ sub ThrowTemplateError { # mod_perl overrides exit to call die with this string # we never want to display this to the user - exit if $template_err =~ /\bModPerl::Util::exit\b/; + die $template_err if ref($template_err) eq 'ARRAY' && $template_err->[0] eq "EXIT\n"; state $logger = Log::Log4perl->get_logger('Bugzilla.Error.Template'); $logger->error($template_err); diff --git a/Bugzilla/Quantum.pm b/Bugzilla/Quantum.pm index 1c0e61dae..2519e23ad 100644 --- a/Bugzilla/Quantum.pm +++ b/Bugzilla/Quantum.pm @@ -33,7 +33,6 @@ sub startup { $self->plugin('Bugzilla::Quantum::Plugin::Glue'); $self->plugin('Bugzilla::Quantum::Plugin::Hostage'); $self->plugin('Bugzilla::Quantum::Plugin::BlockIP'); - $self->log->info("\$ENV{LOG4PERL_STDERR_DISABLE} = $ENV{LOG4PERL_STDERR_DISABLE}"); if ( $self->mode ne 'development' ) { $self->hook( diff --git a/Bugzilla/Quantum/SES.pm b/Bugzilla/Quantum/SES.pm index e36956b1d..e36956b1d 100755..100644 --- a/Bugzilla/Quantum/SES.pm +++ b/Bugzilla/Quantum/SES.pm diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm index 6bb73af01..5ad50e91c 100644 --- a/Bugzilla/WebService/Server/XMLRPC.pm +++ b/Bugzilla/WebService/Server/XMLRPC.pm @@ -14,11 +14,7 @@ use warnings; use Bugzilla::Logging; use XMLRPC::Transport::HTTP; use Bugzilla::WebService::Server; -if ($ENV{MOD_PERL}) { - our @ISA = qw(XMLRPC::Transport::HTTP::Apache Bugzilla::WebService::Server); -} else { - our @ISA = qw(XMLRPC::Transport::HTTP::CGI Bugzilla::WebService::Server); -} +our @ISA = qw(XMLRPC::Transport::HTTP::CGI Bugzilla::WebService::Server); use Bugzilla::WebService::Constants; use Bugzilla::Error; diff --git a/Makefile.PL b/Makefile.PL index 8a3c0c6ba..80af83b59 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -289,18 +289,6 @@ my %optional_features = ( } }, }, - mod_perl => { - description => 'mod_perl support under Apache', - prereqs => { - runtime => { - requires => { - 'mod_perl2' => '1.999022', - 'Apache2::SizeLimit' => '0.96', - 'Plack::Handler::Apache2' => 0, - } - } - } - }, inbound_email => { description => 'Inbound Email', prereqs => { diff --git a/buglist.cgi b/buglist.cgi index 4d3ad1a86..58dedf480 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -752,12 +752,6 @@ if ($serverpush) { $template->process("list/server-push.html.tmpl", $vars) || ThrowTemplateError($template->error()); - # Under mod_perl, flush stdout so that the page actually shows up. - if ($ENV{MOD_PERL}) { - require Apache2::RequestUtil; - Apache2::RequestUtil->request->rflush(); - } - # Don't do multipart_end() until we're ready to display the replacement # page, otherwise any errors that happen before then (like SQL errors) # will result in a blank page being shown to the user instead of the error. diff --git a/colchange.cgi b/colchange.cgi index d77782bec..46d25ecdf 100755 --- a/colchange.cgi +++ b/colchange.cgi @@ -136,26 +136,12 @@ if (defined $cgi->param('rememberedquery')) { $params->param('columnlist', join(",", @collist)); $vars->{'redirect_url'} = "buglist.cgi?".$params->query_string(); - # If we're running on Microsoft IIS, $cgi->redirect discards # the Set-Cookie lines. In mod_perl, $cgi->redirect with cookies # causes the page to be rendered as text/plain. # Workaround is to use the old-fashioned redirection mechanism. # See bug 214466 and bug 376044 for details. - if ($ENV{'MOD_PERL'} - || $ENV{'SERVER_SOFTWARE'} =~ /Microsoft-IIS/ - || $ENV{'SERVER_SOFTWARE'} =~ /Sun ONE Web/) - { - print $cgi->header(-type => "text/html", - -refresh => "0; URL=$vars->{'redirect_url'}"); - } - else { - print $cgi->redirect($vars->{'redirect_url'}); - exit; - } - - $template->process("global/message.html.tmpl", $vars) - || ThrowTemplateError($template->error()); + print $cgi->redirect($vars->{'redirect_url'}); exit; } diff --git a/heartbeat.cgi b/heartbeat.cgi index 7f4f6361e..b3635751b 100755 --- a/heartbeat.cgi +++ b/heartbeat.cgi @@ -35,11 +35,4 @@ FATAL("heartbeat error: $@") if !$ok && $@; my $cgi = Bugzilla->cgi; print $cgi->header(-type => 'text/plain', -status => $ok ? '200 OK' : '500 Internal Server Error'); -print $ok ? "Bugzilla OK\n" : "Bugzilla NOT OK\n"; - -if ($ENV{MOD_PERL}) { - my $r = $cgi->r; - # doing this supresses the error document, but does not change the http response code. - $r->rflush; - $r->status(200); -} +print $ok ? "Bugzilla OK\n" : "Bugzilla NOT OK\n";
\ No newline at end of file diff --git a/jobqueue-worker.pl b/jobqueue-worker.pl index b26aacdba..b26aacdba 100644..100755 --- a/jobqueue-worker.pl +++ b/jobqueue-worker.pl diff --git a/scripts/undo.pl b/scripts/undo.pl index 24d6f594b..24d6f594b 100644..100755 --- a/scripts/undo.pl +++ b/scripts/undo.pl diff --git a/t/001compile.t b/t/001compile.t index e81162056..3d8d82bf4 100644 --- a/t/001compile.t +++ b/t/001compile.t @@ -35,7 +35,7 @@ sub compile_file { my ($file) = @_; # Don't allow CPAN.pm to modify the global @INC, which the version - # shipped with Perl 5.8.8 does. (It gets loaded by + # shipped with Perl 5.8.8 does. (It gets loaded by # Bugzilla::Install::CPAN.) local @INC = @INC; @@ -43,10 +43,6 @@ sub compile_file { skip "$file: extensions not tested", 1; return; } - if ($file =~ /ModPerl/) { - skip "$file: ModPerl stuff not tested", 1; - return; - } if ($file =~ s/\.pm$//) { $file =~ s{/}{::}g; @@ -82,7 +78,7 @@ my $file_features = map_files_to_features(); # Test the scripts by compiling them foreach my $file (@testitems) { # These were already compiled, above. - next if ($file eq 'Bugzilla.pm' + next if ($file eq 'Bugzilla.pm' or $file eq 'Bugzilla/Constants.pm' or $file eq 'Bugzilla/Install/Requirements.pm'); SKIP: { @@ -94,10 +90,10 @@ foreach my $file (@testitems) { skip "$file: $feature not enabled", 1; } - # Check that we have a DBI module to support the DB, if this + # Check that we have a DBI module to support the DB, if this # is a database module (but not Schema) if ($file =~ m{Bugzilla/DB/([^/]+)\.pm$} - and $file ne "Bugzilla/DB/Schema.pm") + and $file ne "Bugzilla/DB/Schema.pm") { my $module = lc($1); Bugzilla->feature($module) or skip "$file: Driver for $module not installed", 1; @@ -105,4 +101,4 @@ foreach my $file (@testitems) { compile_file($file); } -} +} |