Bug 799257 - Backport bug 795650 and bug 797833 to bmo/4.0 and bmo/4.2 for performance improvement

r=glob

1 files changed, 10 insertions, 3 deletions

diff --git a/Bugzilla.pm b/Bugzilla.pm
index b56f42ec4..b61062a9f 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -289,9 +289,7 @@ sub input_params {
 }
 
 sub localconfig {
-    my $class = shift;
-    $class->request_cache->{localconfig} ||= read_localconfig();
-    return $class->request_cache->{localconfig};
+    return $_[0]->process_cache->{localconfig} ||= read_localconfig();
 }
 
 sub params {
@@ -652,6 +650,15 @@ sub request_cache {
     return $_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 = {};
+
+sub process_cache {
+    return $_process_cache;
+}
+
 # Private methods
 
 # Per-process cleanup. Note that this is a plain subroutine, not a method,