summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-09-08 03:36:27 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-09-08 03:36:27 +0200
commita2a95e44cc2f9754b75614a884d2312da46b9296 (patch)
tree32212951b30a762e5dd3086a6fac4c51b72bebba
parent6fc68f38d82b6bab1313ae320a53b577447c7e60 (diff)
downloadbugzilla-a2a95e44cc2f9754b75614a884d2312da46b9296.tar.gz
bugzilla-a2a95e44cc2f9754b75614a884d2312da46b9296.tar.xz
Bug 516457: Bump the Email::MIME requirement to avoid a memory leak that
jobqueue.pl was hitting. r=LpSolit, a=LpSolit
-rw-r--r--Bugzilla/Install/Requirements.pm14
-rw-r--r--Bugzilla/Mailer.pm2
-rw-r--r--docs/en/xml/installation.xml12
3 files changed, 2 insertions, 26 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 25dc15665..5ed2d7dcd 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -116,18 +116,8 @@ sub REQUIRED_MODULES {
{
package => 'Email-MIME',
module => 'Email::MIME',
- version => '1.861'
- },
- {
- package => 'Email-MIME-Encodings',
- module => 'Email::MIME::Encodings',
- # Fixes bug 486206
- version => '1.313',
- },
- {
- package => 'Email-MIME-Modifier',
- module => 'Email::MIME::Modifier',
- version => '1.442'
+ # This fixes a memory leak in walk_parts that affected jobqueue.pl.
+ version => '1.904'
},
{
package => 'URI',
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index c8a99b873..d4a41b763 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -48,8 +48,6 @@ use Encode qw(encode);
use Encode::MIME::Header;
use Email::Address;
use Email::MIME;
-# Loading this gives us encoding_set.
-use Email::MIME::Modifier;
use Email::Send;
sub MessageToMTA {
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index b498acb81..f311149b6 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -355,18 +355,6 @@
<listitem>
<para>
- Email::MIME::Encodings (&min-email-mime-encodings-ver;)
- </para>
- </listitem>
-
- <listitem>
- <para>
- Email::MIME::Modifier (&min-email-mime-modifier-ver;)
- </para>
- </listitem>
-
- <listitem>
- <para>
Template (&min-template-ver;)
</para>
</listitem>