summaryrefslogtreecommitdiffstats
path: root/mod_perl.pl
diff options
context:
space:
mode:
authorDylan Hardison <dylan@mozilla.com>2015-11-04 04:09:25 +0100
committerDylan Hardison <dylan@mozilla.com>2015-11-04 04:09:25 +0100
commit338bad479a7b75c656e0c99438629322cc9b8721 (patch)
tree28a9748d05bef520a834ade190b61ae2aed2a8e6 /mod_perl.pl
parentb5271cab904a4802b04caa5cf3f08d8d80272183 (diff)
downloadbugzilla-338bad479a7b75c656e0c99438629322cc9b8721.tar.gz
bugzilla-338bad479a7b75c656e0c99438629322cc9b8721.tar.xz
Bug 1219750 - Allow Apache2::SizeLimit to be configured via params
Diffstat (limited to 'mod_perl.pl')
-rw-r--r--mod_perl.pl15
1 files changed, 10 insertions, 5 deletions
diff --git a/mod_perl.pl b/mod_perl.pl
index be4f18bdf..f283006cc 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -58,14 +58,19 @@ BEGIN { *CORE::GLOBAL::warn = \&Apache2::ServerRec::warn; }
Bugzilla::CGI->compile(qw(:cgi :push));
use Apache2::SizeLimit;
+
# This means that every httpd child will die after processing a request if it
-# is taking up more than 700MB of RAM all by itself, not counting RAM it is
+# is taking up more than $apache_size_limit of RAM all by itself, not counting RAM it is
# sharing with the other httpd processes.
-if (Bugzilla->params->{'urlbase'} eq 'https://bugzilla.mozilla.org/') {
- Apache2::SizeLimit->set_max_unshared_size(700_000);
-} else {
- Apache2::SizeLimit->set_max_unshared_size(250_000);
+my $apache_size_limit = 250_000;
+if (Bugzilla->localconfig->{apache_size_limit}) {
+ $apache_size_limit = Bugzilla->localconfig->{apache_size_limit};
+}
+elsif (Bugzilla->params->{'urlbase'} eq 'https://bugzilla.mozilla.org/') {
+ $apache_size_limit = 700_000;
}
+else
+Apache2::SizeLimit->set_max_unshared_size($apache_size_limit);
my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'};