diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-04 05:05:04 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-07-31 18:57:16 +0200 |
| commit | 6df945da5900da86203e0527816690cb1d52c574 (patch) | |
| tree | 2bd1fe5aa1aac5f239c32328eece0e3af400feba /Bugzilla/WebService | |
| parent | 8b75f8e691309ec68e5de1cbdf77f6e8b2b305f8 (diff) | |
| download | bugzilla-6df945da5900da86203e0527816690cb1d52c574.tar.gz bugzilla-6df945da5900da86203e0527816690cb1d52c574.tar.xz | |
Bug 1455495 - Replace apache with Mojolicious
Diffstat (limited to 'Bugzilla/WebService')
| -rw-r--r-- | Bugzilla/WebService/Server/XMLRPC.pm | 6 | ||||
| -rw-r--r-- | Bugzilla/WebService/Util.pm | 8 |
2 files changed, 6 insertions, 8 deletions
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/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm index 29ff05448..d462c884a 100644 --- a/Bugzilla/WebService/Util.pm +++ b/Bugzilla/WebService/Util.pm @@ -23,7 +23,7 @@ use base qw(Exporter); # We have to "require", not "use" this, because otherwise it tries to # use features of Test::More during import(). -require Test::Taint; +require Test::Taint if ${^TAINT}; our @EXPORT_OK = qw( extract_flags @@ -193,8 +193,10 @@ sub taint_data { # Though this is a private function, it hasn't changed since 2004 and # should be safe to use, and prevents us from having to write it ourselves # or require another module to do it. - Test::Taint::_deeply_traverse(\&_delete_bad_keys, \@params); - Test::Taint::taint_deeply(\@params); + if (${^TAINT}) { + Test::Taint::_deeply_traverse(\&_delete_bad_keys, \@params); + Test::Taint::taint_deeply(\@params); + } } sub _delete_bad_keys { |