From b8b2a943056adbb112474df7bdf766970a56b2dc Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 18 Sep 2018 18:19:03 -0400
Subject: Bug 1455495 - Replace apache with Mojolicious

---
 Bugzilla/WebService/Server/XMLRPC.pm | 6 +-----
 Bugzilla/WebService/Util.pm          | 8 +++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'Bugzilla/WebService')

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 {
-- 
cgit v1.2.3-24-g4f1b