diff options
Diffstat (limited to 'Bugzilla.pm')
| -rw-r--r-- | Bugzilla.pm | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index 72192d41a..f563ba9e3 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -731,30 +731,10 @@ sub audit { # 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; -} +use constant request_cache => Bugzilla::Install::Util::_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 |