summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla.pm34
-rw-r--r--Bugzilla/Install/Util.pm11
2 files changed, 8 insertions, 37 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm
index 8bea97b39..fba6d2a04 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -682,43 +682,21 @@ sub local_timezone {
||= DateTime::TimeZone->new(name => 'local');
}
-# This creates the request cache for non-mod_perl installations.
-# This is identical to Install::Util::_cache so that things loaded
-# into Install::Util::_cache during installation can be read out
-# of request_cache later in installation.
-our $_request_cache = $Bugzilla::Install::Util::_cache;
-
-sub request_cache {
- if ($ENV{MOD_PERL}) {
- require Apache2::RequestUtil;
- # Sometimes (for example, during mod_perl.pl), the request
- # object isn't available, and we should use $_request_cache instead.
- my $request = eval { Apache2::RequestUtil->request };
- return $_request_cache if !$request;
- return $request->pnotes();
- }
- return $_request_cache;
-}
+my $request_cache = Bugzilla::Install::Util::_cache();
+
+sub request_cache { return $request_cache }
sub clear_request_cache {
- $_request_cache = {};
- if ($ENV{MOD_PERL}) {
- require Apache2::RequestUtil;
- my $request = eval { Apache2::RequestUtil->request };
- if ($request) {
- my $pnotes = $request->pnotes;
- delete @$pnotes{(keys %$pnotes)};
- }
- }
+ %$request_cache = ();
}
# This is a per-process cache. Under mod_cgi it's identical to the
# request_cache. When using mod_perl, items in this cache live until the
# worker process is terminated.
-our $_process_cache = {};
+my $process_cache = {};
sub process_cache {
- return $_process_cache;
+ return $process_cache;
}
# This is a memcached wrapper, which provides cross-process and cross-system
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 90ef2d4e3..3ec185c2b 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -651,15 +651,8 @@ sub prevent_windows_dialog_boxes {
# This is like request_cache, but it's used only by installation code
# for checksetup.pl and things like that.
-our $_cache = {};
-sub _cache {
- # If the normal request_cache is available (which happens any time
- # after the requirements phase) then we should use that.
- if (eval { Bugzilla->request_cache; }) {
- return Bugzilla->request_cache;
- }
- return $_cache;
-}
+my $_cache = {};
+sub _cache { return $_cache; }
###############################
# Copied from Bugzilla::Util #