summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Hardison <dylan@mozilla.com>2015-11-23 15:34:20 +0100
committerDylan Hardison <dylan@mozilla.com>2015-11-23 15:34:20 +0100
commitfe886c6a2ab07d5db20fad555263acd69302f1b0 (patch)
tree74dfaba37830917b744da54ce4dd6a57c6def4e0
parent14bb07ab010b0e38e6afb6d1f7976819477f396b (diff)
downloadbugzilla-fe886c6a2ab07d5db20fad555263acd69302f1b0.tar.gz
bugzilla-fe886c6a2ab07d5db20fad555263acd69302f1b0.tar.xz
Bug 1227031 - mod_perl workers are being terminated after 0 seconds
-rw-r--r--mod_perl.pl13
1 files changed, 2 insertions, 11 deletions
diff --git a/mod_perl.pl b/mod_perl.pl
index b4b4d4fc2..15230f615 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -37,6 +37,7 @@ use lib Bugzilla::Constants::bz_locations()->{'ext_libpath'};
use Apache2::Log ();
use Apache2::ServerUtil;
+use Apache2::SizeLimit;
use ModPerl::RegistryLoader ();
use File::Basename ();
@@ -57,20 +58,10 @@ BEGIN { *CORE::GLOBAL::warn = \&Apache2::ServerRec::warn; }
# Pre-compile the CGI.pm methods that we're going to use.
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 $apache_size_limit of RAM all by itself, not counting RAM it is
# sharing with the other httpd processes.
-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;
-}
-
-Apache2::SizeLimit->set_max_unshared_size($apache_size_limit);
+Apache2::SizeLimit->set_max_unshared_size(Bugzilla->localconfig->{apache_size_limit});
my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'};