From: Byron Jones <bjones@mozilla.com>
Date: Wed, 2 Jan 2013 16:31:37 +0000 (+0800)
Subject: Bug 822547: Make jobqueue.pl clear the request cache before sending each mail
X-Git-Tag: bugzilla-4.5.1~243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfbc167a014c2630e07296777c9d75dd2f0f236d;p=thirdparty%2Fbugzilla.git

Bug 822547: Make jobqueue.pl clear the request cache before sending each mail
r=dkl,a=LpSolit
---

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 111d567e6d..baaf78ff73 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -618,6 +618,18 @@ 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)};
+        }
+    }
+}
+
 # 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.
@@ -639,7 +651,7 @@ sub _cleanup {
         $dbh->bz_rollback_transaction() if $dbh->bz_in_transaction;
         $dbh->disconnect;
     }
-    undef $_request_cache;
+    clear_request_cache();
 
     # These are both set by CGI.pm but need to be undone so that
     # Apache can actually shut down its children if it needs to.
diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm
index 519313448c..098ee79359 100644
--- a/Bugzilla/JobQueue.pm
+++ b/Bugzilla/JobQueue.pm
@@ -93,6 +93,13 @@ sub insert {
     return $retval;
 }
 
+# Clear the request cache at the start of each run.
+sub work_once {
+    my $self = shift;
+    Bugzilla->clear_request_cache();
+    return $self->SUPER::work_once(@_);
+}
+
 1;
 
 __END__